Skip to content

Commit 05acc37

Browse files
jennyf19jennyf19
authored
Merging work from rel/v2 branch into master (#2038)
2 parents f740377 + 6aa9241 commit 05acc37

File tree

1,041 files changed

+37794
-31564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,041 files changed

+37794
-31564
lines changed

‎.github/workflows/dotnetcore.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
name: .NET Core
22

3-
on: [push]
3+
on:
4+
push:
5+
branches:
6+
- "master"
7+
- "rel/v2"
8+
pull_request:
9+
branches:
10+
- "master"
11+
- "rel/v2"
12+
paths:
13+
- ".github/workflows/dotnetcore.yml"
414

515
jobs:
616
build:
@@ -35,7 +45,7 @@ jobs:
3545
run: dotnet workload install wasm-tools
3646

3747
- name: Build with .NET 6.0.x
38-
run: dotnet test Microsoft.Identity.Web.sln -f net6.0 --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName!~IntegrationTests)"
48+
run: dotnet test Microsoft.Identity.Web.sln -f net6.0 -p:FROM_GITHUB_ACTION=true --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName!~IntegrationTests)"
3949

4050
- name: Build with .NET 7.0.x
41-
run: dotnet test Microsoft.Identity.Web.sln -f net7.0 --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName=IntegrationTests)"
51+
run: dotnet test Microsoft.Identity.Web.sln -f net7.0 -p:FROM_GITHUB_ACTION=true --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName=IntegrationTests)"

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ ClientBin/
229229
*.pfx
230230
*.publishsettings
231231
orleans.codegen.cs
232+
!**/Certificates/*.pfx
232233

233234
# Including strong name files can present a security risk
234235
# (https://github.com/github/gitignore/pull/2483#issue-259490424)

‎src/Directory.Build.props renamed to ‎Directory.Build.props

Lines changed: 50 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,13 @@
2020
</PropertyGroup>
2121

2222
<PropertyGroup>
23-
<TargetFrameworks>netcoreapp3.1; net462; net472; net5.0; netstandard2.0</TargetFrameworks>
23+
<TargetFrameworks>net6.0; net7.0; net462; net472; netstandard2.0</TargetFrameworks>
2424
<SignAssembly>true</SignAssembly>
2525
<AssemblyOriginatorKeyFile>../../build/MSAL.snk</AssemblyOriginatorKeyFile>
2626
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2727
<Nullable>enable</Nullable>
28-
</PropertyGroup>
29-
30-
<PropertyGroup Label="Source Link">
31-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
32-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
33-
<!-- Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
34-
<IncludeSymbols>true</IncludeSymbols>
35-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
28+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
29+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
3630
</PropertyGroup>
3731

3832
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
@@ -46,88 +40,96 @@
4640
</None>
4741
</ItemGroup>
4842

49-
<ItemGroup>
50-
<AdditionalFiles Include="..\..\stylecop.json" />
51-
</ItemGroup>
52-
5343
<ItemGroup Label="Build Tools" Condition="$([MSBuild]::IsOsPlatform('Windows'))">
5444
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
5545
</ItemGroup>
5646

57-
<PropertyGroup>
47+
<PropertyGroup Label="Source Link">
48+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
49+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
50+
<!-- Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
51+
<IncludeSymbols>true</IncludeSymbols>
52+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
5853
<!-- The MSAL.snk has both private and public keys -->
5954
<DelaySign>false</DelaySign>
60-
<CodeAnalysisRuleSet>..\..\.sonarlint\azuread_microsoft-identity-webcsharp.ruleset</CodeAnalysisRuleSet>
6155
</PropertyGroup>
6256

63-
<ItemGroup>
64-
<AdditionalFiles Include="..\..\.sonarlint\azuread_microsoft-identity-web\CSharp\SonarLint.xml" Link="SonarLint.xml" />
65-
</ItemGroup>
66-
6757
<PropertyGroup Condition="'$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
68-
<LangVersion>8.0</LangVersion>
58+
<LangVersion>10.0</LangVersion>
6959
</PropertyGroup>
7060

7161
<PropertyGroup Label="Common dependency versions">
7262
<IdentityModelVersion>6.25.1</IdentityModelVersion>
73-
<MicrosoftIdentityClientVersion>4.46.0</MicrosoftIdentityClientVersion>
63+
<MicrosoftIdentityClientVersion>4.48.1</MicrosoftIdentityClientVersion>
7464
<FxCopAnalyzersVersion>3.3.0</FxCopAnalyzersVersion>
65+
<SystemTextEncodingsWebVersion>4.7.2</SystemTextEncodingsWebVersion>
7566
<AzureSecurityKeyVaultSecretsVersion>4.1.0</AzureSecurityKeyVaultSecretsVersion>
7667
<AzureIdentityVersion>1.3.0</AzureIdentityVersion>
7768
<AzureSecurityKeyVaultCertificatesVersion>4.1.0</AzureSecurityKeyVaultCertificatesVersion>
7869
<MicrosoftGraphVersion>4.34.0</MicrosoftGraphVersion>
7970
<MicrosoftGraphBetaVersion>4.50.0-preview</MicrosoftGraphBetaVersion>
71+
<MicrosoftExtensionsHttpVersion>3.1.3</MicrosoftExtensionsHttpVersion>
72+
<MicrosoftIdentityAbstractions>1.0.6-preview</MicrosoftIdentityAbstractions>
8073
<!--CVE-2021-24112-->
8174
<SystemDrawingCommon>4.7.2</SystemDrawingCommon>
8275
</PropertyGroup>
8376

84-
<PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
85-
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>5.0.12-*</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
86-
<MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>5.0.12-*</MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>
87-
<MicrosoftExtensionsCachingMemoryVersion>5.0.0</MicrosoftExtensionsCachingMemoryVersion>
88-
<MicrosoftExtensionsHostingVersion>5.0.0</MicrosoftExtensionsHostingVersion>
89-
<MicrosoftAspNetCoreDataProtectionVersion>5.0.8</MicrosoftAspNetCoreDataProtectionVersion>
77+
<PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
78+
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>7.0.1</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
79+
<MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>7.0.1</MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>
80+
<MicrosoftExtensionsCachingMemoryVersion>7.*</MicrosoftExtensionsCachingMemoryVersion>
81+
<MicrosoftExtensionsHostingVersion>7.*</MicrosoftExtensionsHostingVersion>
82+
<MicrosoftAspNetCoreDataProtectionVersion>7.*</MicrosoftAspNetCoreDataProtectionVersion>
83+
<SystemSecurityCryptographyXmlVersion>7.*</SystemSecurityCryptographyXmlVersion>
84+
<MicrosoftExtensionsLoggingVersion>7.*</MicrosoftExtensionsLoggingVersion>
85+
<SystemTextEncodingsWebVersion>7.*</SystemTextEncodingsWebVersion>
86+
<MicrosoftExtensionsConfigurationBinderVersion>7.*</MicrosoftExtensionsConfigurationBinderVersion>
87+
<MicrosoftExtensionsDependencyInjectionVersion>7.*</MicrosoftExtensionsDependencyInjectionVersion>
88+
</PropertyGroup>
89+
90+
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
91+
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>6.0.12</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
92+
<MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>6.0.12</MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>
93+
<MicrosoftExtensionsCachingMemoryVersion>6.*</MicrosoftExtensionsCachingMemoryVersion>
94+
<MicrosoftExtensionsHostingVersion>6.*</MicrosoftExtensionsHostingVersion>
95+
<MicrosoftAspNetCoreDataProtectionVersion>6.*</MicrosoftAspNetCoreDataProtectionVersion>
9096
<SystemSecurityCryptographyXmlVersion>6.0.1</SystemSecurityCryptographyXmlVersion>
9197
<!-- CVE-2022-34716 due to DataProtection 5.0.8 -->
92-
<MicrosoftExtensionsLoggingVersion>5.0.0</MicrosoftExtensionsLoggingVersion>
93-
<SystemTextEncodingsWebVersion>5.0.1</SystemTextEncodingsWebVersion>
98+
<MicrosoftExtensionsLoggingVersion>6.*</MicrosoftExtensionsLoggingVersion>
99+
<SystemTextEncodingsWebVersion>6.*</SystemTextEncodingsWebVersion>
100+
<MicrosoftExtensionsConfigurationBinderVersion>6.*</MicrosoftExtensionsConfigurationBinderVersion>
101+
<MicrosoftExtensionsDependencyInjectionVersion>6.*</MicrosoftExtensionsDependencyInjectionVersion>
102+
94103
</PropertyGroup>
95104

96-
<PropertyGroup Condition="'$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net462'">
105+
<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
97106
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>5.0.12-*</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
98107
<MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>5.0.12-*</MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>
99108
<MicrosoftExtensionsCachingMemoryVersion>5.0.0</MicrosoftExtensionsCachingMemoryVersion>
100-
<MicrosoftExtensionsHostingVersion>5.0.0</MicrosoftExtensionsHostingVersion>
109+
<!-- Microsoft.Extensions.Hosting 5.* are obsoleted -->
110+
<MicrosoftExtensionsHostingVersion>6.0.0</MicrosoftExtensionsHostingVersion>
101111
<MicrosoftAspNetCoreDataProtectionVersion>5.0.8</MicrosoftAspNetCoreDataProtectionVersion>
102112
<SystemSecurityCryptographyXmlVersion>6.0.1</SystemSecurityCryptographyXmlVersion>
113+
103114
<!-- CVE-2022-34716 due to DataProtection 5.0.8 -->
104115
<MicrosoftExtensionsLoggingVersion>5.0.0</MicrosoftExtensionsLoggingVersion>
105-
<SystemTextEncodingsWebVersion>4.7.2</SystemTextEncodingsWebVersion>
106-
</PropertyGroup>
107-
108-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
109-
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>3.1.18</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
110-
<MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>3.1.18</MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>
111-
<MicrosoftAspNetCoreDataProtectionVersion>3.1.30</MicrosoftAspNetCoreDataProtectionVersion>
112-
<MicrosoftExtensionsCachingMemoryVersion>3.1.30</MicrosoftExtensionsCachingMemoryVersion>
113-
<MicrosoftExtensionsLoggingVersion>3.1.30</MicrosoftExtensionsLoggingVersion>
114-
<SystemTextEncodingsWebVersion>4.5.1</SystemTextEncodingsWebVersion>
116+
<SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
117+
118+
<!-- Microsoft.Extensions.Configuration.Binder 6.* are obsoleted -->
119+
<MicrosoftExtensionsConfigurationBinderVersion>6.0.0</MicrosoftExtensionsConfigurationBinderVersion>
120+
<MicrosoftExtensionsDependencyInjectionVersion>2.1.0</MicrosoftExtensionsDependencyInjectionVersion>
115121
</PropertyGroup>
116122

117-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
123+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net472'">
118124
<MicrosoftAspNetCoreDataProtectionVersion>2.1.0</MicrosoftAspNetCoreDataProtectionVersion>
119125
<!-- CVE-2022-34716 due to DataProtection 2.1.0 -->
120126
<SystemSecurityCryptographyXmlVersion>4.7.1</SystemSecurityCryptographyXmlVersion>
121127
<MicrosoftExtensionsLoggingVersion>4.7.1</MicrosoftExtensionsLoggingVersion>
122128
<MicrosoftExtensionsCachingMemoryVersion>2.1.0</MicrosoftExtensionsCachingMemoryVersion>
129+
<MicrosoftExtensionsHostingVersion>2.1.1</MicrosoftExtensionsHostingVersion>
123130
<MicrosoftExtensionsLoggingVersion>2.1.0</MicrosoftExtensionsLoggingVersion>
124131
<MicrosoftExtensionsDependencyInjectionVersion>2.1.0</MicrosoftExtensionsDependencyInjectionVersion>
132+
<MicrosoftExtensionsConfigurationBinderVersion>2.2.4</MicrosoftExtensionsConfigurationBinderVersion>
125133
</PropertyGroup>
126134

127-
<ItemGroup>
128-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="$(FxCopAnalyzersVersion)">
129-
<PrivateAssets>all</PrivateAssets>
130-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
131-
</PackageReference>
132-
</ItemGroup>
133135
</Project>

‎Microsoft.Identity.Web-Source.sln

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)