Skip to content

Commit 8c2066b

Browse files
captainsafiacaptainsafia
committed
Try minimizing patch delta
1 parent a10b4ba commit 8c2066b

File tree

1 file changed

+16
-107
lines changed

1 file changed

+16
-107
lines changed

‎patches/azure-activedirectory-identitymodel-extensions-for-dotnet/0001-fix-for-source-build.patch

Lines changed: 16 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,22 @@ Date: Wed, 13 July 2022 17:42:31 +0000
44
Subject: [PATCH] Fix dependency for source build
55

66
---
7-
build/common.props | 1 -
8-
build/dependencies.props | 8 ++++----
9-
build/targets.props | 4 ++--
10-
build/targetsTest.props | 4 ++--
11-
buildConfiguration.xml | 2 +-
12-
src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj | 6 ------
13-
src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj | 7 -------
14-
src/Microsoft.IdentityModel.KeyVaultExtensions/Microsoft.IdentityModel.KeyVaultExtensions.csproj | 4 ----
15-
src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj | 7 -------
16-
src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj | 7 -------
17-
src/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.csproj | 10 ----------
18-
src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj | 7 -------
19-
src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj | 7 -------
20-
src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj | 7 -------
21-
src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj | 7 -------
22-
src/Microsoft.IdentityModel.Tokens.Saml/Microsoft.IdentityModel.Tokens.Saml.csproj | 7 -------
23-
src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj | 6 ------
24-
src/Microsoft.IdentityModel.Validators/Microsoft.IdentityModel.Validators.csproj | 7 -------
25-
src/Microsoft.IdentityModel.Xml/Microsoft.IdentityModel.Xml.csproj | 7 -------
26-
src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj | 7 -------
27-
20 files changed, 9 insertions(+), 113 deletions(-)
7+
build/common.props | 1 -
8+
build/dependencies.props | 8 ++++----
9+
build/targets.props | 4 ++--
10+
buildConfiguration.xml | 2 +-
11+
src/Microsoft.IdentityModel.Abstractions/Microsoft.IdentityModel.Abstractions.csproj | 6 ------
12+
src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj | 7 -------
13+
src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj | 7 -------
14+
src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj | 7 -------
15+
src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj | 7 -------
16+
src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj | 7 -------
17+
src/Microsoft.IdentityModel.Tokens.Saml/Microsoft.IdentityModel.Tokens.Saml.csproj | 7 -------
18+
src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj | 6 ------
19+
src/Microsoft.IdentityModel.Validators/Microsoft.IdentityModel.Validators.csproj | 7 -------
20+
src/Microsoft.IdentityModel.Xml/Microsoft.IdentityModel.Xml.csproj | 7 -------
21+
src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj | 7 -------
22+
15 files changed, 7 insertions(+), 83 deletions(-)
2823

2924
diff --git a/build/common.props b/build/common.props
3025
index de06ad9b..66fd93fa 100644
@@ -76,20 +71,6 @@ index f020b59b..934aae74 100644
7671
<SrcStandardTargets>netstandard2.0</SrcStandardTargets>
7772
</PropertyGroup>
7873
</Project>
79-
diff --git a/build/targetsTest.props b/build/targetsTest.props
80-
index a635db69..35910de1 100644
81-
--- a/build/targetsTest.props
82-
+++ b/build/targetsTest.props
83-
@@ -1,7 +1,7 @@
84-
<Project>
85-
<PropertyGroup>
86-
- <TestTargets Condition="'$(TargetNet8)' == 'True'">net461;net462;net472;netcoreapp2.1;net6.0;net8.0</TestTargets>
87-
- <TestTargets Condition="'$(TargetNet8)' != 'True'">net461;net462;net472;netcoreapp2.1;net6.0</TestTargets>
88-
+ <TestTargets Condition="'$(TargetNet8)' == 'True'">netcoreapp2.1;net6.0;net8.0</TestTargets>
89-
+ <TestTargets Condition="'$(TargetNet8)' != 'True'">netcoreapp2.1;net6.0</TestTargets>
90-
<TestOnlyCoreTargets>netcoreapp2.1</TestOnlyCoreTargets>
91-
</PropertyGroup>
92-
</Project>
9374
diff --git a/buildConfiguration.xml b/buildConfiguration.xml
9475
index f0f7011a..69e2319b 100644
9576
--- a/buildConfiguration.xml
@@ -137,21 +118,6 @@ index d502da51..bd96a112 100644
137118
<ItemGroup>
138119
<ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
139120
</ItemGroup>
140-
diff --git a/src/Microsoft.IdentityModel.KeyVaultExtensions/Microsoft.IdentityModel.KeyVaultExtensions.csproj b/src/Microsoft.IdentityModel.KeyVaultExtensions/Microsoft.IdentityModel.KeyVaultExtensions.csproj
141-
index da422734..5514561f 100644
142-
--- a/src/Microsoft.IdentityModel.KeyVaultExtensions/Microsoft.IdentityModel.KeyVaultExtensions.csproj
143-
+++ b/src/Microsoft.IdentityModel.KeyVaultExtensions/Microsoft.IdentityModel.KeyVaultExtensions.csproj
144-
@@ -20,10 +20,6 @@
145-
146-
<ItemGroup>
147-
<PackageReference Include="Microsoft.Azure.KeyVault" Version="$(MicrosoftAzureKeyVaultVersion)" />
148-
- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
149-
- <PrivateAssets>all</PrivateAssets>
150-
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
151-
- </PackageReference>
152-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
153-
</ItemGroup>
154-
155121
diff --git a/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj b/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj
156122
index 8dc4ec39..136dabf3 100644
157123
--- a/src/Microsoft.IdentityModel.Logging/Microsoft.IdentityModel.Logging.csproj
@@ -170,45 +136,6 @@ index 8dc4ec39..136dabf3 100644
170136
<ItemGroup>
171137
<ProjectReference Include="..\Microsoft.IdentityModel.Abstractions\Microsoft.IdentityModel.Abstractions.csproj" />
172138
</ItemGroup>
173-
diff --git a/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj b/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj
174-
index 81381568..c8ca22dc 100644
175-
--- a/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj
176-
+++ b/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj
177-
@@ -16,13 +16,6 @@
178-
<DebugSymbols>true</DebugSymbols>
179-
</PropertyGroup>
180-
181-
- <ItemGroup>
182-
- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
183-
- <PrivateAssets>all</PrivateAssets>
184-
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
185-
- </PackageReference>
186-
- </ItemGroup>
187-
-
188-
<ItemGroup>
189-
<ProjectReference Include="..\Microsoft.IdentityModel.Abstractions\Microsoft.IdentityModel.Abstractions.csproj" />
190-
</ItemGroup>
191-
diff --git a/src/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.csproj b/src/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.csproj
192-
index b7ce4518..96563774 100644
193-
--- a/src/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.csproj
194-
+++ b/src/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.csproj
195-
@@ -18,16 +18,6 @@
196-
<DebugSymbols>true</DebugSymbols>
197-
</PropertyGroup>
198-
199-
- <ItemGroup>
200-
- <PackageReference Include="Microsoft.Azure.KeyVault" Version="$(MicrosoftAzureKeyVaultVersion)" />
201-
- <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="$(MicrosoftAzureServicesAppAuthenticationVersion)" />
202-
- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
203-
- <PrivateAssets>all</PrivateAssets>
204-
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
205-
- </PackageReference>
206-
- <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
207-
- </ItemGroup>
208-
-
209-
<ItemGroup>
210-
<ProjectReference Include="..\Microsoft.IdentityModel.KeyVaultExtensions\Microsoft.IdentityModel.KeyVaultExtensions.csproj" />
211-
</ItemGroup>
212139
diff --git a/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj b/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
213140
index 8d5887be..463ac14b 100644
214141
--- a/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
@@ -227,24 +154,6 @@ index 8d5887be..463ac14b 100644
227154
<ItemGroup>
228155
<ProjectReference Include="..\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
229156
<ProjectReference Include="..\System.IdentityModel.Tokens.Jwt\System.IdentityModel.Tokens.Jwt.csproj" />
230-
diff --git a/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj b/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
231-
index 8fe3e1d4..23a8cb92 100644
232-
--- a/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
233-
+++ b/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
234-
@@ -15,13 +15,6 @@
235-
<DebugSymbols>true</DebugSymbols>
236-
</PropertyGroup>
237-
238-
- <ItemGroup>
239-
- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
240-
- <PrivateAssets>all</PrivateAssets>
241-
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
242-
- </PackageReference>
243-
- </ItemGroup>
244-
-
245-
<ItemGroup>
246-
<ProjectReference Include="..\..\src\Microsoft.IdentityModel.JsonWebTokens\Microsoft.IdentityModel.JsonWebTokens.csproj" />
247-
<ProjectReference Include="..\..\src\Microsoft.IdentityModel.Protocols\Microsoft.IdentityModel.Protocols.csproj" />
248157
diff --git a/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj b/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj
249158
index 66f7e921..c406dea1 100644
250159
--- a/src/Microsoft.IdentityModel.Protocols.WsFederation/Microsoft.IdentityModel.Protocols.WsFederation.csproj

0 commit comments

Comments
 (0)