Improve CopyAssemblies task (#635)

Author: claudiamurialdo

README.md

@@ -83,20 +83,26 @@ For the following steps must be executed from inside ```dotnet``` directory:
 ## How to test your changes with a GeneXus installation?
 - ```dotnet msbuild /t:build;CopyAssemblies DotNetStandardClasses.sln```
 
-It compiles the solution and copies all the .NET Framework assemblies to the folder build/gxnet*/bin**. Then, you can copy those files to a GeneXus installation or to your web application directory.
+It compiles the solution and copies all the .NET Framework assemblies to the folder dotnet/build. Then, you can copy those files to a GeneXus installation or to your web application directory.
 
 You can use the following parameters to customize the deploy:
 - TargetFramework: only the assemblies that are generated for this framework will be deployed. Valid values are: `net462` (for GeneXus NET Framework generator) and `net6` (for GeneXus NET generator).
-- DeployDirectory: specifies a GeneXus installation directory.
+- DeployDirectory: specifies the target directory to copy assemblies, by default it is dotnet\bin
 
 Samples:
-- ```dotnet msbuild /t:build;CopyAssemblies /p:DeployDirectory=C:\Genexus /p:TargetFramework=net462 DotNetStandardClasses.sln```
 
-It copies .NET framework assemblies to the folder C:\Genexus\gxnet\bin
+- ```dotnet msbuild /t:CopyAssemblies /p:TargetFramework=net6.0 DotNetStandardClasses.sln ```
 
-- ```dotnet msbuild /t:CopyAssemblies /p:DeployDirectory=C:\Genexus /p:TargetFramework=net6.0 DotNetStandardClasses.sln ```
+It copies .NET 6 assemblies to the folder dotnet\bin
+
+- ```dotnet msbuild /t:CopyAssemblies /p:DeployDirectory=C:\KB\NetModel\web\bin /p:TargetFramework=net6.0 DotNetStandardClasses.sln ```
+
+It copies .NET 6 assemblies to the folder C:\KB\NetModel\web\bin
+
+- ```dotnet msbuild /t:build;CopyAssemblies /p:DeployDirectory=C:\KB\CSharpModel\web\bin /p:TargetFramework=net462 DotNetStandardClasses.sln```
+
+It builds the solution and copies .NET framework assemblies to the folder C:\KB\CSharpModel\web\bin
 
-It copies .NET 6 assemblies to the folder C:\Genexus\gxnetcore\bin
 
 ## Advanced information
 

dotnet/Directory.Build.props

@@ -32,13 +32,6 @@
 		<IsPackable>true</IsPackable>
 		<DisableImplicitNamespaceImports>True</DisableImplicitNamespaceImports>
 	</PropertyGroup>
-	
-	<PropertyGroup Condition="!$(TargetFramework.StartsWith('net4'))">
-		<DeployDirectoryPlatformBin>gxnetcore\bin</DeployDirectoryPlatformBin>
-	</PropertyGroup>
-	<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
-		<DeployDirectoryPlatformBin>gxnet\bin</DeployDirectoryPlatformBin>
-	</PropertyGroup>
 
 	<Target Name="GetFileVersionForPackage">
 		<Message Importance="high" Text="FileVersion:$(FileVersionWithoutRevision)"></Message>

dotnet/Directory.Build.targets

@@ -12,18 +12,11 @@
 		<ApplicationIcon >$(MSBuildThisFileDirectory)\src\resources\Default_App.ico</ApplicationIcon>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
-		<DeployDirectory>$(MSBuildThisFileDirectory)build</DeployDirectory>
+	<PropertyGroup>
+		<DeployDirectory>$(MSBuildThisFileDirectory)bin\$(TargetFramework)</DeployDirectory>
 		<!--Set a default deploy dir-->
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(DeployDirectory)'!=''">
-		<DeployDirectoryWithSep>$(DeployDirectory)\</DeployDirectoryWithSep>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(DeployDirectory)'==''">
-		<DeployDirectoryWithSep/>
-	</PropertyGroup>
-
 	<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
 		<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
 			<PrivateAssets>all</PrivateAssets>
@@ -73,8 +66,8 @@
 	</Target>
 
 	<Target Name="CopyAssemblies" Condition="'$(ProjectName)'!='' AND Exists('$(ProjectDir)$(OutDir)$(TargetFileName)')">
-		<Message Importance="high" Text="Copying $(ProjectDir)$(OutDir)$(TargetFileName) to $(DeployDirectoryWithSep)$(DeployDirectoryPlatformBin)"></Message>
-		<Copy SourceFiles="$(ProjectDir)$(OutDir)$(TargetFileName)" DestinationFolder="$(DeployDirectoryWithSep)$(DeployDirectoryPlatformBin)" />
+		<Message Importance="high" Text="Copying $(ProjectDir)$(OutDir)$(TargetFileName) to $(DeployDirectory)"></Message>
+		<Copy SourceFiles="$(ProjectDir)$(OutDir)$(TargetFileName)" DestinationFolder="$(DeployDirectory)" />
 	</Target>
 
 </Project>