Skip to content

Commit 5b393a8

Browse files
lbusselllbussell
authored
Update to October 2021 5.0.208 release (#2513)
* update to october 5.0.208 release * disable EOL framework check for bootstrap build of aspnetcore * switch to new format for microsoft-hosted Ubuntu 20.04 * restore osx-only prebuilts
1 parent 85b2cbf commit 5b393a8

10 files changed

+66
-66
lines changed

‎.vsts.pipelines/jobs/ci-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
job: null
33
pool:
4-
name: Hosted Ubuntu 1604
4+
vmImage: 'ubuntu-20.04'
55
imageName: null
66
reportPrebuiltLeaks: false
77
generatePrebuiltBurndown: false

‎.vsts.pipelines/jobs/ci-linux_bootstrap.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
job: null
33
pool:
4-
name: Hosted Ubuntu 1604
4+
vmImage: 'ubuntu-20.04'
55
imageName: null
66
cleanAptGet: false
77

‎build.sh

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,16 @@ if [ "${internalPackageFeedPat:-}" ]; then
108108
# TODO: Read these from nuget.config
109109
# The internal transport isn't added by Darc, though, so it will still need special-casing.
110110
export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [
111-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-755ceda7/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
112-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-556582d9-3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
113-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-556582d9-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
114-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-208e377a/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
111+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-92e6dca2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
112+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-92e6dca2-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
113+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-92e6dca2-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
114+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-f431858f/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
115+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-f431858f-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
116+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-f431858f-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
115117
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-5709275b/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
116-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-3cdb1866-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
117-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-3cdb1866/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
118+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5a6c095d/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
119+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5a6c095d-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
120+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5a6c095d-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
118121
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-67acc3d3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
119122
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-67acc3d3-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
120123
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-67acc3d3-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
@@ -123,9 +126,10 @@ if [ "${internalPackageFeedPat:-}" ]; then
123126
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-c663adee-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
124127
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-c663adee-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
125128
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-b92c9f50/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
129+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-eeb31f66/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
126130
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
127-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/5.0.207-servicing.21424.28/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
128-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/5.0.401-servicing.21424.30-shipping/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
131+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/5.0.208-servicing.21473.49-shipping/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
132+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/5.0.402-servicing.21476.6-shipping/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
129133
]}'
130134
fi
131135

‎eng/Version.Details.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@
2222
<Sha>c01a538851a8ab1a1fbeb2e6243f391fff7587b4</Sha>
2323
<RepoName>aspnet-xdt</RepoName>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21364.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
25+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21459.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
2626
<Uri>https://github.com/mono/linker</Uri>
27-
<Sha>dc2ca1a2089983aa027e475998aa3a335bc247b7</Sha>
27+
<Sha>f321ba23da5fece884b6ff7a853fcccc07f59559</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
30+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
3131
<Uri>https://github.com/dotnet/runtime</Uri>
32-
<Sha>e1825b4928afa9455cc51e1de2b2e66c8be3018d</Sha>
32+
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
3333
<RepoName>runtime</RepoName>
3434
<RepoName>runtime-portable</RepoName>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.206" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
36+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.207" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
3737
<Uri>https://github.com/dotnet/templating</Uri>
38-
<Sha>8454db9dc326006c121bcf5fa8424759ccfdc199</Sha>
38+
<Sha>5a6c095df390fbb5c3f232ab0adedda53d4e2206</Sha>
3939
</Dependency>
4040
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.20420.1">
4141
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -56,16 +56,16 @@
5656
</Dependency>
5757
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
5858
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
59-
<Sha>4e2e1ade9b458ce88e083bc2ae4c533cf5882410</Sha>
59+
<Sha>92e6dca2e4d1966c3b7b657dd158ced2e6a2ae71</Sha>
6060
</Dependency>
6161
<Dependency Name="NuGet.Build.Tasks" Version="5.9.1-rc.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
6262
<Uri>https://github.com/nuget/nuget.client</Uri>
6363
<Sha>d525b0e670f3b6cbd5c73a35f04730a9f658c852</Sha>
6464
<RepoName>nuget-client</RepoName>
6565
</Dependency>
66-
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.206-servicing.21424.41" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
66+
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.208-servicing.21473.53" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
6767
<Uri>https://github.com/dotnet/sdk</Uri>
68-
<Sha>a769de135983dbc0a8efa2a472919842c3cec634</Sha>
68+
<Sha>25b3161b802eae78d7a306cf404da7af1762e222</Sha>
6969
<RepoName>sdk</RepoName>
7070
</Dependency>
7171
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
@@ -83,9 +83,9 @@
8383
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
8484
<Sha>d2bec3a64076f8463de4756913712badfce0a01d</Sha>
8585
</Dependency>
86-
<Dependency Name="dotnet-dev-certs" Version="5.0.10-servicing.21410.22" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
86+
<Dependency Name="dotnet-dev-certs" Version="5.0.11-servicing.21473.29" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
8787
<Uri>https://github.com/dotnet/aspnetcore</Uri>
88-
<Sha>b92c9f50f0333ea661785ba849f303cde6a93844</Sha>
88+
<Sha>eeb31f66a2803f9166b68edf3e67a26c79e5d7f3</Sha>
8989
<RepoName>aspnetcore</RepoName>
9090
</Dependency>
9191
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.3.2-beta.21102.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
@@ -96,9 +96,9 @@
9696
<Uri>https://github.com/microsoft/vstest</Uri>
9797
<Sha>99b911a57a02fc5d2eeef23e9ab8cbea4505678b</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.207-servicing.21424.28">
99+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.208-servicing.21473.49">
100100
<Uri>https://github.com/dotnet/installer</Uri>
101-
<Sha>b2bfcafcecbc180605fea25174ab0735b1e9f454</Sha>
101+
<Sha>cd07fb054b734018bf72d3bbc44c8e7bafd6e920</Sha>
102102
<RepoName>installer</RepoName>
103103
</Dependency>
104104
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.20419.2">

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<PropertyGroup>
55
<MajorVersion>5</MajorVersion>
66
<MinorVersion>0</MinorVersion>
7-
<RuntimePatchVersion>10</RuntimePatchVersion>
8-
<SdkPatchVersion>207</SdkPatchVersion>
7+
<RuntimePatchVersion>11</RuntimePatchVersion>
8+
<SdkPatchVersion>208</SdkPatchVersion>
99
<RuntimeProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</RuntimeProductVersion>
1010
<AspNetCoreProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</AspNetCoreProductVersion>
1111
<SdkProductVersion>$(MajorVersion).$(MinorVersion).$(SdkPatchVersion)</SdkProductVersion>
@@ -24,6 +24,6 @@
2424
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.21307.1</PrivateSourceBuildReferencePackagesPackageVersion>
2525
</PropertyGroup>
2626
<PropertyGroup>
27-
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.206-1318667-20210825.8</PrivateSourceBuiltArtifactsPackageVersion>
27+
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.207-1375271-20210921.6</PrivateSourceBuiltArtifactsPackageVersion>
2828
</PropertyGroup>
2929
</Project>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "5.0.206"
3+
"dotnet": "5.0.207"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 8179783f0b2e78658257660b4bd7db47668469dc Mon Sep 17 00:00:00 2001
1+
From 40f9998c310272ffd9fcb207ca50206548061a64 Mon Sep 17 00:00:00 2001
22
From: Omair Majid <omajid@redhat.com>
33
Date: Wed, 23 Oct 2019 15:43:57 -0400
4-
Subject: [PATCH 07/19] Support global.json on arm64 as well
4+
Subject: [PATCH] Support global.json on arm64 as well
55

66
arcade uses the runtime section of global.json to decide which
77
architecture + runtime combination needs to be installed.
@@ -19,24 +19,24 @@ This gets us a working SDK/Runtime combo on arm64.
1919
1 file changed, 1 insertion(+), 4 deletions(-)
2020

2121
diff --git a/global.json b/global.json
22-
index 25bf32016b..8127174d10 100644
22+
index e63ebf7aa7..b8508d981d 100644
2323
--- a/global.json
2424
+++ b/global.json
2525
@@ -5,13 +5,10 @@
2626
"tools": {
27-
"dotnet": "5.0.205",
27+
"dotnet": "5.0.207",
2828
"runtimes": {
2929
- "dotnet/x64": [
3030
+ "dotnet": [
31-
"2.1.28",
31+
"2.1.30",
3232
"$(MicrosoftNETCoreAppInternalPackageVersion)"
3333
],
3434
- "dotnet/x86": [
3535
- "$(MicrosoftNETCoreAppInternalPackageVersion)"
3636
- ],
3737
"aspnetcore/x64": [
38-
"3.1.17"
38+
"3.1.19"
3939
]
4040
--
41-
2.18.0
41+
2.30.2
4242

‎repos/aspnetcore.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<BuildCommandArgs>$(BuildCommandArgs) /p:SourceBuildRuntimeIdentifier=$(OverrideTargetRid)</BuildCommandArgs>
2222
<BuildCommandArgs>$(BuildCommandArgs) /p:UseAppHost=false</BuildCommandArgs>
2323
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)</BuildCommandArgs>
24+
<BuildCommandArgs>$(BuildCommandArgs) /p:CheckEolTargetFramework=false</BuildCommandArgs>
2425

2526
<!-- Update to 1.0.0 version of reference assemblies which are built in SBRP instead of the preview.2 version
2627
included by Arcade -->

‎smoke-testNuGet.Config

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="darc-pub-dotnet-templating-0b9d7e7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0b9d7e76/nuget/v3/index.json" />
6-
<add key="darc-pub-dotnet-templating-0b9d7e7-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0b9d7e76-4/nuget/v3/index.json" />
7-
<add key="darc-pub-dotnet-templating-0b9d7e7-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0b9d7e76-3/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-templating-0b9d7e7-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0b9d7e76-2/nuget/v3/index.json" />
9-
<add key="darc-pub-dotnet-templating-0b9d7e7-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0b9d7e76-1/nuget/v3/index.json" />
10-
<add key="darc-pub-dotnet-runtime-cf258a1-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-cf258a14-1/nuget/v3/index.json" />
11-
<add key="darc-pub-dotnet-roslyn-analyzers-755ceda" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-755ceda7/nuget/v3/index.json" />
5+
<add key="darc-pub-dotnet-templating-5a6c095" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5a6c095d/nuget/v3/index.json" />
6+
<add key="darc-pub-dotnet-templating-5a6c095-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5a6c095d-2/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-templating-5a6c095-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5a6c095d-1/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-roslyn-analyzers-92e6dca" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-92e6dca2/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-roslyn-analyzers-92e6dca-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-92e6dca2-2/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-roslyn-analyzers-92e6dca-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-92e6dca2-1/nuget/v3/index.json" />
1211
<add key="darc-pub-dotnet-msbuild-5e4b48a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-msbuild-5e4b48a2/nuget/v3/index.json" />
1312
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
1413
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

0 commit comments

Comments
 (0)