Skip to content

Commit 602cb1d

Browse files
pranavkmpranavkm
authored
Merge pull request #15084 from aspnet/merge/release/3.1-to-master
Merge/release/3.1 to master
2 parents cee0470 + 859c1e0 commit 602cb1d

File tree

241 files changed

+3853
-1980
lines changed

Some content is hidden

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

241 files changed

+3853
-1980
lines changed

‎Directory.Build.props‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
<!-- Contact email address for NuGet packages and Linux installers. -->
4747
<MaintainerEmail>[email protected]</MaintainerEmail>
4848

49-
<PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
49+
<PackageIcon>packageIcon.png</PackageIcon>
50+
<PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
5051
<PackageProjectUrl>https://asp.net</PackageProjectUrl>
5152
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
5253

@@ -55,6 +56,10 @@
5556
<DefaultNetCoreTargetFramework>netcoreapp5.0</DefaultNetCoreTargetFramework>
5657
</PropertyGroup>
5758

59+
<ItemGroup>
60+
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
61+
</ItemGroup>
62+
5863
<!-- Warnings and errors -->
5964
<PropertyGroup>
6065
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -90,7 +95,7 @@
9095
<TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
9196

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

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

‎Directory.Build.targets‎

Lines changed: 8 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

@@ -104,6 +105,12 @@
104105
<Compile Include="$(SharedSourceRoot)ReferenceAssemblyInfo.cs" LinkBase="Properties" />
105106
</ItemGroup>
106107

108+
<PropertyGroup Condition="'$(Language)' == 'C#'">
109+
<!-- Reference assemblies should always use Major.Minor.0.0 for assembly versions even during servicing. Only the package version should be updated. -->
110+
<!-- Pinning the implementation assemblies at Major.Minor.0.0 as we figure out compiling against ref assemblies. -->
111+
<AssemblyVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0.0</AssemblyVersion>
112+
</PropertyGroup>
113+
107114
<ItemGroup>
108115
<KnownFrameworkReference Update="Microsoft.NETCore.App">
109116
<!-- Always update the 'latest version', whether the repo is servicing or not. -->

‎NuGet.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<add key="darc-pub-dotnet-corefx-4ac4c03" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-4ac4c036/nuget/v3/index.json" />
77
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
88
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
9+
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
910
<add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />
1011
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
1112
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />

‎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: 9 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,14 @@ 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.Net.Http.Headers;
19+
Microsoft.AspNetCore.CookiePolicy;
20+
Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
21+
@microsoft/signalr;
22+
Microsoft.Net.Http.Headers;
23+
Microsoft.AspNetCore.Http.Abstractions;
24+
Microsoft.AspNetCore.Http.Features;
25+
Microsoft.AspNetCore.CookiePolicy;
7126
</PackagesInPatch>
7227
</PropertyGroup>
7328
</Project>

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -412,17 +412,17 @@
412412
<Uri>https://github.com/aspnet/Extensions</Uri>
413413
<Sha>f15f3278c73c72a6546d7cb2c1bd54a541ffc83e</Sha>
414414
</Dependency>
415-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19462.4">
415+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19510.3">
416416
<Uri>https://github.com/dotnet/arcade</Uri>
417-
<Sha>f8546fbab59a74a66c83b8cb76b3f6877ce1d374</Sha>
417+
<Sha>f70d1fca3d5d4045be75694006f1bee0e0aec572</Sha>
418418
</Dependency>
419-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19462.4">
419+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19510.3">
420420
<Uri>https://github.com/dotnet/arcade</Uri>
421-
<Sha>f8546fbab59a74a66c83b8cb76b3f6877ce1d374</Sha>
421+
<Sha>f70d1fca3d5d4045be75694006f1bee0e0aec572</Sha>
422422
</Dependency>
423-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19462.4">
423+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19510.3">
424424
<Uri>https://github.com/dotnet/arcade</Uri>
425-
<Sha>f8546fbab59a74a66c83b8cb76b3f6877ce1d374</Sha>
425+
<Sha>f70d1fca3d5d4045be75694006f1bee0e0aec572</Sha>
426426
</Dependency>
427427
<Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-alpha1.19517.7" CoherentParentDependency="Microsoft.EntityFrameworkCore">
428428
<Uri>https://github.com/aspnet/Extensions</Uri>

‎eng/Versions.props‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,15 @@
2020
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
2121
<!-- Additional assembly attributes are already configured to include the source revision ID. -->
2222
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
23+
<!--
24+
Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them and PatchConfig.props. This also
25+
gives us time to build the entire repo and settle the infrastructure. Do _not_ do this when stabilizing versions.
26+
-->
27+
<DisableServicingFeatures
28+
Condition=" '$(DisableServicingFeatures)' == '' AND '$(StabilizePackageVersion)' != 'true' ">true</DisableServicingFeatures>
2329
<!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->
24-
<IsServicingBuild Condition=" '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
30+
<IsServicingBuild
31+
Condition=" '$(DisableServicingFeatures)' != 'true' AND '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
2532
<VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
2633
<!-- TargetingPackVersionPrefix is used by projects, like .deb and .rpm, which use slightly different version formats. -->
2734
<TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix>
@@ -55,7 +62,7 @@
5562
-->
5663
<PropertyGroup Label="Automated">
5764
<!-- Packages from dotnet/arcade -->
58-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19462.4</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19510.3</MicrosoftDotNetGenAPIPackageVersion>
5966
<!-- Packages from dotnet/roslyn -->
6067
<MicrosoftNetCompilersToolsetPackageVersion>3.4.0-beta1-19456-03</MicrosoftNetCompilersToolsetPackageVersion>
6168
<!-- Packages from dotnet/core-setup -->
@@ -229,7 +236,7 @@
229236
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
230237
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
231238
<GoogleProtobufPackageVersion>3.8.0</GoogleProtobufPackageVersion>
232-
<GrpcAspNetCorePackageVersion>2.23.1</GrpcAspNetCorePackageVersion>
239+
<GrpcAspNetCorePackageVersion>2.23.2</GrpcAspNetCorePackageVersion>
233240
<IdentityServer4AspNetIdentityPackageVersion>3.0.0</IdentityServer4AspNetIdentityPackageVersion>
234241
<IdentityServer4EntityFrameworkPackageVersion>3.0.0</IdentityServer4EntityFrameworkPackageVersion>
235242
<IdentityServer4PackageVersion>3.0.0</IdentityServer4PackageVersion>

‎eng/Workarounds.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<PropertyGroup>
2222
<!-- Working around https://github.com/NuGet/Home/issues/8467 -->
2323
<NoWarn>$(NoWarn);NU5131</NoWarn>
24+
<!-- Workaround until https://github.com/aspnet/AspNetCore-Internal/issues/3103 is resolved -->
25+
<NoWarn>$(NoWarn);NU5048</NoWarn>
2426
</PropertyGroup>
2527

2628
<!-- Workaround https://github.com/dotnet/roslyn/issues/27975 -->

‎eng/common/enable-cross-org-publishing.ps1‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
param(
2+
[string] $token
3+
)
4+
5+
Write-Host "##vso[task.setvariable variable=VSS_NUGET_ACCESSTOKEN]$token"
6+
Write-Host "##vso[task.setvariable variable=VSS_NUGET_URI_PREFIXES]https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/"

0 commit comments

Comments
 (0)