-
Notifications
You must be signed in to change notification settings - Fork 218
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Investigate removing no longer necessary dependencies while investiga…
…ting #2577 (#2578) * Remove no longer necessary dependencies while investigating #2577 * Surgically re-injecting the dependency * Fixing the CVE-2021-24112 in the sample apps by updating Redis * Adding .NET 8 targets * Suppressions for .NET 8
- Loading branch information
Showing
13 changed files
with
123 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
src/Microsoft.Identity.Web.Certificateless/CompatibilitySuppressions.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids --> | ||
| <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> | ||
| <Suppression> | ||
| <DiagnosticId>CP0002</DiagnosticId> | ||
| <Target>M:Microsoft.Identity.Web.AzureIdentityForKubernetesClientAssertion.#ctor</Target> | ||
| <Left>lib/netstandard2.0/Microsoft.Identity.Web.Certificateless.dll</Left> | ||
| <Right>lib/netstandard2.0/Microsoft.Identity.Web.Certificateless.dll</Right> | ||
| <IsBaselineSuppression>true</IsBaselineSuppression> | ||
| </Suppression> | ||
| <Suppression> | ||
| <DiagnosticId>CP0002</DiagnosticId> | ||
| <Target>M:Microsoft.Identity.Web.AzureIdentityForKubernetesClientAssertion.#ctor(System.String)</Target> | ||
| <Left>lib/netstandard2.0/Microsoft.Identity.Web.Certificateless.dll</Left> | ||
| <Right>lib/netstandard2.0/Microsoft.Identity.Web.Certificateless.dll</Right> | ||
| <IsBaselineSuppression>true</IsBaselineSuppression> | ||
| </Suppression> | ||
| </Suppressions> |
40 changes: 40 additions & 0 deletions
40
src/Microsoft.Identity.Web.TokenAcquisition/CompatibilitySuppressions.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids --> | ||
| <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> | ||
| <Suppression> | ||
| <DiagnosticId>CP0001</DiagnosticId> | ||
| <Target>T:Microsoft.Identity.Web.OpenIdConnectOptions</Target> | ||
| <Left>lib/netstandard2.0/Microsoft.Identity.Web.TokenAcquisition.dll</Left> | ||
| <Right>lib/netcoreapp3.1/Microsoft.Identity.Web.TokenAcquisition.dll</Right> | ||
| </Suppression> | ||
| <Suppression> | ||
| <DiagnosticId>CP0002</DiagnosticId> | ||
| <Target>M:Microsoft.Identity.Web.MicrosoftIdentityOptions.get_ErrorPath</Target> | ||
| <Left>lib/netstandard2.0/Microsoft.Identity.Web.TokenAcquisition.dll</Left> | ||
| <Right>lib/netcoreapp3.1/Microsoft.Identity.Web.TokenAcquisition.dll</Right> | ||
| </Suppression> | ||
| <Suppression> | ||
| <DiagnosticId>CP0002</DiagnosticId> | ||
| <Target>M:Microsoft.Identity.Web.MicrosoftIdentityOptions.get_ResetPasswordPath</Target> | ||
| <Left>lib/netstandard2.0/Microsoft.Identity.Web.TokenAcquisition.dll</Left> | ||
| <Right>lib/netcoreapp3.1/Microsoft.Identity.Web.TokenAcquisition.dll</Right> | ||
| </Suppression> | ||
| <Suppression> | ||
| <DiagnosticId>CP0006</DiagnosticId> | ||
| <Target>M:Microsoft.Identity.Web.ITokenAcquisition.ReplyForbiddenWithWwwAuthenticateHeader(System.Collections.Generic.IEnumerable{System.String},Microsoft.Identity.Client.MsalUiRequiredException,System.String,Microsoft.AspNetCore.Http.HttpResponse)</Target> | ||
| <Left>lib/netstandard2.0/Microsoft.Identity.Web.TokenAcquisition.dll</Left> | ||
| <Right>lib/netcoreapp3.1/Microsoft.Identity.Web.TokenAcquisition.dll</Right> | ||
| </Suppression> | ||
| <Suppression> | ||
| <DiagnosticId>CP0006</DiagnosticId> | ||
| <Target>M:Microsoft.Identity.Web.ITokenAcquisition.ReplyForbiddenWithWwwAuthenticateHeaderAsync(System.Collections.Generic.IEnumerable{System.String},Microsoft.Identity.Client.MsalUiRequiredException,Microsoft.AspNetCore.Http.HttpResponse)</Target> | ||
| <Left>lib/netstandard2.0/Microsoft.Identity.Web.TokenAcquisition.dll</Left> | ||
| <Right>lib/netcoreapp3.1/Microsoft.Identity.Web.TokenAcquisition.dll</Right> | ||
| </Suppression> | ||
| <Suppression> | ||
| <DiagnosticId>CP0007</DiagnosticId> | ||
| <Target>T:Microsoft.Identity.Web.MicrosoftIdentityOptions</Target> | ||
| <Left>lib/netstandard2.0/Microsoft.Identity.Web.TokenAcquisition.dll</Left> | ||
| <Right>lib/netcoreapp3.1/Microsoft.Identity.Web.TokenAcquisition.dll</Right> | ||
| </Suppression> | ||
| </Suppressions> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,26 @@ | ||
| <Project> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks Condition="'$(TargetNet8)' == 'True'">net6.0; net7.0; net8.0</TargetFrameworks> | ||
| <TargetFrameworks Condition="'$(TargetNet8)' != 'True'">net6.0; net7.0</TargetFrameworks> | ||
| <UseWip>true</UseWip> | ||
| <IsPackable>false</IsPackable> | ||
| <LangVersion>11</LangVersion> | ||
| <TargetFrameworks Condition="'$(TargetNet8)' == 'True'">net6.0; net7.0; net8.0</TargetFrameworks> | ||
| <TargetFrameworks Condition="'$(TargetNet8)' != 'True'">net6.0; net7.0</TargetFrameworks> | ||
| <UseWip>true</UseWip> | ||
| <IsPackable>false</IsPackable> | ||
| <LangVersion>11</LangVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'"> | ||
| <!--CVE-2021-24112 from ASpNetCore.Protection, and Redis--> | ||
| <SystemDrawingCommon>6.0.0</SystemDrawingCommon> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'"> | ||
| <!--CVE-2021-24112 from ASpNetCore.Protection, and Redis--> | ||
| <SystemDrawingCommon>7.0.0</SystemDrawingCommon> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'"> | ||
| <!--CVE-2021-24112 from ASpNetCore.Protection, and Redis--> | ||
| <SystemDrawingCommon>8.0.0-rc.2.23479.14</SystemDrawingCommon> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters