Skip to content

Commit 0161161

Browse files
author
John Luo
committed
Merge branch 'release/3.0' into release/3.1
2 parents 6f71d65 + a3fd923 commit 0161161

File tree

12 files changed

+592
-1309
lines changed

12 files changed

+592
-1309
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
8787

8888
<!-- Used to only produce targeting pack installers/packages once per major.minor. -->
89-
<IsTargetingPackBuilding Condition="'$(IsServicingBuild)' == 'true' AND '$(DotNetBuildFromSource)' != 'true'">false</IsTargetingPackBuilding>
89+
<IsTargetingPackBuilding Condition="'$(AspNetCorePatchVersion)' == '0' AND '$(DotNetBuildFromSource)' != 'true'">false</IsTargetingPackBuilding>
9090

9191
<!--
9292
Archives and installers using this prefix are intended for internal-use only.

‎Directory.Build.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858

5959
<Import Project="eng\Baseline.Designer.props" />
6060

61-
<PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' ">
61+
<PropertyGroup
62+
Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' AND '$(DisableServicingFeatures)' != 'true' ">
6263
<IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
6364
</PropertyGroup>
6465

‎eng/Baseline.Designer.props

Lines changed: 473 additions & 1112 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 86 additions & 133 deletions
Large diffs are not rendered by default.

‎eng/PatchConfig.props

Lines changed: 2 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ This file contains a list of the package IDs which are patching in a given relea
44
55
CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky.
66
When adding a new package, make sure the new line ends with a semicolon and starts with a space.
7-
Later on, this will be checked using this condition:
87
8+
Directory.Build.props checks this property using the following condition:
99
<IsPackageInThisPatch>$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
1010
-->
1111
<Project>
@@ -15,59 +15,7 @@ Later on, this will be checked using this condition:
1515

1616
<PropertyGroup Condition=" '$(VersionPrefix)' == '3.0.1' ">
1717
<PackagesInPatch>
18-
</PackagesInPatch>
19-
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.2' ">
21-
<PackagesInPatch>
22-
@aspnet/signalr;
23-
Microsoft.AspNetCore.AspNetCoreModuleV2;
24-
Microsoft.AspNetCore.Authentication.Google;
25-
Microsoft.AspNetCore.Http;
26-
Microsoft.AspNetCore.Mvc.Core;
27-
Microsoft.AspNetCore.Routing;
28-
Microsoft.AspNetCore.Server.IIS;
29-
java:signalr;
30-
</PackagesInPatch>
31-
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.4' ">
33-
<PackagesInPatch>
34-
@aspnet/signalr;
35-
Microsoft.AspNetCore.AspNetCoreModuleV2;
36-
</PackagesInPatch>
37-
</PropertyGroup>
38-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.5' ">
39-
<PackagesInPatch>
40-
Microsoft.AspNetCore.AspNetCoreModule;
41-
Microsoft.AspNetCore.AspNetCoreModuleV2;
42-
Microsoft.AspNetCore.Identity.UI;
43-
java:signalr;
44-
Microsoft.AspNetCore.SignalR.Protocols.MessagePack;
45-
Microsoft.AspNetCore.SignalR.Redis;
46-
Microsoft.AspNetCore.SignalR.StackExchangeRedis;
47-
Microsoft.AspNetCore.DataProtection.StackExchangeRedis;
48-
Microsoft.AspNetCore.Mvc.Core;
49-
Microsoft.AspNetCore.Mvc.RazorPages;
50-
Microsoft.AspNetCore.AzureAppServicesIntegration;
51-
Microsoft.AspNetCore.AzureAppServices.HostingStartup;
52-
Microsoft.AspNetCore.AzureAppServices.SiteExtension;
53-
</PackagesInPatch>
54-
</PropertyGroup>
55-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.6' ">
56-
<PackagesInPatch>
57-
Microsoft.AspNetCore.Mvc.Api.Analyzers;
58-
Microsoft.AspNetCore.Server.HttpSys;
59-
Microsoft.AspNetCore.Server.IIS;
60-
</PackagesInPatch>
61-
</PropertyGroup>
62-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.7' ">
63-
<PackagesInPatch>
64-
Microsoft.AspNetCore.DataProtection.AzureStorage;
65-
Microsoft.AspNetCore.Hosting;
66-
Microsoft.AspNetCore.SpaServices;
67-
</PackagesInPatch>
68-
</PropertyGroup>
69-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.8' ">
70-
<PackagesInPatch>
18+
Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
7119
</PackagesInPatch>
7220
</PropertyGroup>
7321
</Project>

‎eng/Versions.props

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,15 @@
2222
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
2323
<!-- Additional assembly attributes are already configured to include the source revision ID. -->
2424
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
25+
<!--
26+
Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them and PatchConfig.props. This also
27+
gives us time to build the entire repo and settle the infrastructure. Do _not_ do this when stabilizing versions.
28+
-->
29+
<DisableServicingFeatures
30+
Condition=" '$(DisableServicingFeatures)' == '' AND '$(StabilizePackageVersion)' != 'true' ">true</DisableServicingFeatures>
2531
<!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->
26-
<IsServicingBuild Condition=" '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
32+
<IsServicingBuild
33+
Condition=" '$(DisableServicingFeatures)' != 'true' AND '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
2734
<VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
2835
<!-- TargetingPackVersionPrefix is used by projects, like .deb and .rpm, which use slightly different version formats. -->
2936
<TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix>

‎eng/targets/ResolveReferences.targets

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
-->
3737
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseLatestPackageReferences>
3838
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' != 'true' ">true</UseLatestPackageReferences>
39-
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND ( '$(IsServicingBuild)' != 'true' OR '$(IsPackable)' == 'true' ) ">true</UseLatestPackageReferences>
39+
<UseLatestPackageReferences
40+
Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND '$(IsPackable)' == 'true' ">true</UseLatestPackageReferences>
4041
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' ">false</UseLatestPackageReferences>
4142

4243
<!--
@@ -45,7 +46,7 @@
4546
* when a project is a test or sample project
4647
We don't use project references between components in servicing builds between compontents to preserve the baseline as much as possible.
4748
-->
48-
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseProjectReferences>
49+
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseProjectReferences>
4950
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsImplementationProject)' != 'true' ">true</UseProjectReferences>
5051
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' ">false</UseProjectReferences>
5152

@@ -122,7 +123,7 @@
122123
Text="Cannot reference &quot;%(_InvalidReferenceToNonSharedFxAssembly.Identity)&quot;. This dependency is not in the shared framework. See docs/SharedFramework.md for instructions on how to modify what is in the shared framework." />
123124
</Target>
124125

125-
<Target Name="_WarnAboutRedundantRef" AfterTargets="ResolveFrameworkReferences">
126+
<Target Name="_WarnAboutRedundantRef" AfterTargets="ResolveFrameworkReferences;ProcessFrameworkReferences">
126127
<Warning Condition="@(FrameworkReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore.App')->Count()) &gt; 1"
127128
Text="Redundant &lt;FrameworkReference&gt;. If you have an explicit item in the project file, you might be able to remove it. Some SDKs, like Microsoft.NET.Sdk.Web, add this implicitly." />
128129
</Target>

‎eng/tools/BaselineGenerator/BaselineGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
6-
<StartArguments>-s https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</StartArguments>
6+
<StartArguments>-s https://api.nuget.org/v3/index.json</StartArguments>
77
<StartWorkingDirectory>$(MSBuildThisFileDirectory)../../</StartWorkingDirectory>
88
</PropertyGroup>
99

‎src/Components/Components/src/Microsoft.AspNetCore.Components.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@
2323
<Reference Include="System.Buffers" />
2424
</ItemGroup>
2525

26+
<!-- These references were removed in 3.0 -->
27+
<ItemGroup>
28+
<SuppressBaselineReference Include="Microsoft.AspNetCore.Components.Analyzers" />
29+
<SuppressBaselineReference Include="Microsoft.AspNetCore.Authorization" />
30+
<SuppressBaselineReference Include="Microsoft.JSInterop" />
31+
<SuppressBaselineReference Include="System.ComponentModel.Annotations" />
32+
</ItemGroup>
33+
2634
<Target Name="_GetNuspecDependencyPackageVersions">
2735
<MSBuild Targets="_GetPackageVersionInfo"
2836
BuildInParallel="$(BuildInParallel)"

‎src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ public async Task SetIISLimitMaxRequestBodySizeE2EWorks()
4949

5050
var result = await deploymentResult.HttpClient.PostAsync("/ReadRequestBody", new StringContent("test"));
5151

52-
// IIS returns a 404 instead of a 413...
53-
Assert.Equal(HttpStatusCode.NotFound, result.StatusCode);
52+
// IIS either returns a 404 or a 413 based on versions of IIS.
53+
// Check for both as we don't know which specific patch version.
54+
Assert.True(result.StatusCode == HttpStatusCode.NotFound || result.StatusCode == HttpStatusCode.RequestEntityTooLarge);
5455
}
5556

5657
[ConditionalFact]
@@ -68,7 +69,8 @@ await connection.Send(
6869
"Host: localhost",
6970
"",
7071
"A");
71-
await connection.Receive("HTTP/1.1 404 Not Found");
72+
var requestLine = await connection.ReadLineAsync();
73+
Assert.True(requestLine.Contains("404") || requestLine.Contains("413"));
7274
}
7375
}
7476

0 commit comments

Comments
 (0)