Skip to content

Commit 0a26262

Browse files
author
John Luo
authored
Merge pull request #19215 from dotnet-maestro-bot/merge/release/3.1-to-master
[automated] Merge branch 'release/3.1' => 'master'
2 parents c3dd7e4 + 9d5d4f4 commit 0a26262

File tree

19 files changed

+18016
-14529
lines changed

19 files changed

+18016
-14529
lines changed

‎Directory.Build.props

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

179179
<ArchiveExtension>.tar.gz</ArchiveExtension>
180180
<ArchiveExtension Condition="'$(TargetOsName)' == 'win'">.zip</ArchiveExtension>
181+
<ChecksumExtension>.sha512</ChecksumExtension>
181182
</PropertyGroup>
182183

183184
<Import Project="eng\Workarounds.props" />

‎eng/Baseline.Designer.props

Lines changed: 237 additions & 233 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -7,83 +7,83 @@ Update this list when preparing for a new patch.
77
<Baseline Version="3.1.2">
88
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.2" />
99
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.2" />
10-
<Package Id="dotnet-sql-cache" Version="3.1.1" />
11-
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.1" />
12-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.1" />
13-
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.1" />
14-
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.1" />
15-
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.1" />
16-
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.1" />
17-
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.1" />
18-
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.1" />
19-
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.1" />
20-
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.1" />
21-
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.1" />
22-
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.1" />
23-
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.1" />
24-
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.1" />
25-
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.1" />
26-
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.1" />
27-
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.1" />
28-
<Package Id="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19465.2" />
29-
<Package Id="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19465.2" />
30-
<Package Id="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19465.2" />
31-
<Package Id="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview9.19465.2" />
32-
<Package Id="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview9.19465.2" />
33-
<Package Id="Microsoft.AspNetCore.Blazor.Templates" Version="3.0.0-preview9.19465.2" />
34-
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.1" />
35-
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.1" />
36-
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.1" />
37-
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.1" />
38-
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
39-
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.1" />
40-
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.1" />
41-
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.1" />
42-
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.1" />
43-
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.1" />
44-
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.1" />
45-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.1" />
46-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.1" />
47-
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.1" />
48-
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.1" />
49-
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.1" />
50-
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.1" />
51-
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.1" />
52-
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.1" />
53-
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.1" />
54-
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.1" />
55-
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.1" />
56-
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.1" />
57-
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.1" />
58-
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.1" />
59-
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.1" />
60-
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.1" />
61-
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.1" />
62-
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
63-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.1" />
64-
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.1" />
65-
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.1" />
66-
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.1" />
67-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.1" />
68-
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.1" />
69-
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.1" />
70-
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.1" />
71-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.1" />
72-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.1" />
73-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.1" />
74-
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.1" />
75-
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.1" />
76-
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.1" />
77-
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.1" />
78-
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.1" />
79-
<Package Id="Microsoft.dotnet-openapi" Version="3.1.1" />
80-
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.1" />
81-
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.1" />
82-
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.1" />
83-
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.1" />
84-
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.1" />
85-
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.1" />
86-
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.1" />
87-
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.1" />
88-
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.1" />
10+
<Package Id="dotnet-sql-cache" Version="3.1.2" />
11+
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.2" />
12+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.2" />
13+
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.2" />
14+
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.2" />
15+
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.2" />
16+
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.2" />
17+
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.2" />
18+
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.2" />
19+
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.2" />
20+
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.2" />
21+
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.2" />
22+
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.2" />
23+
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.2" />
24+
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.2" />
25+
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.2" />
26+
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.2" />
27+
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.2" />
28+
<Package Id="Microsoft.AspNetCore.Blazor" Version="3.2.0-preview1.20073.1" />
29+
<Package Id="Microsoft.AspNetCore.Blazor.Build" Version="3.2.0-preview1.20073.1" />
30+
<Package Id="Microsoft.AspNetCore.Blazor.DevServer" Version="3.2.0-preview1.20073.1" />
31+
<Package Id="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview1.20073.1" />
32+
<Package Id="Microsoft.AspNetCore.Blazor.Server" Version="3.2.0-preview1.20073.1" />
33+
<Package Id="Microsoft.AspNetCore.Blazor.Templates" Version="3.2.0-preview1.20073.1" />
34+
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.2" />
35+
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.2" />
36+
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.2" />
37+
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.2" />
38+
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.2" />
39+
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.2" />
40+
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.2" />
41+
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.2" />
42+
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.2" />
43+
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.2" />
44+
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.2" />
45+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.2" />
46+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.2" />
47+
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.2" />
48+
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.2" />
49+
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.2" />
50+
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.2" />
51+
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.2" />
52+
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.2" />
53+
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.2" />
54+
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.2" />
55+
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.2" />
56+
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.2" />
57+
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.2" />
58+
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.2" />
59+
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.2" />
60+
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.2" />
61+
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.2" />
62+
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
63+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.2" />
64+
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.2" />
65+
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.2" />
66+
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.2" />
67+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.2" />
68+
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.2" />
69+
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.2" />
70+
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.2" />
71+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.2" />
72+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.2" />
73+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.2" />
74+
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.2" />
75+
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.2" />
76+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.2" />
77+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.2" />
78+
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.2" />
79+
<Package Id="Microsoft.dotnet-openapi" Version="3.1.2" />
80+
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.2" />
81+
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.2" />
82+
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.2" />
83+
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.2" />
84+
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.2" />
85+
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.2" />
86+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.2" />
87+
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.2" />
88+
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.2" />
8989
</Baseline>

‎eng/Publishing.props

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<!-- The one use of ArtifactsDir in Publish.proj adds an additional slash, confusing itself. -->
44
<ArtifactsDir>$(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1))))</ArtifactsDir>
55

6-
<PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishInstallers</PublishDependsOnTargets>
6+
<PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishInstallersAndChecksums</PublishDependsOnTargets>
77

88
<_UploadPathRoot>aspnetcore</_UploadPathRoot>
99
</PropertyGroup>
1010

11-
<!-- $(InstallersOutputPath) and $(SymbolsOutputPath) are not defined. Root Directory.Build.props is not imported. -->
11+
<!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. -->
1212
<ItemGroup>
1313
<!-- Include our "loose" PDBs when publishing symbols. -->
1414
<FilesToPublishToSymbolServer Include="$(ArtifactsDir)\symbols\**\*.pdb" />
1515

16-
<!-- Prepare for _PublishInstallers target. -->
16+
<!-- Prepare for _PublishInstallersAndChecksums target. -->
1717
<_InstallersToPublish Remove="@(_InstallersToPublish)" />
1818
<_InstallersToPublish Include="$(ArtifactsDir)\packages\**\*.jar" UploadPathSegment="jar" />
1919
<_InstallersToPublish Include="$(ArtifactsDir)\packages\**\*.pom" UploadPathSegment="jar" />
@@ -27,9 +27,10 @@
2727
Condition=" '$(PublishInstallerBaseVersion)' == 'true' " />
2828
<_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.wixlib" UploadPathSegment="Runtime" />
2929
<_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.zip" UploadPathSegment="Runtime" />
30+
<_ChecksumsToPublish Include="$(ArtifactsDir)\**\*.sha512" />
3031
</ItemGroup>
3132

32-
<Target Name="_PublishInstallers">
33+
<Target Name="_PublishInstallersAndChecksums">
3334
<!--
3435
This target is defined in eng/targets/Packaging.targets and included in every C# and F# project.
3536
We use Microsoft.AspNetCore.DeveloperCertificates.XPlat because it is a nonshipping package, and we need a non-stable version string to use as our publish location.
@@ -48,6 +49,11 @@
4849
<!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows. -->
4950
<ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT'" />
5051

52+
<ItemsToPushToBlobFeed Include="@(_ChecksumsToPublish)">
53+
<PublishFlatContainer>true</PublishFlatContainer>
54+
<RelativeBlobPath>$(_UploadPathRoot)/Runtime/$(_PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
55+
</ItemsToPushToBlobFeed>
56+
5157
<ItemsToPushToBlobFeed Include="@(_InstallersToPublish)">
5258
<IsShipping>true</IsShipping>
5359
<ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>

‎eng/SharedFramework.External.props

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,19 @@
66
-->
77
<Project>
88

9+
<!-- For the targeting pack, always use packages with PatchVersion=0 -->
10+
<PropertyGroup Condition="'$(IsServicingBuild)' == 'true' AND ('$(MSBuildProjectName)' == 'Microsoft.AspNetCore.App.Ref' OR '$(IsReferenceAssemblyProject)' == 'true')">
11+
<SystemIOPipelinesPackageVersion>$(SystemIOPipelinesPackageVersion.Split('.')[0]).$(SystemIOPipelinesPackageVersion.Split('.')[1]).0</SystemIOPipelinesPackageVersion>
12+
<SystemSecurityCryptographyXmlPackageVersion>$(SystemSecurityCryptographyXmlPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyXmlPackageVersion.Split('.')[1]).0</SystemSecurityCryptographyXmlPackageVersion>
13+
<MicrosoftWin32SystemEventsPackageVersion>$(MicrosoftWin32SystemEventsPackageVersion.Split('.')[0]).$(MicrosoftWin32SystemEventsPackageVersion.Split('.')[1]).0</MicrosoftWin32SystemEventsPackageVersion>
14+
<SystemDiagnosticsEventLogPackageVersion>$(SystemDiagnosticsEventLogPackageVersion.Split('.')[0]).$(SystemDiagnosticsEventLogPackageVersion.Split('.')[1]).0</SystemDiagnosticsEventLogPackageVersion>
15+
<SystemDrawingCommonPackageVersion>$(SystemDrawingCommonPackageVersion.Split('.')[0]).$(SystemDrawingCommonPackageVersion.Split('.')[1]).0</SystemDrawingCommonPackageVersion>
16+
<SystemSecurityCryptographyPkcsPackageVersion>$(SystemSecurityCryptographyPkcsPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyPkcsPackageVersion.Split('.')[1]).0</SystemSecurityCryptographyPkcsPackageVersion>
17+
<SystemSecurityPermissionsPackageVersion>$(SystemSecurityPermissionsPackageVersion.Split('.')[0]).$(SystemSecurityPermissionsPackageVersion.Split('.')[1]).0</SystemSecurityPermissionsPackageVersion>
18+
<SystemWindowsExtensionsPackageVersion>$(SystemWindowsExtensionsPackageVersion.Split('.')[0]).$(SystemWindowsExtensionsPackageVersion.Split('.')[1]).0</SystemWindowsExtensionsPackageVersion>
19+
</PropertyGroup>
20+
21+
922
<ItemGroup>
1023
<!-- Dependencies from dotnet/extensions -->
1124
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(MicrosoftExtensionsCachingAbstractionsPackageVersion)" />

‎eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@
202202
<!-- Packages developed by @aspnet, but manually updated as necessary. -->
203203
<LibuvPackageVersion>1.10.0</LibuvPackageVersion>
204204
<MicrosoftAspNetWebApiClientPackageVersion>5.2.6</MicrosoftAspNetWebApiClientPackageVersion>
205+
<MonoWebAssemblyInteropPackageVersion>3.1.1-preview4.19614.4</MonoWebAssemblyInteropPackageVersion>
205206
<!-- Partner teams -->
206207
<MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion>
207208
<MicrosoftAzureStorageBlobPackageVersion>10.0.1</MicrosoftAzureStorageBlobPackageVersion>

‎src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
<PackageId>$(TargetingPackName)</PackageId>
99
<VersionPrefix>$(TargetingPackVersionPrefix)</VersionPrefix>
1010
<!-- This is a reference package and does not include any dependencies. -->
11-
<NoWarn>$(NoWarn);NU5128</NoWarn>
11+
<!-- We also disable warnings about package downgrades, because we intentionally reference lower versions of certain packages -->
12+
<NoWarn>$(NoWarn);NU5128;NU1605</NoWarn>
1213

1314
<PackageDescription>Provides a default set of APIs for building an ASP.NET Core application. Contains reference assemblies, documentation, and other design-time assets.
1415

@@ -129,7 +130,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
129130
<!-- Exclude transitive external dependencies that are not directly referenced by projects in AspNetCore or Extensions -->
130131
<AspNetCoreReferenceAssemblyPath
131132
Include="@(ReferencePathWithRefAssemblies)"
132-
Condition="'%(ReferencePathWithRefAssemblies.IsReferenceAssembly)' == 'true'"
133+
Condition="'%(ReferencePathWithRefAssemblies.IsReferenceAssembly)' != 'false'"
133134
Exclude="
134135
@(_ReferencedExtensionsRefAssemblies);
135136
@(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App.Ref'));

0 commit comments

Comments
 (0)