Skip to content

Update IdentityModel to 7.4.1 #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>
<PropertyGroup>
<AbstractionsXunitReleaseVersion>2.0.3</AbstractionsXunitReleaseVersion>
<AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>7.1.2</AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>
<AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>7.4.1</AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>
<CssParserReleaseVersionSuffix>20230414.1</CssParserReleaseVersionSuffix>
<HumanizerReleaseVersion>2.14.1</HumanizerReleaseVersion>
<MSBuildLocatorReleaseVersion>1.6.10</MSBuildLocatorReleaseVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ Subject: [PATCH] fix for source build
15 files changed, 8 insertions(+), 89 deletions(-)

diff --git a/build/common.props b/build/common.props
index 9f99de11..143d8509 100644
index 7f22eb03..ec229fc2 100644
--- a/build/common.props
+++ b/build/common.props
@@ -35,7 +35,7 @@
@@ -46,7 +46,7 @@
</PropertyGroup>

<PropertyGroup>
Expand All @@ -34,12 +34,12 @@ index 9f99de11..143d8509 100644
<PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
</PropertyGroup>

@@ -47,9 +47,5 @@
@@ -58,9 +58,5 @@
<NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
<NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
</PropertyGroup>
-
- <ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
- <ItemGroup>
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="All"/>
- </ItemGroup>

Expand Down Expand Up @@ -68,21 +68,21 @@ index 23e1b910..254f709e 100644

</Project>
diff --git a/build/targets.props b/build/targets.props
index f020b59b..934aae74 100644
index eb2d3523..e9cde8f0 100644
--- a/build/targets.props
+++ b/build/targets.props
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
- <SrcTargets Condition="'$(TargetNet8)' == 'True'">net461;net462;net472;netstandard2.0;net6.0;net8.0</SrcTargets>
- <SrcTargets Condition="'$(TargetNet8)' != 'True'">net461;net462;net472;netstandard2.0;net6.0</SrcTargets>
+ <SrcTargets Condition="'$(TargetNet8)' == 'True'">netstandard2.0;net6.0;net8.0</SrcTargets>
+ <SrcTargets Condition="'$(TargetNet8)' != 'True'">netstandard2.0;net6.0</SrcTargets>
- <SrcTargets Condition="'$(LocalBuild)' != 'True'">net461;net462;net472;netstandard2.0;net6.0;net8.0</SrcTargets>
- <SrcTargets Condition="'$(LocalBuild)' == 'True'">net461;netstandard2.0;net8.0</SrcTargets>
+ <SrcTargets Condition="'$(LocalBuild)' != 'True'">netstandard2.0;net6.0;net8.0</SrcTargets>
+ <SrcTargets Condition="'$(LocalBuild)' == 'True'">netstandard2.0;net6.0</SrcTargets>
<SrcStandardTargets>netstandard2.0</SrcStandardTargets>
</PropertyGroup>
</Project>
diff --git a/buildConfiguration.xml b/buildConfiguration.xml
index 83cd80e1..868c5395 100644
index 06e064da..e6bb5701 100644
--- a/buildConfiguration.xml
+++ b/buildConfiguration.xml
@@ -1,7 +1,7 @@
Expand All @@ -91,9 +91,9 @@ index 83cd80e1..868c5395 100644
<nugetVersion>3.5.0-rc-1285</nugetVersion>
- <runtimes>net461,netstandard2.0</runtimes>
+ <runtimes>netstandard2.0</runtimes>
<assemblyVersion>7.1.2</assemblyVersion>
<nugetSuffix>preview</nugetSuffix>
<projects>
<src>
<project name="Microsoft.IdentityModel.Logging" />
diff --git a/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj b/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj
index f7a11afe..4a87af91 100644
--- a/src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj
Expand Down Expand Up @@ -183,7 +183,7 @@ index 0e283fce..d599a4b1 100644
<ProjectReference Include="..\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
<ProjectReference Include="..\Microsoft.IdentityModel.Tokens.Saml\Microsoft.IdentityModel.Tokens.Saml.csproj" />
diff --git a/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj b/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj
index 87d7a90f..00357f8c 100644
index b0cdcc2e..7f0bb67d 100644
--- a/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj
+++ b/src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj
@@ -15,13 +15,6 @@
Expand All @@ -198,8 +198,8 @@ index 87d7a90f..00357f8c 100644
- </ItemGroup>
-
<ItemGroup>
<ProjectReference Include="..\Microsoft.IdentityModel.Logging\Microsoft.IdentityModel.Logging.csproj" />
<ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
</ItemGroup>
diff --git a/src/Microsoft.IdentityModel.Tokens.Saml/Microsoft.IdentityModel.Tokens.Saml.csproj b/src/Microsoft.IdentityModel.Tokens.Saml/Microsoft.IdentityModel.Tokens.Saml.csproj
index 8859880f..0deb3a3a 100644
--- a/src/Microsoft.IdentityModel.Tokens.Saml/Microsoft.IdentityModel.Tokens.Saml.csproj
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
<PackCommandArgs>$(BuildCommandArgs) --output $(ProjectDirectory)pack</PackCommandArgs>
</PropertyGroup>

<!-- Update project assembly info (see https://github.com/dotnet/source-build/issues/3565).
The script being executed is being injected into the repo via a patch. -->
<Exec Command="./updateAssemblyInfo.sh" WorkingDirectory="$(ProjectDirectory)" IgnoreStandardErrorWarningFormat="true" />

<Exec Command="$(DotnetToolCommand) restore /bl:restore.binlog $(SystemIdentityModelTokensJwtProject) $(BuildCommandArgs)"
EnvironmentVariables="@(EnvironmentVariables)"
WorkingDirectory="$(ProjectDirectory)"
Expand Down