Skip to content

Commit 2c4d586

Browse files
Nate McMasterjkotalik
Nate McMaster
and
jkotalik
committed
Merge 'release/2.1' into release/2.2
Co-authored-by: Justin Kotalik <[email protected]>
2 parents 696a46c + 4c5debd commit 2c4d586

File tree

287 files changed

+1473
-2314
lines changed

Some content is hidden

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

287 files changed

+1473
-2314
lines changed

‎build/artifacts.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices.Sockets" Category="noship" />
113113
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices" Category="ship" />
114114
<PackageArtifact Include="Microsoft.AspNetCore.Owin" Category="ship" />
115-
<PackageArtifact Include="Microsoft.AspNetCore.RangeHelper.Sources" Category="noship" />
116115
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Design" Category="ship" />
117116
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Language" Category="ship" />
118117
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Runtime" Category="ship" />

‎build/buildorder.props‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
<ItemGroup>
1010
<RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
1111
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
12-
<RepositoryBuildOrder Include="Antiforgery" Order="9" RootPath="$(RepositoryRoot)src\Antiforgery\" />
1312
<RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
14-
<RepositoryBuildOrder Include="CORS" Order="11" RootPath="$(RepositoryRoot)src\CORS\" />
15-
<RepositoryBuildOrder Include="StaticFiles" Order="11" RootPath="$(RepositoryRoot)src\StaticFiles\" />
16-
<RepositoryBuildOrder Include="ResponseCaching" Order="11" RootPath="$(RepositoryRoot)src\ResponseCaching\" />
1713
<RepositoryBuildOrder Include="Session" Order="11" RootPath="$(RepositoryRoot)src\Session\" />
1814
<RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
1915
<RepositoryBuildOrder Include="Security" Order="13" RootPath="$(RepositoryRoot)src\Security\" />

‎build/repo.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,12 @@
6262
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj
6363
" />
6464

65+
<NpmProjectDirectory Include="$(RepositoryRoot)src\Middleware\CORS\test\FunctionalTests\" />
66+
6567
<ProjectToBuild Include="
6668
$(RepositoryRoot)src\Features\JsonPatch\**\*.*proj;
6769
$(RepositoryRoot)src\DataProtection\**\*.*proj;
70+
$(RepositoryRoot)src\Antiforgery\**\*.*proj;
6871
$(RepositoryRoot)src\Hosting\**\*.*proj;
6972
$(RepositoryRoot)src\Http\**\*.*proj;
7073
$(RepositoryRoot)src\Html\**\*.*proj;

‎build/repo.targets‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<PrepareDependsOn>SetTeamCityBuildNumberToVersion;$(PrepareDependsOn)</PrepareDependsOn>
1919
<PrepareDependsOn Condition="'$(_ProjectsOnly)' != 'true'">$(PrepareDependsOn);VerifyPackageArtifactConfig;VerifyExternalDependencyConfig;PrepareOutputPaths</PrepareDependsOn>
2020
<CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanRepoArtifacts</CleanDependsOn>
21+
<RestoreDependsOn Condition=" '$(SkipNpm)' != 'true' ">$(RestoreDependsOn);RestoreNpm</RestoreDependsOn>
2122
<RestoreDependsOn>$(RestoreDependsOn);InstallDotNet;RestoreProjects</RestoreDependsOn>
2223
<CompileDependsOn>$(CompileDependsOn);BuildProjects;PackSharedSources</CompileDependsOn>
2324
<CompileDependsOn Condition="'$(_ProjectsOnly)' != 'true'">$(CompileDependsOn);PackProjects;BuildRepositories;BuildSharedFx</CompileDependsOn>
@@ -31,6 +32,17 @@
3132
<GetArtifactInfoDependsOn Condition="'$(_ProjectsOnly)' != 'true'">$(GetArtifactInfoDependsOn);ResolveRepoInfo</GetArtifactInfoDependsOn>
3233
</PropertyGroup>
3334

35+
<Target Name="RestoreNpm" Condition="@(NpmProjectDirectory->Count()) != 0">
36+
<Message Text="Restoring NPM modules" Importance="high" />
37+
38+
<PropertyGroup>
39+
<NpmInstallCommand Condition=" '$(CI)' != 'true' ">install --no-optional</NpmInstallCommand>
40+
<NpmInstallCommand Condition=" '$(CI)' == 'true' ">ci</NpmInstallCommand>
41+
</PropertyGroup>
42+
43+
<Exec Command="npm $(NpmInstallCommand)" WorkingDirectory="%(NpmProjectDirectory.Identity)" Condition=" '%(NpmProjectDirectory.Identity)' != '' " />
44+
</Target>
45+
3446
<Target Name="PrepareOutputPaths">
3547
<MakeDir Directories="$(ArtifactsDir);$(BuildDir)" />
3648
</Target>

‎build/submodules.props‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,15 @@
4949

5050
<ItemGroup>
5151
<ShippedRepository Include="AADIntegration" RootPath="$(RepositoryRoot)src\AADIntegration\" />
52-
<ShippedRepository Include="Antiforgery" RootPath="$(RepositoryRoot)src\Antiforgery\" />
5352
<ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
54-
<ShippedRepository Include="CORS" RootPath="$(RepositoryRoot)src\CORS\" />
5553
<ShippedRepository Include="Identity" RootPath="$(RepositoryRoot)src\Identity\" />
5654
<ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
5755
<ShippedRepository Include="MetaPackages" RootPath="$(RepositoryRoot)src\MetaPackages\" PatchPolicy="CascadeVersions" />
5856
<ShippedRepository Include="Mvc" RootPath="$(RepositoryRoot)src\Mvc\" />
5957
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
6058
<ShippedRepository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
61-
<ShippedRepository Include="ResponseCaching" RootPath="$(RepositoryRoot)src\ResponseCaching\" />
6259
<ShippedRepository Include="Security" RootPath="$(RepositoryRoot)src\Security\" />
6360
<ShippedRepository Include="Session" RootPath="$(RepositoryRoot)src\Session\" />
6461
<ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
65-
<ShippedRepository Include="StaticFiles" RootPath="$(RepositoryRoot)src\StaticFiles\" />
6662
</ItemGroup>
6763
</Project>

‎eng/Baseline.Designer.props‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@
44
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
55
<AspNetCoreBaselineVersion>2.2.0</AspNetCoreBaselineVersion>
66
</PropertyGroup>
7+
<!-- Package: Microsoft.AspNetCore.Antiforgery-->
8+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Antiforgery' ">
9+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
10+
</PropertyGroup>
11+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Antiforgery' AND '$(TargetFramework)' == 'netstandard2.0' ">
12+
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.2.0, )" />
13+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="[2.2.0, )" />
14+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
15+
<BaselinePackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="[2.2.0, )" />
16+
<BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.2.0, )" />
17+
</ItemGroup>
718
<!-- Package: Microsoft.AspNetCore.Authentication.Abstractions-->
819
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Abstractions' ">
920
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -30,6 +41,17 @@
3041
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Features" Version="[2.2.0, )" />
3142
<BaselinePackageReference Include="System.IO.Pipelines" Version="[4.5.2, )" />
3243
</ItemGroup>
44+
<!-- Package: Microsoft.AspNetCore.Cors-->
45+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cors' ">
46+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
47+
</PropertyGroup>
48+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cors' AND '$(TargetFramework)' == 'netstandard2.0' ">
49+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
50+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[2.2.0, )" />
51+
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[2.2.0, )" />
52+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
53+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
54+
</ItemGroup>
3355
<!-- Package: Microsoft.AspNetCore.Cryptography.Internal-->
3456
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.Internal' ">
3557
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -314,6 +336,24 @@
314336
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' AND '$(TargetFramework)' == 'netstandard2.0' ">
315337
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.2.0, )" />
316338
</ItemGroup>
339+
<!-- Package: Microsoft.AspNetCore.ResponseCaching.Abstractions-->
340+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCaching.Abstractions' ">
341+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
342+
</PropertyGroup>
343+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCaching.Abstractions' AND '$(TargetFramework)' == 'netstandard2.0' ">
344+
<BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[2.2.0, )" />
345+
</ItemGroup>
346+
<!-- Package: Microsoft.AspNetCore.ResponseCaching-->
347+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCaching' ">
348+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
349+
</PropertyGroup>
350+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCaching' AND '$(TargetFramework)' == 'netstandard2.0' ">
351+
<BaselinePackageReference Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="[2.2.0, )" />
352+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.2.0, )" />
353+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
354+
<BaselinePackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[2.2.0, )" />
355+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
356+
</ItemGroup>
317357
<!-- Package: Microsoft.AspNetCore.ResponseCompression-->
318358
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' ">
319359
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -469,6 +509,17 @@
469509
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="[2.2.0, )" />
470510
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.2.0, )" />
471511
</ItemGroup>
512+
<!-- Package: Microsoft.AspNetCore.StaticFiles-->
513+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.StaticFiles' ">
514+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
515+
</PropertyGroup>
516+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.StaticFiles' AND '$(TargetFramework)' == 'netstandard2.0' ">
517+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
518+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
519+
<BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[2.2.0, )" />
520+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
521+
<BaselinePackageReference Include="Microsoft.Extensions.WebEncoders" Version="[2.2.0, )" />
522+
</ItemGroup>
472523
<!-- Package: Microsoft.AspNetCore.TestHost-->
473524
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.TestHost' ">
474525
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>

‎eng/Baseline.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
<Package Id="dotnet-sql-cache" Version="2.2.0" />
44
<Package Id="dotnet-user-secrets" Version="2.2.0" />
55
<Package Id="dotnet-watch" Version="2.2.0" />
6+
<Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
67
<Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
78
<Package Id="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" />
89
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.2.0" />
10+
<Package Id="Microsoft.AspNetCore.Cors" Version="2.2.0" />
911
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="2.2.0" />
1012
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.2.0" />
1113
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.2.0" />
@@ -37,6 +39,8 @@
3739
<Package Id="Microsoft.AspNetCore.Localization" Version="2.2.0" />
3840
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.2.0" />
3941
<Package Id="Microsoft.AspNetCore.Owin" Version="2.2.0" />
42+
<Package Id="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.2.0" />
43+
<Package Id="Microsoft.AspNetCore.ResponseCaching" Version="2.2.0" />
4044
<Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
4145
<Package Id="Microsoft.AspNetCore.Rewrite" Version="2.2.0" />
4246
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.2.0" />
@@ -48,6 +52,7 @@
4852
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.2.0" />
4953
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.2.0" />
5054
<Package Id="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
55+
<Package Id="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
5156
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
5257
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.2.0" />
5358
<Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />

‎eng/Dependencies.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
1919
<LatestPackageReference Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCorePackageVersion)" />
2020
<LatestPackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" />
21+
<LatestPackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
2122
<LatestPackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
2223
<LatestPackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
2324
<LatestPackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />

‎eng/ProjectReferences.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!-- This file is automatically generated. Run `build.cmd /t:GenerateProjectList` to update. -->
22
<Project>
33
<ItemGroup>
4+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Antiforgery" ProjectPath="$(RepositoryRoot)src\Antiforgery\src\Microsoft.AspNetCore.Antiforgery.csproj" />
45
<ProjectReferenceProvider Include="Microsoft.AspNetCore.JsonPatch" ProjectPath="$(RepositoryRoot)src\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj" />
56
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.Abstractions" ProjectPath="$(RepositoryRoot)src\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" />
67
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.AzureKeyVault" ProjectPath="$(RepositoryRoot)src\DataProtection\AzureKeyVault\src\Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj" />
@@ -59,5 +60,9 @@
5960
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCompression" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj" />
6061
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Rewrite" ProjectPath="$(RepositoryRoot)src\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj" />
6162
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebSockets" ProjectPath="$(RepositoryRoot)src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj" />
63+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Cors" ProjectPath="$(RepositoryRoot)src\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj" />
64+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCaching" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj" />
65+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj" />
66+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.StaticFiles" ProjectPath="$(RepositoryRoot)src\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj" />
6267
</ItemGroup>
6368
</Project>

‎eng/dependencies.temp.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ This is required to provide dependencies for samples and tests.
55
<Project>
66
<ItemGroup>
77
<LatestPackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.0" />
8-
<LatestPackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
98
</ItemGroup>
109
</Project>

0 commit comments

Comments
 (0)