Skip to content

Commit c250e73

Browse files
crummeldseefeld
crummel
and
dseefeld
authored
Update to November 2021 5.0.209 release (#2616)
* Update from Bar ID 116438 Local dependencies updated based on build with BAR id 116438 (20211027.10 from https://dev.azure.com/dnceng/internal/_git/dotnet-installer@refs/heads/internal/release/5.0.2xx) * Update source directories * Reconcile patches * Update SDK version to N-1 * Add feeds to build.sh * Update PAT for AzDo internal access * Update online prebuilt baseline * Update SDK and Runtime versions and prev-SB version * Add feeds to nuget.configs * Change repos from internal to external * Update SBRP Version to pickup System.Drawing.Common,5.0.2 Co-authored-by: dseefeld <[email protected]> Co-authored-by: Dan Seefeldt <[email protected]>
1 parent 5b393a8 commit c250e73

File tree

8 files changed

+31
-35
lines changed

8 files changed

+31
-35
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
/p:FailOnPrebuiltBaselineError=$failOnBaselineError \
8686
/p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix) \
8787
$(tarballDownloadArgs) \
88-
/p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw)
88+
/p:AzDoPat=$(user.PAT)
8989
du -h $(rootDirectory) | sort -h | tail -n 50
9090
displayName: Build source-build
9191
timeoutInMinutes: 180

‎build.sh

+2
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ if [ "${internalPackageFeedPat:-}" ]; then
125125
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-c663adee/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
126126
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-c663adee-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
127127
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-c663adee-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
128+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-0bc3c376/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
129+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7211aa01/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
128130
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-b92c9f50/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
129131
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-eeb31f66/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
130132
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},

‎eng/Version.Details.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<Sha>c01a538851a8ab1a1fbeb2e6243f391fff7587b4</Sha>
2323
<RepoName>aspnet-xdt</RepoName>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21459.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
26-
<Uri>https://github.com/mono/linker</Uri>
27-
<Sha>f321ba23da5fece884b6ff7a853fcccc07f59559</Sha>
25+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21504.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
26+
<Uri>https://github.com/dotnet/linker</Uri>
27+
<Sha>a3f4f2cad4247d5d69f69e2a890917e212487bc2</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
30+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
3131
<Uri>https://github.com/dotnet/runtime</Uri>
32-
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
32+
<Sha>7211aa01b34bb55ca67bdddd6e80ce23ee201bd2</Sha>
3333
<RepoName>runtime</RepoName>
3434
<RepoName>runtime-portable</RepoName>
3535
</Dependency>
@@ -63,9 +63,9 @@
6363
<Sha>d525b0e670f3b6cbd5c73a35f04730a9f658c852</Sha>
6464
<RepoName>nuget-client</RepoName>
6565
</Dependency>
66-
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.208-servicing.21473.53" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
66+
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.209-servicing.21524.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
6767
<Uri>https://github.com/dotnet/sdk</Uri>
68-
<Sha>25b3161b802eae78d7a306cf404da7af1762e222</Sha>
68+
<Sha>a0f0261602eda18ea122e8a135ffd50c7d43bedd</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.11-servicing.21473.29" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
86+
<Dependency Name="dotnet-dev-certs" Version="5.0.12-servicing.21524.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
8787
<Uri>https://github.com/dotnet/aspnetcore</Uri>
88-
<Sha>eeb31f66a2803f9166b68edf3e67a26c79e5d7f3</Sha>
88+
<Sha>0bc3c376f0cd14335e8b3afca69596acabeb1f80</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.208-servicing.21473.49">
99+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.209-servicing.21527.10">
100100
<Uri>https://github.com/dotnet/installer</Uri>
101-
<Sha>cd07fb054b734018bf72d3bbc44c8e7bafd6e920</Sha>
101+
<Sha>6ce8786067da5a0c7caaf607eb2060560fd3db06</Sha>
102102
<RepoName>installer</RepoName>
103103
</Dependency>
104104
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.20419.2">

‎eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<PropertyGroup>
55
<MajorVersion>5</MajorVersion>
66
<MinorVersion>0</MinorVersion>
7-
<RuntimePatchVersion>11</RuntimePatchVersion>
8-
<SdkPatchVersion>208</SdkPatchVersion>
7+
<RuntimePatchVersion>12</RuntimePatchVersion>
8+
<SdkPatchVersion>209</SdkPatchVersion>
99
<RuntimeProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</RuntimeProductVersion>
1010
<AspNetCoreProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</AspNetCoreProductVersion>
1111
<SdkProductVersion>$(MajorVersion).$(MinorVersion).$(SdkPatchVersion)</SdkProductVersion>
@@ -21,9 +21,9 @@
2121
</PropertyGroup>
2222
<!-- Production Dependencies -->
2323
<PropertyGroup>
24-
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.21307.1</PrivateSourceBuildReferencePackagesPackageVersion>
24+
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.21566.2</PrivateSourceBuildReferencePackagesPackageVersion>
2525
</PropertyGroup>
2626
<PropertyGroup>
27-
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.207-1375271-20210921.6</PrivateSourceBuiltArtifactsPackageVersion>
27+
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.208-1454404-20211104.5</PrivateSourceBuiltArtifactsPackageVersion>
2828
</PropertyGroup>
2929
</Project>

‎global.json

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ index e63ebf7aa7..b8508d981d 100644
2424
+++ b/global.json
2525
@@ -5,13 +5,10 @@
2626
"tools": {
27-
"dotnet": "5.0.207",
27+
"dotnet": "5.0.402",
2828
"runtimes": {
2929
- "dotnet/x64": [
3030
+ "dotnet": [
@@ -35,7 +35,7 @@ index e63ebf7aa7..b8508d981d 100644
3535
- "$(MicrosoftNETCoreAppInternalPackageVersion)"
3636
- ],
3737
"aspnetcore/x64": [
38-
"3.1.19"
38+
"3.1.20"
3939
]
4040
--
4141
2.30.2

‎smoke-testNuGet.Config

-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
<configuration>
33
<packageSources>
44
<clear />
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" />
11-
<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" />
125
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
136
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
147
<add key="source-built-packages" value="SOURCE_BUILT_PACKAGES" />

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

+10-9
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
<Dir>artifacts/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/</Dir>
55
<Dir>artifacts/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/</Dir>
66
<Dir>artifacts/src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/</Dir>
7-
<Dir>artifacts/src/dotnet-aspnetcore.eeb31f66a2803f9166b68edf3e67a26c79e5d7f3/</Dir>
7+
<Dir>artifacts/src/dotnet-aspnetcore.0bc3c376f0cd14335e8b3afca69596acabeb1f80/</Dir>
88
<Dir>artifacts/src/CliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/</Dir>
99
<Dir>artifacts/src/command-line-api.6ddde11ed45e3f4b9d80c97670f347dbfda15c3f/</Dir>
1010
<Dir>artifacts/src/cssparser.d6d86bcd8c162b1ae22ef00955ff748d028dd0ee/</Dir>
1111
<Dir>artifacts/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/</Dir>
1212
<Dir>artifacts/src/extensions.a0631e6115806353c03406b4fb1e0fb66b145d58/</Dir>
1313
<Dir>artifacts/src/fsharp.7ce7132f1459095e635194d09d6f73265352029a/</Dir>
1414
<Dir>artifacts/src/Humanizer.b30550eed103a6970d8465fe7c5c16300b70be81/</Dir>
15-
<Dir>artifacts/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/</Dir>
15+
<Dir>artifacts/src/dotnet-installer.6ce8786067da5a0c7caaf607eb2060560fd3db06/</Dir>
1616
<Dir>artifacts/src/known-good-tests./</Dir>
1717
<Dir>artifacts/src/known-good./</Dir>
18-
<Dir>artifacts/src/linker.f321ba23da5fece884b6ff7a853fcccc07f59559/</Dir>
18+
<Dir>artifacts/src/linker.a3f4f2cad4247d5d69f69e2a890917e212487bc2/</Dir>
1919
<Dir>artifacts/src/msbuild.5e4b48a27efce55a613664b58d353ab4c8d1f6c1/</Dir>
2020
<Dir>src/netcorecli-fsc/</Dir>
2121
<Dir>artifacts/src/Newtonsoft.Json.4ab34b0461fb595805d092a46a58f35f66c84d6a/</Dir>
@@ -24,9 +24,9 @@
2424
<Dir>src/package-source-build/</Dir>
2525
<Dir>artifacts/src/roslyn-analyzers.92e6dca2e4d1966c3b7b657dd158ced2e6a2ae71/</Dir>
2626
<Dir>artifacts/src/roslyn.f8111b17631aa5e2703dc11acd671c6ea22c3af1/</Dir>
27-
<Dir>artifacts/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/</Dir>
28-
<Dir>artifacts/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/</Dir>
29-
<Dir>artifacts/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/</Dir>
27+
<Dir>artifacts/src/dotnet-runtime.7211aa01b34bb55ca67bdddd6e80ce23ee201bd2/</Dir>
28+
<Dir>artifacts/src/dotnet-runtime.7211aa01b34bb55ca67bdddd6e80ce23ee201bd2/</Dir>
29+
<Dir>artifacts/src/dotnet-sdk.a0f0261602eda18ea122e8a135ffd50c7d43bedd/</Dir>
3030
<Dir>artifacts/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/</Dir>
3131
<Dir>artifacts/src/symreader.f8a3ba85aed339fb8d08ca26f3876b28c32d58ee/</Dir>
3232
<Dir>artifacts/src/templating.5a6c095df390fbb5c3f232ab0adedda53d4e2206/</Dir>
@@ -90,13 +90,13 @@
9090
<Usage Id="microsoft.dotnet.templateLocator" Version="5.0.100-rc.1.20421.19" />
9191
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.30" />
9292
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.0.1" />
93-
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.19" />
93+
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.20" />
9494
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.30" />
9595
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.3.0" Version="3.0.1" />
96-
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.19" />
96+
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.20" />
9797
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.30" />
9898
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0" Version="3.0.1" />
99-
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.19" />
99+
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.20" />
100100
<Usage Id="Microsoft.Extensions.DependencyModel" Version="2.1.0" IsDirectDependency="true" />
101101
<Usage Id="Microsoft.Extensions.DependencyModel" Version="3.1.6" IsDirectDependency="true" />
102102
<Usage Id="Microsoft.NET.Sdk.IL" Version="5.0.0-preview.8.20359.4" />
@@ -264,6 +264,7 @@
264264
<Usage Id="System.Diagnostics.Tracing" Version="4.1.0" />
265265
<Usage Id="System.Diagnostics.Tracing" Version="4.3.0" />
266266
<Usage Id="System.Drawing.Common" Version="4.7.0" />
267+
<Usage Id="System.Drawing.Common" Version="5.0.2" />
267268
<Usage Id="System.Dynamic.Runtime" Version="4.0.11" IsDirectDependency="true" />
268269
<Usage Id="System.Dynamic.Runtime" Version="4.3.0" />
269270
<Usage Id="System.Globalization" Version="4.0.11" IsDirectDependency="true" />

0 commit comments

Comments
 (0)