Skip to content

Commit 0e1e7f9

Browse files
claudiamurialdoclaudiamurialdo
authored
Update Microsoft.Identity* from 6.34.0 to 6.35.0 (#1029)
* Update Microsoft.Identity* from 6.34.0 to 6.35.0 to solve dependency conflicts with Microsoft.IdentityModel.Logging * Fix test to check the right version for conditional packages.
1 parent 0e676c0 commit 0e1e7f9

File tree

8 files changed

+25
-12
lines changed

8 files changed

+25
-12
lines changed

‎dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
<PackageTags>Encrypt64 Decrypt64</PackageTags>
77
<PackageId>GeneXus.Encrypt</PackageId>
88
</PropertyGroup>
9-
<ItemGroup>
9+
<ItemGroup Condition="'$(TargetFramework)'!='net462'">
10+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.35.0" />
11+
</ItemGroup>
12+
<ItemGroup Condition="'$(TargetFramework)'=='net462'">
1013
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
1114
</ItemGroup>
15+
1216
</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.34.0" />
176+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.35.0" />
177177
<PackageReference Include="System.Drawing.Common" Version="4.7.2" />
178-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.34.0" />
178+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.35.0" />
179179
<PackageReference Include="NUglify" Version="1.16.4" />
180180
</ItemGroup>
181181

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434

3535
<ItemGroup>
3636
<PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
37-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.34.0" />
38-
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.34.0" />
39-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
37+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.35.0" />
38+
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.35.0" />
39+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.35.0" />
4040
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
41-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.34.0" />
41+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.35.0" />
4242
</ItemGroup>
4343

4444
<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.34.0" />
22+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.35.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.34.0" />
20+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.35.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
@@ -62,7 +62,7 @@
6262
<PackageReference Include="iTextSharp" Version="5.5.13.2" />
6363
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.5" />
6464
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.7" PrivateAssets="All" />
65-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
65+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.35.0" />
6666
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
6767
<PackageReference Include="xunit" Version="2.4.1" />
6868
<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.34.0" />
22+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.35.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/ProjectHealthTest/PackageVersionsConsistency.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,21 @@ private void TestPackageVersionConsistencyAcrossProjects(string targetFramework,
101101
XmlAttribute condition = packageNode.ParentNode.Attributes["Condition"];
102102
if (condition != null) {
103103
if (targetFramework == NET8 && condition.Value.Contains($"=='{NET_FRAMEWORK}'", StringComparison.OrdinalIgnoreCase))
104+
{
104105
continue;
106+
}
107+
else if (targetFramework == NET8 && condition.Value.Contains($"!='{NET8}'", StringComparison.OrdinalIgnoreCase))
108+
{
109+
continue;
110+
}
105111
else if (targetFramework == NET_FRAMEWORK && condition.Value.Contains($"=='{NET8}'", StringComparison.OrdinalIgnoreCase))
106112
{
107113
continue;
108114
}
109-
115+
else if (targetFramework == NET_FRAMEWORK && condition.Value.Contains($"!='{NET_FRAMEWORK}'", StringComparison.OrdinalIgnoreCase))
116+
{
117+
continue;
118+
}
110119
}
111120

112121
if (packageNode.Attributes == null)

0 commit comments

Comments
 (0)