From 751423959c4ce6327e8fa98ae5ec2f9d8d86b4e3 Mon Sep 17 00:00:00 2001
From: Claudia Murialdo <cmurialdo@genexus.com>
Date: Fri, 29 Jul 2022 08:09:10 -0300
Subject: [PATCH 1/2] Stop distributing unneeded deps.json with GenexusClasses
 package id replaced. Clear unnecessary messages at Directory.Build.targets.

---
 .gitignore                                    |  1 +
 dotnet/Directory.Build.targets                | 47 ++-----------------
 .../GxCryptography/GxCryptography.csproj      |  1 -
 .../GxCryptographyCommon.csproj               |  1 -
 .../dotnetcommon/GxEncrypt/GxEncrypt.csproj   |  3 +-
 .../GXDataInitialization.csproj               |  6 ---
 .../GxNetCoreStartup/GxNetCoreStartup.csproj  |  6 ---
 dotnet/src/dotnetcore/Reor/Reor.csproj        |  8 +---
 ...eXus.Deploy.AzureFunctions.Handlers.csproj |  1 +
 9 files changed, 7 insertions(+), 67 deletions(-)

diff --git a/.gitignore b/.gitignore
index c1805e043..9c40adaa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -363,3 +363,4 @@ build
 /dotnet/src/dotnetcore/Reor/net6.0/Reor.deps.json
 .out
 /dotnet/Veracode.sln
+/dotnet/VeracodeSolution.sln
diff --git a/dotnet/Directory.Build.targets b/dotnet/Directory.Build.targets
index e67e10465..e31c574ba 100644
--- a/dotnet/Directory.Build.targets
+++ b/dotnet/Directory.Build.targets
@@ -14,7 +14,7 @@
 	
 	<PropertyGroup>
 		<DumpSolutionName>TempSolution.sln</DumpSolutionName>
-		<DumpSolutionTargetFramework>net4</DumpSolutionTargetFramework>
+		<DumpSolutionTargetFrameworkDefault>net6</DumpSolutionTargetFrameworkDefault>
 	</PropertyGroup>
 	
 	<PropertyGroup>
@@ -29,55 +29,14 @@
 		</PackageReference>
 	</ItemGroup>
 
-	<UsingTask
-    TaskName="ReplaceFileText"
-    TaskFactory="RoslynCodeTaskFactory"
-    AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
-		<ParameterGroup>
-			<InputFilename ParameterType="System.String" Required="true" />
-			<OutputFilename ParameterType="System.String" Required="true" />
-			<MatchExpression ParameterType="System.String" Required="true" />
-			<ReplacementText ParameterType="System.String" Required="true" />
-		</ParameterGroup>
-		<Task>
-			<Using Namespace="System"/>
-			<Using Namespace="System.IO"/>
-			<Using Namespace="System.Text.RegularExpressions" />
-			<Code Type="Fragment" Language="cs">
-				<![CDATA[  
-          File.WriteAllText(
-            OutputFilename,
-            Regex.Replace(File.ReadAllText(InputFilename), MatchExpression, ReplacementText)
-            );
-        ]]>
-			</Code>
-		</Task>
-	</UsingTask>
-
-
-	<Target Name="PostBuild" AfterTargets="Build" Condition="'$(GxGenerateDepsFile)'=='true' AND ('$(TargetFramework)'=='net6.0')">
-		<MakeDir Directories="$(TargetFramework)"/>
-		<Exec Command="copy $(OutDir)$(ProjectName).deps.json   $(TargetFramework)\$(ProjectName).deps.json" />
-		<ReplaceFileText
-       InputFilename="$(TargetFramework)\$(ProjectName).deps.json"
-       OutputFilename="$(TargetFramework)\$(ProjectName).deps.json"
-       MatchExpression="GeneXus\.Classes\.Core"
-       ReplacementText="GxClasses" />
-		<ReplaceFileText
-       InputFilename="$(TargetFramework)\$(ProjectName).deps.json"
-       OutputFilename="$(TargetFramework)\$(ProjectName).deps.json"
-       MatchExpression="GeneXus\.Classes\.Web\.Core"
-       ReplacementText="GxClasses.Web"/>
-	</Target>
-
 	<Target Name="CopyAssemblies" Condition="'$(ProjectName)'!='' AND Exists('$(ProjectDir)$(OutDir)$(TargetFileName)')">
 		<Message Importance="high" Text="Copying $(ProjectDir)$(OutDir)$(TargetFileName) to $(DeployDirectory)"></Message>
 		<Copy SourceFiles="$(ProjectDir)$(OutDir)$(TargetFileName)" DestinationFolder="$(DeployDirectory)" />
 	</Target>
 
-	<Target Name="DumpProjects" Condition="($(TargetFramework.StartsWith($(DumpSolutionTargetFramework))) OR $(TargetFrameworks.Contains($(DumpSolutionTargetFramework))) ) AND !$(MSBuildProjectFullPath.Contains('\test\'))">
-		<Message Importance="high" Text="Adding $(MSBuildProjectFullPath) to $(MSBuildThisFileDirectory)$(DumpSolutionName)"></Message>
+	<Target Name="DumpProjects" Condition="($(TargetFramework.StartsWith($(DumpSolutionTargetFrameworkDefault))) OR $(TargetFrameworks.Contains($(DumpSolutionTargetFrameworkDefault))) ) AND !$(MSBuildProjectFullPath.Contains('\test\')) AND ('$(IsPublishable)'=='true' OR '$(IsPublishable)'=='')">
 		<Exec Command="dotnet sln $(MSBuildThisFileDirectory)$(DumpSolutionName) add $(MSBuildProjectFullPath)"></Exec>
+		
 	</Target>
 
 </Project>
\ No newline at end of file
diff --git a/dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj b/dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj
index 628826d4e..b5ffc6cc1 100644
--- a/dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj
+++ b/dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net462;net6.0</TargetFrameworks>
-		<TargetFramework Condition="'$(Publishing)' == 'true'">net462</TargetFramework>
 		<RootNamespace>GxCryptography</RootNamespace>
 		<NoWarn>618;1607;1698;SYSLIB0021;SYSLIB0027;SYSLIB0028;SYSLIB0023</NoWarn>
 		<AssemblyName>GxCryptography</AssemblyName>
diff --git a/dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj b/dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj
index 39853323b..4b040e8f1 100644
--- a/dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj
+++ b/dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net462;net6.0</TargetFrameworks>
-		<TargetFramework Condition="'$(Publishing)' == 'true'">net462</TargetFramework>
 		<RootNamespace>GxCryptographyCommon</RootNamespace>
 		<NoWarn>618;1607;1698</NoWarn>
 		<AssemblyName>GxCryptographyCommon</AssemblyName>
diff --git a/dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj b/dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj
index a44580b82..a46827308 100644
--- a/dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj
+++ b/dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj
@@ -1,7 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net462;net6.0</TargetFrameworks>
-		<TargetFramework Condition="'$(Publishing)' == 'true'">net462</TargetFramework>
 		<RootNamespace>GeneXus.Encryption</RootNamespace>
 		<AssemblyName>GxEncrypt</AssemblyName>
 		<PackageTags>Encrypt64 Decrypt64</PackageTags>
diff --git a/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj b/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj
index 4c5da499e..7c41acaec 100644
--- a/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj
+++ b/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj
@@ -16,12 +16,6 @@
     <ProjectReference Include="..\GxClasses\GxClasses.csproj"/>
   </ItemGroup>
 
-   <ItemGroup>
-		<Content Include="net6.0\$(MSBuildProjectName).deps.json">
-			<Pack>true</Pack>
-			<PackagePath>\content\net6.0\</PackagePath>
-		</Content>
-	</ItemGroup>
 	<Target Name="CustomContentTarget">
 		<ItemGroup>
 			<TfmSpecificPackageFile Include="$(OutputPath)\$(MSBuildProjectName).deps.json">
diff --git a/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj b/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj
index fe91a110e..27fbeb856 100644
--- a/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj
+++ b/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj
@@ -28,12 +28,6 @@
 		</Reference>
 	</ItemGroup>
 
-	<ItemGroup>
-		<Content Include="net6.0\$(MSBuildProjectName).deps.json">
-			<Pack>true</Pack>
-			<PackagePath>\content\net6.0\</PackagePath>
-		</Content>
-	</ItemGroup>
 	<Target Name="CustomContentTarget">
 		<ItemGroup>
 			<TfmSpecificPackageFile Include="$(OutputPath)\$(MSBuildProjectName).deps.json">
diff --git a/dotnet/src/dotnetcore/Reor/Reor.csproj b/dotnet/src/dotnetcore/Reor/Reor.csproj
index c0a9951e4..f02fc7005 100644
--- a/dotnet/src/dotnetcore/Reor/Reor.csproj
+++ b/dotnet/src/dotnetcore/Reor/Reor.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net6.0</TargetFrameworks>
 		<OutputType>Exe</OutputType>
@@ -28,10 +28,4 @@
 			</TfmSpecificPackageFile>
 		</ItemGroup>
 	</Target>
-	<ItemGroup>
-		<Content Include="net6.0\$(MSBuildProjectName).deps.json">
-			<Pack>true</Pack>
-			<PackagePath>\content\net6.0\</PackagePath>
-		</Content>
-	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj
index 7eed85316..a56d42ca2 100644
--- a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj
+++ b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>net6.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
+    <IsPublishable>false</IsPublishable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.11" />

From 2dc406a3a01c6f6a2b4844b00c028828faf3e30d Mon Sep 17 00:00:00 2001
From: Claudia Murialdo <cmurialdo@genexus.com>
Date: Fri, 29 Jul 2022 08:41:38 -0300
Subject: [PATCH 2/2] Moving configuration from veracode.yml to
 Directory.Build.targets to allow setting different values on each branch.

---
 .github/workflows/veracode.yml | 7 ++-----
 dotnet/Directory.Build.targets | 9 ++++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/veracode.yml b/.github/workflows/veracode.yml
index 67fe797ca..65be482e8 100644
--- a/.github/workflows/veracode.yml
+++ b/.github/workflows/veracode.yml
@@ -62,13 +62,10 @@ jobs:
 
     - name: Build
       run: |
-        $configuration = "Release"
         $veracodesolution = "VeracodeSolution"
-        $veracodesolutionFileName = "VeracodeSolution.sln"
-        $veracodetargetframework = "net4"
         dotnet new sln --name $veracodesolution --output dotnet --force
-        dotnet msbuild dotnet\DotNetStandardClasses.sln /t:DumpProjects -p:DumpSolutionName=$veracodesolutionFileName -p:DumpSolutionTargetFramework=$veracodetargetframework /m:1
-        dotnet publish dotnet\$veracodesolutionFileName --configuration $Env:BuildConfiguration -o .out -p:Publishing=true -p:SignAssembly=false
+        dotnet msbuild dotnet\DotNetStandardClasses.sln /t:DumpProjects -p:DumpSolutionName=$veracodesolution /m:1
+        dotnet msbuild dotnet\Directory.Build.targets /t:PublishForAnalyzer -p:DumpSolutionName=$veracodesolution
 
     - name: Create package for Veracode scan
       shell: powershell
diff --git a/dotnet/Directory.Build.targets b/dotnet/Directory.Build.targets
index e31c574ba..d585c039e 100644
--- a/dotnet/Directory.Build.targets
+++ b/dotnet/Directory.Build.targets
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 	
 	<PropertyGroup>
-		<DumpSolutionName>TempSolution.sln</DumpSolutionName>
+		<DumpSolutionName>TempSolution</DumpSolutionName>
 		<DumpSolutionTargetFrameworkDefault>net6</DumpSolutionTargetFrameworkDefault>
 	</PropertyGroup>
 	
@@ -35,8 +35,11 @@
 	</Target>
 
 	<Target Name="DumpProjects" Condition="($(TargetFramework.StartsWith($(DumpSolutionTargetFrameworkDefault))) OR $(TargetFrameworks.Contains($(DumpSolutionTargetFrameworkDefault))) ) AND !$(MSBuildProjectFullPath.Contains('\test\')) AND ('$(IsPublishable)'=='true' OR '$(IsPublishable)'=='')">
-		<Exec Command="dotnet sln $(MSBuildThisFileDirectory)$(DumpSolutionName) add $(MSBuildProjectFullPath)"></Exec>
-		
+		<Exec Command="dotnet sln $(MSBuildThisFileDirectory)$(DumpSolutionName).sln add $(MSBuildProjectFullPath)"></Exec>
+	</Target>
+	
+	<Target Name="PublishForAnalyzer">
+		<Exec Command="dotnet publish $(MSBuildThisFileDirectory)$(DumpSolutionName).sln --configuration Debug -o $(MSBuildThisFileDirectory)..\.out -p:Publishing=true -p:SignAssembly=false --framework net6.0"></Exec>
 	</Target>
 
 </Project>
\ No newline at end of file