Skip to content
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.4.1</AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>
<AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>8.0.0-preview1</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
@@ -1,57 +1,51 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Tue, 17 Oct 2023 12:59:45 -0500
From dabe0a7a30cf4476569c5928f2fd3a6d0ca1876f Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 19 Jun 2024 14:48:44 -0700
Subject: [PATCH] fix for source build

---
build/common.props | 6 +-----
build/common.props | 6 ------
build/dependencies.props | 8 ++++----
build/targets.props | 4 ++--
build/targets.props | 2 +-
buildConfiguration.xml | 2 +-
.../Microsoft.IdentityModel.Abstractions.csproj | 7 -------
.../Microsoft.IdentityModel.JsonWebTokens.csproj | 7 -------
.../Microsoft.IdentityModel.Logging.csproj | 7 -------
.../Microsoft.IdentityModel.LoggingExtensions.csproj | 7 -------
...Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj | 7 -------
...osoft.IdentityModel.Protocols.SignedHttpRequest.csproj | 7 -------
.../Microsoft.IdentityModel.Protocols.WsFederation.csproj | 7 -------
.../Microsoft.IdentityModel.Protocols.csproj | 7 -------
.../Microsoft.IdentityModel.Tokens.Saml.csproj | 7 -------
.../Microsoft.IdentityModel.Tokens.csproj | 7 -------
.../Microsoft.IdentityModel.Validators.csproj | 7 -------
.../Microsoft.IdentityModel.Xml.csproj | 7 -------
.../System.IdentityModel.Tokens.Jwt.csproj | 7 -------
15 files changed, 8 insertions(+), 89 deletions(-)
17 files changed, 6 insertions(+), 98 deletions(-)

diff --git a/build/common.props b/build/common.props
index 7f22eb03..ec229fc2 100644
index efd7e90e..05f908ef 100644
--- a/build/common.props
+++ b/build/common.props
@@ -46,7 +46,7 @@
</PropertyGroup>

<PropertyGroup>
- <EnablePackageValidation>true</EnablePackageValidation>
+ <EnablePackageValidation>false</EnablePackageValidation>
<PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
</PropertyGroup>

@@ -58,9 +58,5 @@
<NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
@@ -59,10 +59,4 @@
<NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
</PropertyGroup>
-

- <ItemGroup>
- <!-- Protects against sync-over-async: https://github.com/microsoft/vs-threading/blob/main/doc/analyzers/index.md. -->
- <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28" PrivateAssets="all" />
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="All"/>
- </ItemGroup>
-
</Project>
diff --git a/build/dependencies.props b/build/dependencies.props
index 23e1b910..254f709e 100644
index 8203da57..2ac3eee7 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -4,14 +4,14 @@
@@ -2,14 +2,14 @@

<PropertyGroup>
<AspNetCoreMinSupportedVersion>2.1.1</AspNetCoreMinSupportedVersion>
<MicrosoftAzureKeyVaultVersion>3.0.5</MicrosoftAzureKeyVaultVersion>
<MicrosoftAzureServicesAppAuthenticationVersion>1.0.3</MicrosoftAzureServicesAppAuthenticationVersion>
- <MicrosoftCSharpVersion>4.5.0</MicrosoftCSharpVersion>
+ <MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
<MicrosoftSourceLinkGitHubVersion>1.0.0</MicrosoftSourceLinkGitHubVersion>
Expand All @@ -68,21 +62,19 @@ index 23e1b910..254f709e 100644

</Project>
diff --git a/build/targets.props b/build/targets.props
index eb2d3523..e9cde8f0 100644
index 6f92780d..1c48acfb 100644
--- a/build/targets.props
+++ b/build/targets.props
@@ -1,7 +1,7 @@
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
- <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'">net462;net472;netstandard2.0;net6.0;net8.0</SrcTargets>
+ <SrcTargets Condition="'$(LocalBuild)' != 'True'">netstandard2.0;net6.0;net8.0</SrcTargets>
+ <SrcTargets Condition="'$(LocalBuild)' == 'True'">netstandard2.0;net6.0</SrcTargets>
<SrcTargets Condition="'$(LocalBuild)' == 'True'">netstandard2.0;net8.0</SrcTargets>
<SrcTargets Condition="'$(TargetNet9)' == 'True'">$(SrcTargets);net9.0</SrcTargets>
<SrcStandardTargets>netstandard2.0</SrcStandardTargets>
</PropertyGroup>
</Project>
diff --git a/buildConfiguration.xml b/buildConfiguration.xml
index 06e064da..e6bb5701 100644
index 0abda703..7c0862e5 100644
--- a/buildConfiguration.xml
+++ b/buildConfiguration.xml
@@ -1,7 +1,7 @@
Expand Down Expand Up @@ -111,7 +103,7 @@ index f7a11afe..4a87af91 100644
-
</Project>
diff --git a/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj b/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
index 52e979fe..5198986f 100644
index ac4f4bc0..d7262c1d 100644
--- a/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
+++ b/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
@@ -16,13 +16,6 @@
Expand All @@ -136,6 +128,24 @@ index 60d18120..050a90d4 100644
<Reference Include="System.Net.Http" />
</ItemGroup>

- <ItemGroup>
- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
- <PrivateAssets>all</PrivateAssets>
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
- </PackageReference>
- </ItemGroup>
-
<ItemGroup>
<ProjectReference Include="..\Microsoft.IdentityModel.Abstractions\Microsoft.IdentityModel.Abstractions.csproj" />
</ItemGroup>
diff --git a/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj b/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj
index 08c93085..f91d554a 100644
--- a/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj
+++ b/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj
@@ -17,13 +17,6 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

- <ItemGroup>
- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
- <PrivateAssets>all</PrivateAssets>
Expand Down Expand Up @@ -164,6 +174,24 @@ index f4ecd1f9..483a9770 100644
<ItemGroup>
<ProjectReference Include="..\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
<ProjectReference Include="..\System.IdentityModel.Tokens.Jwt\System.IdentityModel.Tokens.Jwt.csproj" />
diff --git a/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj b/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
index b7e2b4cb..aa494441 100644
--- a/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
+++ b/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
@@ -15,13 +15,6 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

- <ItemGroup>
- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
- <PrivateAssets>all</PrivateAssets>
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
- </PackageReference>
- </ItemGroup>
-
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.IdentityModel.JsonWebTokens\Microsoft.IdentityModel.JsonWebTokens.csproj" />
<ProjectReference Include="..\..\src\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
diff --git a/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj b/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj
index 0e283fce..d599a4b1 100644
--- a/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj
Expand Down Expand Up @@ -271,7 +299,7 @@ index 5131f40a..a3670b9d 100644
<ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
</ItemGroup>
diff --git a/src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj b/src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj
index 0e589c35..25d1ddb0 100644
index bbb9ef2c..448ece2d 100644
--- a/src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj
+++ b/src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj
@@ -15,13 +15,6 @@
Expand Down