Skip to content
This repository was archived by the owner on Oct 14, 2021. It is now read-only.

Commit 6c223fe

Browse files
sgramponesgrampone
authored
Updatev17u5 (#63)
* Upgrade to Net 5.0 and update to 17.5.0 * Fix dll signature
1 parent 99d247f commit 6c223fe

File tree

14 files changed

+121
-26
lines changed

14 files changed

+121
-26
lines changed

‎SecurityAPIParent.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityAPITest", "test\dot
4343
EndProject
4444
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{88EB1BC4-0D68-4906-AA36-E1EA1F6AFD35}"
4545
ProjectSection(SolutionItems) = preProject
46+
dotnet\resources\key.snk = dotnet\resources\key.snk
4647
dotnet\resources\Neon.SSH.NET.dll = dotnet\resources\Neon.SSH.NET.dll
4748
EndProjectSection
4849
EndProject
4950
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityAPITestNetCore", "test\dotnetcore\SecurityAPITestNetCore\SecurityAPITestNetCore.csproj", "{27D2471A-DA98-4912-A327-AF135550B034}"
5051
EndProject
52+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{7AF6A951-975C-429A-B319-656F473D833A}"
53+
ProjectSection(SolutionItems) = preProject
54+
test\resources\key.snk = test\resources\key.snk
55+
EndProjectSection
56+
EndProject
5157
Global
5258
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5359
Debug|Any CPU = Debug|Any CPU
@@ -134,6 +140,7 @@ Global
134140
{9100025A-68E0-4618-B83C-4D626CB89DBB} = {7F5F1DDC-09BE-4567-8CD4-41387AD91BEE}
135141
{88EB1BC4-0D68-4906-AA36-E1EA1F6AFD35} = {5CB1725B-3FA5-49B1-A1F8-41EFCACA3CF1}
136142
{27D2471A-DA98-4912-A327-AF135550B034} = {89FFECB3-7A69-41F8-88C7-F05193E5CDF4}
143+
{7AF6A951-975C-429A-B319-656F473D833A} = {750343D3-EAA6-433E-A099-71BC6851EA71}
137144
EndGlobalSection
138145
GlobalSection(ExtensibilityGlobals) = postSolution
139146
SolutionGuid = {AEB1693D-906F-402A-AD66-A1A9AE2ABBE2}

‎dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AssemblyName>GeneXusCryptographyNetCoreImpl</AssemblyName>
6-
<Version>17.4.0</Version>
6+
<Version>17.5.0</Version>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
1010

1111
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
12+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
13+
</PropertyGroup>
14+
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
1315
<DefineConstants>NETCORE</DefineConstants>
14-
1516
</PropertyGroup>
1617

1718
<ItemGroup>

‎dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AssemblyName>GeneXusFtpsNetCoreImpl</AssemblyName>
6-
<Version>17.4.0</Version>
6+
<Version>17.5.0</Version>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
1010

1111
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
12+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
13+
</PropertyGroup>
14+
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
1315
<DefineConstants>NETCORE</DefineConstants>
14-
1516
</PropertyGroup>
1617

1718
<ItemGroup>

‎dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AssemblyName>GeneXusJWTNetCoreImpl</AssemblyName>
6-
<Version>17.4.0</Version>
6+
<Version>17.5.0</Version>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
1010

1111
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
12+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
13+
</PropertyGroup>
14+
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
1315
<DefineConstants>NETCORE</DefineConstants>
14-
1516
</PropertyGroup>
1617

1718
<ItemGroup>

‎dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AssemblyName>GeneXusSftpNetCoreImpl</AssemblyName>
6-
<Version>17.4.0</Version>
6+
<Version>17.5.0</Version>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
1010

1111
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
12+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
13+
</PropertyGroup>
14+
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
1315
<DefineConstants>NETCORE</DefineConstants>
14-
1516
</PropertyGroup>
1617

1718
<ItemGroup>

‎dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AssemblyName>GeneXusXMLSignatureNetCoreImpl</AssemblyName>
6-
<Version>17.4.0</Version>
6+
<Version>17.5.0</Version>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
1010

1111
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
12+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
13+
</PropertyGroup>
14+
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
1315
<DefineConstants>NETCORE</DefineConstants>
14-
1516
</PropertyGroup>
1617
<ItemGroup>
1718
<Compile Include="..\..\dotnetframework\GeneXusXmlSignature\Commons\DSigOptions.cs" Link="Commons\DSigOptions.cs" />

‎dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AssemblyName>GeneXusSecurityAPICommonsNetCoreImpl</AssemblyName>
6-
<Version>17.4.0</Version>
6+
<Version>17.5.0</Version>
77
</PropertyGroup>
88

99
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
1010

1111
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
12+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
13+
</PropertyGroup>
14+
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
1315
<DefineConstants>NETCORE</DefineConstants>
14-
1516
</PropertyGroup>
1617

1718
<ItemGroup>

‎dotnet/dotnetframework/GeneXusCryptography/GeneXusCryptography.csproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,23 @@
33
<TargetFramework>net47</TargetFramework>
44
<RootNamespace>GeneXusCryptography</RootNamespace>
55
<AssemblyName>GeneXusCryptographyImpl</AssemblyName>
6+
<Version>17.5.0</Version>
7+
</PropertyGroup>
8+
<PropertyGroup>
9+
<SignAssembly>true</SignAssembly>
10+
</PropertyGroup>
11+
<PropertyGroup>
12+
<AssemblyOriginatorKeyFile>..\..\resources\key.snk</AssemblyOriginatorKeyFile>
613
</PropertyGroup>
714
<ItemGroup>
815
<ProjectReference Include="..\SecurityAPICommons\SecurityAPICommons.csproj"/>
916
</ItemGroup>
1017
<ItemGroup>
1118
<PackageReference Include="Portable.BouncyCastle" Version="1.8.6.7" />
1219
</ItemGroup>
20+
<ItemGroup>
21+
<None Include="..\..\resources\key.snk">
22+
<Link>key.snk</Link>
23+
</None>
24+
</ItemGroup>
1325
</Project>

‎dotnet/dotnetframework/GeneXusFtps/GeneXusFtps.csproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,23 @@
33
<TargetFramework>net47</TargetFramework>
44
<RootNamespace>GeneXusFtps</RootNamespace>
55
<AssemblyName>GeneXusFtpsImpl</AssemblyName>
6+
<Version>17.5.0</Version>
7+
</PropertyGroup>
8+
<PropertyGroup>
9+
<SignAssembly>true</SignAssembly>
10+
</PropertyGroup>
11+
<PropertyGroup>
12+
<AssemblyOriginatorKeyFile>..\..\resources\key.snk</AssemblyOriginatorKeyFile>
613
</PropertyGroup>
714
<ItemGroup>
815
<ProjectReference Include="..\SecurityAPICommons\SecurityAPICommons.csproj"/>
916
</ItemGroup>
1017
<ItemGroup>
1118
<PackageReference Include="FluentFTP" Version="31.3.2" />
1219
</ItemGroup>
20+
<ItemGroup>
21+
<None Include="..\..\resources\key.snk">
22+
<Link>key.snk</Link>
23+
</None>
24+
</ItemGroup>
1325
</Project>

‎dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@
33
<TargetFramework>net47</TargetFramework>
44
<RootNamespace>GeneXusJWT</RootNamespace>
55
<AssemblyName>GeneXusJWTImpl</AssemblyName>
6+
<Version>17.5.0</Version>
67
</PropertyGroup>
78
<PropertyGroup>
89
<AppConfig>App.$(Configuration).config</AppConfig>
910
</PropertyGroup>
11+
<PropertyGroup>
12+
<SignAssembly>true</SignAssembly>
13+
</PropertyGroup>
14+
<PropertyGroup>
15+
<AssemblyOriginatorKeyFile>..\..\resources\key.snk</AssemblyOriginatorKeyFile>
16+
</PropertyGroup>
1017
<ItemGroup>
1118
<None Include="app.config" />
1219
<None Include="App.Debug.config" />
@@ -25,4 +32,9 @@
2532
<ItemGroup>
2633
<ProjectReference Include="..\SecurityAPICommons\SecurityAPICommons.csproj"/>
2734
</ItemGroup>
35+
<ItemGroup>
36+
<None Include="..\..\resources\key.snk">
37+
<Link>key.snk</Link>
38+
</None>
39+
</ItemGroup>
2840
</Project>

0 commit comments

Comments
 (0)