Skip to content

Commit 33d03ce

Browse files
Merge branch 'master' into microsoft-data-sqlclient-upgrade
2 parents 87f3f75 + 91c6a3c commit 33d03ce

File tree

9 files changed

+18
-22
lines changed

9 files changed

+18
-22
lines changed

dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
<PackageTags>Encrypt64 Decrypt64</PackageTags>
77
<PackageId>GeneXus.Encrypt</PackageId>
88
</PropertyGroup>
9-
<ItemGroup Condition="'$(TargetFramework)'!='net462'">
10-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
1111
</ItemGroup>
12-
<ItemGroup Condition="'$(TargetFramework)'=='net462'">
13-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.5.1" />
14-
</ItemGroup>
15-
1612
</Project>

dotnet/src/dotnetcore/GxClasses/GxClasses.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@
173173
<PackageReference Include="Sandwych.GeographicLib" Version="1.49.3" />
174174
<PackageReference Include="Stubble.Core" Version="1.8.4" />
175175
<PackageReference Include="System.DirectoryServices" Version="4.7.0" />
176-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
176+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
177177
<PackageReference Include="System.Drawing.Common" Version="4.7.2" />
178-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.8.0" />
178+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.34.0" />
179179
<PackageReference Include="NUglify" Version="1.16.4" />
180180
</ItemGroup>
181181

dotnet/src/dotnetframework/GxClasses/GxClasses.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
<PackageReference Include="GeneXus.NodaTime" Version="2.4.19.1" />
1414
<PackageReference Include="ManagedFusion.Rewriter" Version="3.7.0" />
1515
<PackageReference Include="Microsoft.AspNet.WebPages" Version="3.2.9" />
16-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.5.1" />
16+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
1717
<PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.0" />
1818
<PackageReference Include="MySqlConnector" Version="2.2.3" />
1919
<PackageReference Include="Npgsql" Version="3.2.7" />
20-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.5.1" />
20+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.34.0" />
2121
<PackageReference Include="Microsoft.Win32.Registry" Version="4.3.0" />
2222
<PackageReference Include="Nustache" Version="1.16.0.10" />
2323
<PackageReference Include="SecurityCodeScan" PrivateAssets="all" Version="3.3.0" />

dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.8.0" />
37-
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.8.0" />
38-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
36+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.34.0" />
37+
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.34.0" />
38+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
3939
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
4040
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
41-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.8.0" />
41+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.34.0" />
4242
</ItemGroup>
4343

4444
<ItemGroup>

dotnet/src/extensions/SecurityAPI/dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
</ItemGroup>
1818
<ItemGroup>
1919
<PackageReference Include="BouncyCastle.Cryptography" Version="2.2.1" />
20-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.5.1" />
21-
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.5.1" />
22-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.5.1" />
20+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.34.0" />
21+
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.34.0" />
22+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
2323
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
24-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.5.1" />
24+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.34.0" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

dotnet/test/DotNetCoreChunkedTest/DotNetCoreChunkedTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageReference Include="FreeSpire.PDF" Version="8.6.0" />
2020
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.5" />
2121
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.7" PrivateAssets="All" />
22-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
22+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
2323
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
2424
<PackageReference Include="xunit" Version="2.4.1" />
2525
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

dotnet/test/DotNetCoreOpenTelemetryTest/DotNetCoreOpenTelemetryTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1818
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.5" />
1919
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.7" PrivateAssets="All" />
20-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
20+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
2222
<PackageReference Include="xunit" Version="2.4.1" />
2323
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<PackageReference Include="iTextSharp" Version="5.5.13.2" />
6161
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.5" />
6262
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.7" PrivateAssets="All" />
63-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
63+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
6464
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
6565
<PackageReference Include="xunit" Version="2.4.1" />
6666
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

dotnet/test/DotNetCoreWebUnitTest/DotNetCoreWebUnitTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageReference Include="FreeSpire.PDF" Version="8.6.0" />
2020
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.5" />
2121
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.7" PrivateAssets="All" />
22-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
22+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
2323
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
2424
<PackageReference Include="xunit" Version="2.4.1" />
2525
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

0 commit comments

Comments
 (0)