Skip to content

Commit f659f0a

Browse files
author
John Luo
committed
Merge branch 'release/2.1' into release/2.2
2 parents cb5458e + 68f0aff commit f659f0a

File tree

386 files changed

+732
-1318
lines changed

Some content is hidden

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

386 files changed

+732
-1318
lines changed

‎build/artifacts.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
<PackageArtifact Include="Microsoft.AspNetCore.Authorization" Category="ship" />
4848
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Category="ship" />
4949
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Category="ship" />
50-
<PackageArtifact Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Category="noship" />
5150
<PackageArtifact Include="Microsoft.AspNetCore.Connections.Abstractions" Category="ship" />
5251
<PackageArtifact Include="Microsoft.AspNetCore.CookiePolicy" Category="ship" />
5352
<PackageArtifact Include="Microsoft.AspNetCore.Cors" Category="ship" />

‎build/buildorder.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
1111
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
1212
<RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
13-
<RepositoryBuildOrder Include="Security" Order="13" RootPath="$(RepositoryRoot)src\Security\" />
1413
<RepositoryBuildOrder Include="Mvc" Order="14" RootPath="$(RepositoryRoot)src\Mvc\" />
1514
<RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
1615
<RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\" />

‎build/repo.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
$(RepositoryRoot)src\Html\**\*.*proj;
8888
$(RepositoryRoot)src\Servers\**\*.csproj;
8989
$(RepositoryRoot)src\Servers\**\*.pkgproj;
90+
$(RepositoryRoot)src\Security\**\*.*proj;
9091
$(RepositoryRoot)src\Shared\**\*.*proj;
9192
$(RepositoryRoot)src\Tools\**\*.*proj;
9293
$(RepositoryRoot)src\Middleware\**\*.*proj;

‎build/submodules.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
<ShippedRepository Include="Mvc" RootPath="$(RepositoryRoot)src\Mvc\" />
5757
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
5858
<ShippedRepository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
59-
<ShippedRepository Include="Security" RootPath="$(RepositoryRoot)src\Security\" />
6059
<ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
6160
</ItemGroup>
6261
</Project>

‎eng/Baseline.Designer.props

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,19 @@
3939
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' ">
4040
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
4141
</PropertyGroup>
42+
<!-- Package: Microsoft.AspNetCore.Authentication-->
43+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication' ">
44+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
45+
</PropertyGroup>
46+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication' AND '$(TargetFramework)' == 'netstandard2.0' ">
47+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" />
48+
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.2.0, )" />
49+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.2.0, )" />
50+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
51+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
52+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
53+
<BaselinePackageReference Include="Microsoft.Extensions.WebEncoders" Version="[2.2.0, )" />
54+
</ItemGroup>
4255
<!-- Package: Microsoft.AspNetCore.Authentication.Abstractions-->
4356
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Abstractions' ">
4457
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -48,6 +61,13 @@
4861
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
4962
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
5063
</ItemGroup>
64+
<!-- Package: Microsoft.AspNetCore.Authentication.Cookies-->
65+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Cookies' ">
66+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
67+
</PropertyGroup>
68+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Cookies' AND '$(TargetFramework)' == 'netstandard2.0' ">
69+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.2.0, )" />
70+
</ItemGroup>
5171
<!-- Package: Microsoft.AspNetCore.Authentication.Core-->
5272
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Core' ">
5373
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -57,6 +77,83 @@
5777
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
5878
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.2.0, )" />
5979
</ItemGroup>
80+
<!-- Package: Microsoft.AspNetCore.Authentication.Facebook-->
81+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Facebook' ">
82+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
83+
</PropertyGroup>
84+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Facebook' AND '$(TargetFramework)' == 'netstandard2.0' ">
85+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.2.0, )" />
86+
</ItemGroup>
87+
<!-- Package: Microsoft.AspNetCore.Authentication.Google-->
88+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Google' ">
89+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
90+
</PropertyGroup>
91+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Google' AND '$(TargetFramework)' == 'netstandard2.0' ">
92+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.2.0, )" />
93+
</ItemGroup>
94+
<!-- Package: Microsoft.AspNetCore.Authentication.JwtBearer-->
95+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.JwtBearer' ">
96+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
97+
</PropertyGroup>
98+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.JwtBearer' AND '$(TargetFramework)' == 'netstandard2.0' ">
99+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.2.0, )" />
100+
<BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="[5.3.0, )" />
101+
</ItemGroup>
102+
<!-- Package: Microsoft.AspNetCore.Authentication.MicrosoftAccount-->
103+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.MicrosoftAccount' ">
104+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
105+
</PropertyGroup>
106+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.MicrosoftAccount' AND '$(TargetFramework)' == 'netstandard2.0' ">
107+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.2.0, )" />
108+
</ItemGroup>
109+
<!-- Package: Microsoft.AspNetCore.Authentication.OAuth-->
110+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OAuth' ">
111+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
112+
</PropertyGroup>
113+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OAuth' AND '$(TargetFramework)' == 'netstandard2.0' ">
114+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.2.0, )" />
115+
<BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
116+
</ItemGroup>
117+
<!-- Package: Microsoft.AspNetCore.Authentication.OpenIdConnect-->
118+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OpenIdConnect' ">
119+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
120+
</PropertyGroup>
121+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OpenIdConnect' AND '$(TargetFramework)' == 'netstandard2.0' ">
122+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.2.0, )" />
123+
<BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="[5.3.0, )" />
124+
</ItemGroup>
125+
<!-- Package: Microsoft.AspNetCore.Authentication.Twitter-->
126+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Twitter' ">
127+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
128+
</PropertyGroup>
129+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Twitter' AND '$(TargetFramework)' == 'netstandard2.0' ">
130+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.2.0, )" />
131+
</ItemGroup>
132+
<!-- Package: Microsoft.AspNetCore.Authentication.WsFederation-->
133+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.WsFederation' ">
134+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
135+
</PropertyGroup>
136+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.WsFederation' AND '$(TargetFramework)' == 'netstandard2.0' ">
137+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.2.0, )" />
138+
<BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="[5.3.0, )" />
139+
<BaselinePackageReference Include="System.IdentityModel.Tokens.Jwt" Version="[5.3.0, )" />
140+
</ItemGroup>
141+
<!-- Package: Microsoft.AspNetCore.Authorization-->
142+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' ">
143+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
144+
</PropertyGroup>
145+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND '$(TargetFramework)' == 'netstandard2.0' ">
146+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
147+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
148+
</ItemGroup>
149+
<!-- Package: Microsoft.AspNetCore.Authorization.Policy-->
150+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization.Policy' ">
151+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
152+
</PropertyGroup>
153+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization.Policy' AND '$(TargetFramework)' == 'netstandard2.0' ">
154+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[2.2.0, )" />
155+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="[2.2.0, )" />
156+
</ItemGroup>
60157
<!-- Package: Microsoft.AspNetCore.Connections.Abstractions-->
61158
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' ">
62159
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -76,6 +173,15 @@
76173
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
77174
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
78175
</ItemGroup>
176+
<!-- Package: Microsoft.AspNetCore.CookiePolicy-->
177+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' ">
178+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
179+
</PropertyGroup>
180+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' AND '$(TargetFramework)' == 'netstandard2.0' ">
181+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.2.0, )" />
182+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
183+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
184+
</ItemGroup>
79185
<!-- Package: Microsoft.AspNetCore.Cryptography.Internal-->
80186
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.Internal' ">
81187
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -652,4 +758,12 @@
652758
<BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[2.2.0, )" />
653759
<BaselinePackageReference Include="System.Buffers" Version="[4.5.0, )" />
654760
</ItemGroup>
761+
<!-- Package: Microsoft.Owin.Security.Interop-->
762+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Owin.Security.Interop' ">
763+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
764+
</PropertyGroup>
765+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Owin.Security.Interop' AND '$(TargetFramework)' == 'net461' ">
766+
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="[2.2.0, )" />
767+
<BaselinePackageReference Include="Microsoft.Owin.Security" Version="[3.0.1, )" />
768+
</ItemGroup>
655769
</Project>

‎eng/Baseline.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,23 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
1212
<Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
1313
<Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.0" />
1414
<Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.0" />
15+
<Package Id="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
1516
<Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
17+
<Package Id="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
1618
<Package Id="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" />
19+
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="2.2.0" />
20+
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="2.2.0" />
21+
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
22+
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.2.0" />
23+
<Package Id="Microsoft.AspNetCore.Authentication.OAuth" Version="2.2.0" />
24+
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.2.0" />
25+
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="2.2.0" />
26+
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="2.2.0" />
27+
<Package Id="Microsoft.AspNetCore.Authorization" Version="2.2.0" />
28+
<Package Id="Microsoft.AspNetCore.Authorization.Policy" Version="2.2.0" />
1729
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.2.0" />
1830
<Package Id="Microsoft.AspNetCore.Cors" Version="2.2.0" />
31+
<Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.2.0" />
1932
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="2.2.0" />
2033
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.2.0" />
2134
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.2.0" />
@@ -70,4 +83,5 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
7083
<Package Id="Microsoft.AspNetCore" Version="2.2.0" />
7184
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="2.2.0" />
7285
<Package Id="Microsoft.Net.Http.Headers" Version="2.2.0" />
86+
<Package Id="Microsoft.Owin.Security.Interop" Version="2.2.0" />
7387
</Baseline>

‎eng/Dependencies.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,15 @@ and are generated based on the last package release.
4949
<LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
5050
<LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
5151
<LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
52+
<LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
5253
<LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
5354
<LatestPackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
5455
<LatestPackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
5556
<LatestPackageReference Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(MicrosoftExtensionsTypeNameHelperSourcesPackageVersion)" />
5657
<LatestPackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
58+
<LatestPackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="$(MicrosoftIdentityModelClientsActiveDirectoryPackageVersion)" />
59+
<LatestPackageReference Include="Microsoft.Owin.Security.Cookies" Version="$(MicrosoftOwinSecurityCookiesPackageVersion)" />
60+
<LatestPackageReference Include="Microsoft.Owin.Testing" Version="$(MicrosoftOwinTestingPackageVersion)" />
5761
<LatestPackageReference Include="Microsoft.Internal.AspNetCore.H2Spec.All" Version="$(MicrosoftInternalAspNetCoreH2SpecAllPackageVersion)" />
5862
<LatestPackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="$(MicrosoftNETCoreWindowsApiSetsPackageVersion)" />
5963
<LatestPackageReference Include="Microsoft.Web.Administration" Version="$(MicrosoftWebAdministrationPackageVersion)" />
@@ -72,6 +76,7 @@ and are generated based on the last package release.
7276
<LatestPackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
7377
<LatestPackageReference Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerPackageVersion)" />
7478
<LatestPackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
79+
7580
</ItemGroup>
7681

7782
<ItemGroup Label="External dependencies">

0 commit comments

Comments
 (0)