Skip to content

Commit 3d8766b

Browse files
dseefelddseefeld
authored
Merge pull request #2121 from dseefeld/3.1.14-apr2021
Update to the April 3.1.14 release
2 parents f6cacdd + 4169b22 commit 3d8766b

12 files changed

+48
-40
lines changed

‎NuGet.config

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
<configuration>
33
<packageSources>
44
<clear />
5+
<!-- Begin: Package sources from dotnet-templating -->
6+
<add key="darc-pub-dotnet-templating-f8760d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f8760d03/nuget/v3/index.json" />
7+
<!-- End: Package sources from dotnet-templating -->
58
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
69
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
710
</packageSources>

‎build.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,11 @@ if [ "${internalPackageFeedPat:-}" ]; then
118118
# TODO: Read these from nuget.config
119119
# The internal transport isn't added by Darc, though, so it will still need special-casing.
120120
export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [
121-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-331b52b3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
122-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-7f783df7/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
123-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0267ad09/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
124-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-4210e7d1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
125-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-corefx-43e382ec/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
126-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9b154f56/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
121+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-440dadc0/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
122+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-aec2954c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
123+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-826c2c2f/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
124+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-1c79cde9/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
125+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f8760d03/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
127126
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
128127
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/3-1-13-2-18-21/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
129128
]}'

‎eng/Version.Details.xml

+24-24
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,36 @@
2727
<Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.13-servicing.21111.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
30+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.13-servicing.21162.1" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3131
<Uri>https://github.com/dotnet/coreclr</Uri>
32-
<Sha>c531bbb17fd887eaf7073f7159db43477d557ae3</Sha>
32+
<Sha>0897c45fb56b1ddd9fa69cb5329fac1ce700b8eb</Sha>
3333
<RepoName>coreclr</RepoName>
3434
<RepoName>coreclr-portable</RepoName>
3535
</Dependency>
3636
<Dependency Name="NETStandard.Library" Version="2.1.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
3737
<Uri>https://github.com/dotnet/standard</Uri>
3838
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.21116.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
40+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.21162.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
4141
<Uri>https://github.com/dotnet/corefx</Uri>
42-
<Sha>9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e</Sha>
42+
<Sha>6e37696a5420057596d61119614574db9037c652</Sha>
4343
<RepoName>corefx</RepoName>
4444
<RepoName>corefx-portable</RepoName>
4545
</Dependency>
46-
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
46+
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
4747
<Uri>https://github.com/dotnet/core-setup</Uri>
48-
<Sha>64df28ec4a52d6cc23efffbb918eab87ee42600f</Sha>
48+
<Sha>826c2c2f8f0506c4fdb57ddc71b1dc4af9cb781c</Sha>
4949
<RepoName>core-setup</RepoName>
5050
<RepoName>core-setup-portable</RepoName>
5151
</Dependency>
52-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
52+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.14" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
5353
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
54-
<Sha>1756aa62b0ee24952b064aabf88f240da51179b1</Sha>
54+
<Sha>aec2954c62f9ca32403ef572f8e64b417c6b67e8</Sha>
5555
<RepoName>aspnetcore-tooling</RepoName>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
57+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5858
<Uri>https://github.com/dotnet/templating</Uri>
59-
<Sha>01919484d0079b505f1befc05109f4f8405c2ec4</Sha>
59+
<Sha>f8760d033ff55c8e24944bf18f8e007bea4deb50</Sha>
6060
<RepoName>templating</RepoName>
6161
</Dependency>
6262
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.4.1-beta4-20127-10" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
@@ -72,14 +72,14 @@
7272
<Sha>6f8eb3a2e1db6b458451b9cfd2a4f5557769b041</Sha>
7373
<RepoName>nuget-client</RepoName>
7474
</Dependency>
75-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.13" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
75+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.14" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
7676
<Uri>https://github.com/dotnet/extensions</Uri>
77-
<Sha>945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f</Sha>
77+
<Sha>1c79cde92ca66a991b25a5ed9cbd570e289df47e</Sha>
7878
<RepoName>aspnet-extensions</RepoName>
7979
</Dependency>
80-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.113-servicing.21112.20" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
80+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.114-servicing.21161.11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
8181
<Uri>https://github.com/dotnet/sdk</Uri>
82-
<Sha>567532b5ebc207581830835b65bbd75feca7044c</Sha>
82+
<Sha>5565e6b21b7a11560fb88e73dce4c097fac6260d</Sha>
8383
<RepoName>sdk</RepoName>
8484
</Dependency>
8585
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.DotNet.Cli.Runtime">
@@ -96,37 +96,37 @@
9696
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
9797
<Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
99+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
100100
<Uri>https://github.com/dotnet/aspnetcore</Uri>
101-
<Sha>cf2c5c9c6dca430b97aa96429b84d0da07eb77f1</Sha>
101+
<Sha>440dadc05b2bed38e6a726c2492db90e77d43c62</Sha>
102102
<RepoName>aspnetcore</RepoName>
103103
</Dependency>
104-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.113-servicing.21117.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
104+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.114-servicing.21166.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
105105
<Uri>https://github.com/dotnet/cli</Uri>
106-
<Sha>bf72556791de4b18f1517271c858707d3eb2613a</Sha>
106+
<Sha>b637fb8974fdc0ddc880dfd16cf681c7eb7febb6</Sha>
107107
<RepoName>cli</RepoName>
108108
</Dependency>
109109
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.7.0-beta.19610.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
110110
<Uri>https://github.com/dotnet/fsharp</Uri>
111111
<Sha>dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.13-servicing.21117.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
113+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.113-servicing.21166.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
114114
<Uri>https://github.com/dotnet/websdk</Uri>
115-
<Sha>55d967978dda970e58d997a73bcb9dd86de1f9e4</Sha>
115+
<Sha>f55130b54ae93962c362692267601941f693291b</Sha>
116116
<RepoName>websdk</RepoName>
117117
</Dependency>
118118
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
119119
<Uri>https://github.com/microsoft/vstest</Uri>
120120
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.113-servicing.21117.35" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
122+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.114-servicing.21166.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
123123
<Uri>https://github.com/dotnet/toolset</Uri>
124-
<Sha>6dfa1a00637e5a59cf077919d7d536b56900b102</Sha>
124+
<Sha>3c0bb6e7e1a5526407ab9ba284bed18f9b841251</Sha>
125125
<RepoName>toolset</RepoName>
126126
</Dependency>
127-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="3.1.113-servicing-015239">
127+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.21166.31">
128128
<Uri>https://github.com/dotnet/installer</Uri>
129-
<Sha>2703068f9520050e59ba9c2e44aabe8fe533c65e</Sha>
129+
<Sha>07ddd844dccc1dadbec69b4c9628ec7689b5468d</Sha>
130130
<RepoName>core-sdk</RepoName>
131131
</Dependency>
132132
<!-- external dependencies, not handled by Maestro/Arcade -->

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "3.1.112"
3+
"dotnet": "3.1.113"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",

‎patches/aspnetcore/0006-Fix-version-number.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ to update/reapply it with a text editor.
1111
1 file changed, 0 insertions(+), 0 deletions(-)
1212

1313
diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
14-
index 1c602124e2c7a54b062e3b1d52c32580a70927bd..f4a07dde84be054ae6020981d431562c706fa577 100644
14+
index 1c602124e2c7a54b062e3b1d52c32580a70927bd..8a9b6408fae1502713f054bfe01cc281c130417d 100644
1515
GIT binary patch
1616
delta 23
17-
ecmZpC&e!yuuc3vpg=q_O^=5WsrP^3cYc2qA3kU)L
17+
ecmZpC&e!yuuc3vpg=q_O^=5VxrP^3cYc2qA5(onT
1818

1919
delta 22
2020
dcmZpA&e!;yuc3vpg=q_O^=39BrP^3cYXE2e2lfB}

‎patches/aspnetcore/0007-Remove-Yarn-dependency-not-used-in-source-build.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ index 97783de603..de628eca3c 100644
3535
},
3636
"msbuild-sdks": {
3737
- "Yarn.MSBuild": "1.15.2",
38-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21110.10",
39-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21110.10"
38+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21158.9",
39+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21158.9"
4040
}
4141
diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
4242
index 36eec6b93a..19c5906526 100644

‎patches/aspnetcore/0011-Support-global.json-on-arm64-as-well.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ index de628eca3c..3fb6244e52 100644
2424
+++ b/global.json
2525
@@ -5,10 +5,7 @@
2626
"tools": {
27-
"dotnet": "3.1.112",
27+
"dotnet": "3.1.113",
2828
"runtimes": {
2929
- "dotnet/x64": [
3030
- "$(MicrosoftNETCoreAppInternalPackageVersion)"

‎patches/core-sdk/0002-Patch-property-used-for-core-setup-version.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ index 43ea706d4..b1f5d5772 100644
1919
+ <CoreSetupBlobVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</CoreSetupBlobVersion>
2020

2121
<!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
22-
<NETCoreAppTargetingPackBlobVersion>3.1.0-rtm.19565.2</NETCoreAppTargetingPackBlobVersion>
22+
<NETCoreAppTargetingPackBlobVersion Condition="'$(Rid)' != 'win-arm64'">3.1.0-rtm.19565.2</NETCoreAppTargetingPackBlobVersion>
2323
--
2424
2.21.0
2525

‎repos/aspnetcore.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="PublishToolsetBinaries" />
6868

69-
<Target Name="PublishBinaries"
69+
<Target Name="PublishBinaries"
7070
AfterTargets="Build"
7171
Inputs="$(MSBuildProjectFullPath)"
7272
Outputs="$(RepoCompletedSemaphorePath)PublishBinaries.complete">

‎repos/package-source-build.proj

+2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
<ItemGroup>
2525
<CoreClrToolsFiles Include="$(ToolPackageExtractDir)coreclr-tools/*" />
2626
</ItemGroup>
27+
<!-- Also copy to the legacy path without the architecture for SBRP for now -->
2728
<Copy SourceFiles="@(CoreClrToolsFiles)" DestinationFolder="$(SourceBuiltPackagesPath)coreclr-tools" />
29+
<Copy SourceFiles="@(CoreClrToolsFiles)" DestinationFolder="$(SourceBuiltPackagesPath)coreclr-tools/$(BuildArchitecture)" />
2830

2931
<PropertyGroup>
3032
<SourceBuiltTarballName>$(OutputPath)$(SourceBuiltArtifactsTarballName).$(VersionPrefix)-$(VersionSuffix).tar.gz</SourceBuiltTarballName>

‎smoke-testNuGet.Config

+4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
<packageSources>
44
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
55
<clear />
6+
<!-- Begin: Package sources from dotnet-templating -->
7+
<add key="darc-pub-dotnet-templating-f8760d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f8760d03/nuget/v3/index.json" />
8+
<!-- End: Package sources from dotnet-templating -->
69
<add key="source-built-packages" value="SOURCE_BUILT_PACKAGES" />
710
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
11+
<add key="smoke-test feed" value="SMOKE_TEST_PACKAGE_FEED" />
812
</packageSources>
913
</configuration>

‎tools-local/prebuilt-baseline-online.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<UsageData>
2-
<CreatedByRid>fedora.30-x64</CreatedByRid>
2+
<CreatedByRid>fedora.31-x64</CreatedByRid>
33
<IgnorePatterns>
44
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/3.*" />
55
<UsagePattern IdentityGlob="Microsoft.DotNet.Web.ItemTemplates/2.1.*" />
@@ -48,7 +48,7 @@
4848
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta3" />
4949
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta4" />
5050
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="2.0.0-preview8.19373.1" />
51-
<Usage Id="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21110.10" IsDirectDependency="true" />
51+
<Usage Id="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21158.9" IsDirectDependency="true" />
5252
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.0.0" IsDirectDependency="true" />
5353
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" IsDirectDependency="true" />
5454
<Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4-20181009-2100240" />

0 commit comments

Comments
 (0)