Skip to content

Commit 5f843f2

Browse files
jkotalikjkotalik
authored
[2.1] Make Antiforgery, ResponseCaching, StaticFiles, and Cors use project ref (#4484)
1 parent df3e4b9 commit 5f843f2

File tree

275 files changed

+582
-1402
lines changed

Some content is hidden

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

275 files changed

+582
-1402
lines changed

‎build/artifacts.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@
113113
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices.Sockets" Category="noship" />
114114
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices" AllMetapackage="true" AppMetapackage="true" Category="ship" />
115115
<PackageArtifact Include="Microsoft.AspNetCore.Owin" AllMetapackage="true" AppMetapackage="true" Category="ship" />
116-
<PackageArtifact Include="Microsoft.AspNetCore.RangeHelper.Sources" Category="noship" />
117116
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Design" AllMetapackage="true" AppMetapackage="true" Category="ship" />
118117
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Language" AllMetapackage="true" AppMetapackage="true" Category="ship" />
119118
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Runtime" AllMetapackage="true" AppMetapackage="true" 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<ProjectToBuild Include="
6161
$(RepositoryRoot)src\Features\JsonPatch\**\*.*proj;
6262
$(RepositoryRoot)src\DataProtection\**\*.*proj;
63+
$(RepositoryRoot)src\Antiforgery\**\*.*proj;
6364
$(RepositoryRoot)src\Hosting\**\*.*proj;
6465
$(RepositoryRoot)src\Http\**\*.*proj;
6566
$(RepositoryRoot)src\Html\**\*.*proj;

‎build/submodules.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,16 @@
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="EntityFrameworkCore" />
5654
<ShippedRepository Include="Identity" RootPath="$(RepositoryRoot)src\Identity\" />
5755
<ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
5856
<ShippedRepository Include="JsonPatch" />
5957
<ShippedRepository Include="Mvc" RootPath="$(RepositoryRoot)src\Mvc\" />
6058
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
6159
<ShippedRepository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
62-
<ShippedRepository Include="ResponseCaching" RootPath="$(RepositoryRoot)src\ResponseCaching\" />
6360
<ShippedRepository Include="Security" RootPath="$(RepositoryRoot)src\Security\" />
6461
<ShippedRepository Include="Session" RootPath="$(RepositoryRoot)src\Session\" />
6562
<ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
66-
<ShippedRepository Include="StaticFiles" RootPath="$(RepositoryRoot)src\StaticFiles\" />
6763
</ItemGroup>
6864
</Project>

‎eng/Baseline.Designer.props

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,17 @@
2424
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
2525
</PropertyGroup>
2626
<ItemGroup Condition=" '$(PackageId)' == 'dotnet-watch' AND '$(TargetFramework)' == 'netcoreapp2.1' " />
27+
<!-- Package: Microsoft.AspNetCore.Antiforgery-->
28+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Antiforgery' ">
29+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
30+
</PropertyGroup>
31+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Antiforgery' AND '$(TargetFramework)' == 'netstandard2.0' ">
32+
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.1.1, )" />
33+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="[2.1.1, )" />
34+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
35+
<BaselinePackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="[2.1.1, )" />
36+
<BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.1.1, )" />
37+
</ItemGroup>
2738
<!-- Package: Microsoft.AspNetCore.Authentication.Abstractions-->
2839
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Abstractions' ">
2940
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -50,6 +61,17 @@
5061
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Features" Version="[2.1.1, )" />
5162
<BaselinePackageReference Include="System.IO.Pipelines" Version="[4.5.0, )" />
5263
</ItemGroup>
64+
<!-- Package: Microsoft.AspNetCore.Cors-->
65+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cors' ">
66+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
67+
</PropertyGroup>
68+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cors' AND '$(TargetFramework)' == 'netstandard2.0' ">
69+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
70+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[2.1.1, )" />
71+
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[2.1.1, )" />
72+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
73+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
74+
</ItemGroup>
5375
<!-- Package: Microsoft.AspNetCore.Cryptography.Internal-->
5476
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.Internal' ">
5577
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -316,6 +338,24 @@
316338
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' AND '$(TargetFramework)' == 'netstandard2.0' ">
317339
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
318340
</ItemGroup>
341+
<!-- Package: Microsoft.AspNetCore.ResponseCaching.Abstractions-->
342+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCaching.Abstractions' ">
343+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
344+
</PropertyGroup>
345+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCaching.Abstractions' AND '$(TargetFramework)' == 'netstandard2.0' ">
346+
<BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[2.1.1, )" />
347+
</ItemGroup>
348+
<!-- Package: Microsoft.AspNetCore.ResponseCaching-->
349+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCaching' ">
350+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
351+
</PropertyGroup>
352+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCaching' AND '$(TargetFramework)' == 'netstandard2.0' ">
353+
<BaselinePackageReference Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="[2.1.1, )" />
354+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
355+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
356+
<BaselinePackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[2.1.1, )" />
357+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
358+
</ItemGroup>
319359
<!-- Package: Microsoft.AspNetCore.ResponseCompression-->
320360
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' ">
321361
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -455,6 +495,17 @@
455495
<BaselinePackageReference Include="Microsoft.Win32.Registry" Version="[4.5.0, )" />
456496
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.0, )" />
457497
</ItemGroup>
498+
<!-- Package: Microsoft.AspNetCore.StaticFiles-->
499+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.StaticFiles' ">
500+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
501+
</PropertyGroup>
502+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.StaticFiles' AND '$(TargetFramework)' == 'netstandard2.0' ">
503+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
504+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
505+
<BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[2.1.1, )" />
506+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
507+
<BaselinePackageReference Include="Microsoft.Extensions.WebEncoders" Version="[2.1.1, )" />
508+
</ItemGroup>
458509
<!-- Package: Microsoft.AspNetCore.TestHost-->
459510
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.TestHost' ">
460511
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>

‎eng/Baseline.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
<Package Id="dotnet-sql-cache" Version="2.1.1" />
44
<Package Id="dotnet-user-secrets" Version="2.1.1" />
55
<Package Id="dotnet-watch" Version="2.1.1" />
6+
<Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.1.1" />
67
<Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.1.1" />
78
<Package Id="Microsoft.AspNetCore.Authentication.Core" Version="2.1.1" />
89
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.1.3" />
10+
<Package Id="Microsoft.AspNetCore.Cors" Version="2.1.1" />
911
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="2.1.1" />
1012
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
1113
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.1.1" />
@@ -35,6 +37,8 @@
3537
<Package Id="Microsoft.AspNetCore.Localization" Version="2.1.1" />
3638
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.1.1" />
3739
<Package Id="Microsoft.AspNetCore.Owin" Version="2.1.1" />
40+
<Package Id="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.1.1" />
41+
<Package Id="Microsoft.AspNetCore.ResponseCaching" Version="2.1.1" />
3842
<Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
3943
<Package Id="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
4044
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.1" />
@@ -46,8 +50,10 @@
4650
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.1.3" />
4751
<Package Id="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
4852
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.1" />
53+
<Package Id="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
4954
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
5055
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
5156
<Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" />
5257
<Package Id="Microsoft.Net.Http.Headers" Version="2.1.1" />
58+
5359
</Baseline>

‎eng/Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
1717
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
1818
<LatestPackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" />
19+
<LatestPackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
1920
<LatestPackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
2021
<LatestPackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
2122
<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" />
@@ -54,5 +55,9 @@
5455
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCompression" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj" />
5556
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Rewrite" ProjectPath="$(RepositoryRoot)src\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj" />
5657
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebSockets" ProjectPath="$(RepositoryRoot)src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj" />
58+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Cors" ProjectPath="$(RepositoryRoot)src\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj" />
59+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCaching" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj" />
60+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj" />
61+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.StaticFiles" ProjectPath="$(RepositoryRoot)src\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj" />
5762
</ItemGroup>
5863
</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.1.1" />
8-
<LatestPackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
98
</ItemGroup>
109
</Project>

‎src/Antiforgery/.gitignore

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

0 commit comments

Comments
 (0)