genexuslabs · sgrampone · Aug 4, 2021 · Aug 3, 2021 · Aug 3, 2021
diff --git a/SecurityAPIParent.sln b/SecurityAPIParent.sln
@@ -43,11 +43,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityAPITest", "test\dot
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{88EB1BC4-0D68-4906-AA36-E1EA1F6AFD35}"
 	ProjectSection(SolutionItems) = preProject
+		dotnet\resources\key.snk = dotnet\resources\key.snk
 		dotnet\resources\Neon.SSH.NET.dll = dotnet\resources\Neon.SSH.NET.dll
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityAPITestNetCore", "test\dotnetcore\SecurityAPITestNetCore\SecurityAPITestNetCore.csproj", "{27D2471A-DA98-4912-A327-AF135550B034}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{7AF6A951-975C-429A-B319-656F473D833A}"
+	ProjectSection(SolutionItems) = preProject
+		test\resources\key.snk = test\resources\key.snk
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -134,6 +140,7 @@ Global
 		{9100025A-68E0-4618-B83C-4D626CB89DBB} = {7F5F1DDC-09BE-4567-8CD4-41387AD91BEE}
 		{88EB1BC4-0D68-4906-AA36-E1EA1F6AFD35} = {5CB1725B-3FA5-49B1-A1F8-41EFCACA3CF1}
 		{27D2471A-DA98-4912-A327-AF135550B034} = {89FFECB3-7A69-41F8-88C7-F05193E5CDF4}
+		{7AF6A951-975C-429A-B319-656F473D833A} = {750343D3-EAA6-433E-A099-71BC6851EA71}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AEB1693D-906F-402A-AD66-A1A9AE2ABBE2}

diff --git a/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj b/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>GeneXusCryptographyNetCoreImpl</AssemblyName>
-    <Version>17.4.0</Version>
+    <Version>17.5.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
+  </PropertyGroup>
+  <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
     <DefineConstants>NETCORE</DefineConstants>
-
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj b/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>GeneXusFtpsNetCoreImpl</AssemblyName>
-    <Version>17.4.0</Version>
+    <Version>17.5.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
+  </PropertyGroup>
+  <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
     <DefineConstants>NETCORE</DefineConstants>
-
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj b/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>GeneXusJWTNetCoreImpl</AssemblyName>
-    <Version>17.4.0</Version>
+    <Version>17.5.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
+  </PropertyGroup>
+  <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
     <DefineConstants>NETCORE</DefineConstants>
-
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj b/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>GeneXusSftpNetCoreImpl</AssemblyName>
-    <Version>17.4.0</Version>
+    <Version>17.5.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
+  </PropertyGroup>
+  <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
     <DefineConstants>NETCORE</DefineConstants>
-
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj b/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>GeneXusXMLSignatureNetCoreImpl</AssemblyName>
-    <Version>17.4.0</Version>
+    <Version>17.5.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
+  </PropertyGroup>
+  <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
     <DefineConstants>NETCORE</DefineConstants>
-
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\dotnetframework\GeneXusXmlSignature\Commons\DSigOptions.cs" Link="Commons\DSigOptions.cs" />

diff --git a/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj b/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>GeneXusSecurityAPICommonsNetCoreImpl</AssemblyName>
-    <Version>17.4.0</Version>
+    <Version>17.5.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
+  </PropertyGroup>
+  <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
     <DefineConstants>NETCORE</DefineConstants>
-
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/dotnet/dotnetframework/GeneXusCryptography/GeneXusCryptography.csproj b/dotnet/dotnetframework/GeneXusCryptography/GeneXusCryptography.csproj
@@ -3,11 +3,23 @@
     <TargetFramework>net47</TargetFramework>
     <RootNamespace>GeneXusCryptography</RootNamespace>
     <AssemblyName>GeneXusCryptographyImpl</AssemblyName>
+   <Version>17.5.0</Version>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\..\resources\key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\SecurityAPICommons\SecurityAPICommons.csproj"/>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.6.7" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\resources\key.snk">
+      <Link>key.snk</Link>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps.csproj b/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps.csproj
@@ -3,11 +3,23 @@
     <TargetFramework>net47</TargetFramework>
     <RootNamespace>GeneXusFtps</RootNamespace>
     <AssemblyName>GeneXusFtpsImpl</AssemblyName>
+   <Version>17.5.0</Version>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\..\resources\key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\SecurityAPICommons\SecurityAPICommons.csproj"/>
   </ItemGroup>
 	<ItemGroup>
     <PackageReference Include="FluentFTP" Version="31.3.2" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\resources\key.snk">
+      <Link>key.snk</Link>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj b/dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj
@@ -3,10 +3,17 @@
     <TargetFramework>net47</TargetFramework>
     <RootNamespace>GeneXusJWT</RootNamespace>
     <AssemblyName>GeneXusJWTImpl</AssemblyName>
+   <Version>17.5.0</Version>
   </PropertyGroup>
   <PropertyGroup>
     <AppConfig>App.$(Configuration).config</AppConfig>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\..\resources\key.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="App.Debug.config" />
@@ -25,4 +32,9 @@
   <ItemGroup>
     <ProjectReference Include="..\SecurityAPICommons\SecurityAPICommons.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\resources\key.snk">
+      <Link>key.snk</Link>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/dotnet/dotnetframework/GeneXusSftp/GeneXusSftp.csproj b/dotnet/dotnetframework/GeneXusSftp/GeneXusSftp.csproj
@@ -3,6 +3,13 @@
     <TargetFramework>net47</TargetFramework>
     <RootNamespace>GeneXusSftp</RootNamespace>
     <AssemblyName>GeneXusSftpClientImpl</AssemblyName>
+   <Version>17.5.0</Version>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\..\resources\key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Neon.SSH.NET">
@@ -12,4 +19,9 @@
   <ItemGroup>
     <ProjectReference Include="..\SecurityAPICommons\SecurityAPICommons.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\resources\key.snk">
+      <Link>key.snk</Link>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/dotnet/dotnetframework/GeneXusXmlSignature/GeneXusXmlSignature.csproj b/dotnet/dotnetframework/GeneXusXmlSignature/GeneXusXmlSignature.csproj
@@ -3,6 +3,13 @@
     <TargetFramework>net47</TargetFramework>
 	  <RootNamespace>GeneXusXmlSignature</RootNamespace>
     <AssemblyName>GeneXusXmlSignatureImpl</AssemblyName>
+   <Version>17.5.0</Version>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\..\resources\key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\SecurityAPICommons\SecurityAPICommons.csproj" />
@@ -12,4 +19,9 @@
   <ItemGroup>
     <Reference Include="System.Security" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\resources\key.snk">
+      <Link>key.snk</Link>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/dotnet/dotnetframework/SecurityAPICommons/SecurityAPICommons.csproj b/dotnet/dotnetframework/SecurityAPICommons/SecurityAPICommons.csproj
@@ -2,12 +2,23 @@
  <PropertyGroup>
     <TargetFramework>net47</TargetFramework>
     <AssemblyName>GeneXusSecurityAPICommonsImpl</AssemblyName>
+   <Version>17.5.0</Version>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\..\resources\key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="BouncyCastle" Version="1.8.6.1" />
     <PackageReference Include="System.Security.Cryptography.Cng" Version="4.7.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.3.0" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\resources\key.snk">
+      <Link>key.snk</Link>
+    </None>
+  </ItemGroup>
 
 </Project>
diff --git a/test/dotnetframework/SecurityAPITest/SecurityAPITest.csproj b/test/dotnetframework/SecurityAPITest/SecurityAPITest.csproj
@@ -5,7 +5,14 @@
     <IsPublishable>false</IsPublishable>
     <RootNamespace>SecurityAPITest</RootNamespace>
     <AssemblyName>SecurityAPITest</AssemblyName>
+    <Version>17.5.0</Version>
 	</PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\..\resources\key.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
    <ItemGroup>
     <PackageReference Include="FubarDev.FtpServer" Version="3.1.1" />
     <PackageReference Include="Microsoft.CodeCoverage" Version="16.10.0" />
@@ -407,5 +414,9 @@
   <ItemGroup>
     <Folder Include="dummycerts\Test_sha1_1024_DER\" />
   </ItemGroup>
-
+  <ItemGroup>
+    <None Include="..\..\resources\key.snk">
+      <Link>key.snk</Link>
+    </None>
+  </ItemGroup>
 </Project>