Skip to content

Commit

Permalink
Update to November 2021 5.0.209 release (#2616)
Browse files Browse the repository at this point in the history 
* 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 <dseefeld@microsoft.com>
Co-authored-by: Dan Seefeldt <DanSeefeldt@outlook.com>
  • Loading branch information
@crummel @dseefeld
3 people committed Nov 17, 2021
1 parent 5b393a8 commit c250e73
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .vsts.pipelines/jobs/ci-linux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
/p:FailOnPrebuiltBaselineError=$failOnBaselineError \
/p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix) \
$(tarballDownloadArgs) \
/p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw)
/p:AzDoPat=$(user.PAT)
du -h $(rootDirectory) | sort -h | tail -n 50
displayName: Build source-build
timeoutInMinutes: 180
Expand Down
2 changes: 2 additions & 0 deletions build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ if [ "${internalPackageFeedPat:-}" ]; then
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-c663adee/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-c663adee-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-c663adee-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-0bc3c376/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7211aa01/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-b92c9f50/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-eeb31f66/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
Expand Down
22 changes: 11 additions & 11 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
<Sha>c01a538851a8ab1a1fbeb2e6243f391fff7587b4</Sha>
<RepoName>aspnet-xdt</RepoName>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21459.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/mono/linker</Uri>
<Sha>f321ba23da5fece884b6ff7a853fcccc07f59559</Sha>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21504.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>a3f4f2cad4247d5d69f69e2a890917e212487bc2</Sha>
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
<Sha>7211aa01b34bb55ca67bdddd6e80ce23ee201bd2</Sha>
<RepoName>runtime</RepoName>
<RepoName>runtime-portable</RepoName>
</Dependency>
Expand Down Expand Up @@ -63,9 +63,9 @@
<Sha>d525b0e670f3b6cbd5c73a35f04730a9f658c852</Sha>
<RepoName>nuget-client</RepoName>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.208-servicing.21473.53" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.209-servicing.21524.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>25b3161b802eae78d7a306cf404da7af1762e222</Sha>
<Sha>a0f0261602eda18ea122e8a135ffd50c7d43bedd</Sha>
<RepoName>sdk</RepoName>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
Expand All @@ -83,9 +83,9 @@
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>d2bec3a64076f8463de4756913712badfce0a01d</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="5.0.11-servicing.21473.29" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="dotnet-dev-certs" Version="5.0.12-servicing.21524.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>eeb31f66a2803f9166b68edf3e67a26c79e5d7f3</Sha>
<Sha>0bc3c376f0cd14335e8b3afca69596acabeb1f80</Sha>
<RepoName>aspnetcore</RepoName>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.3.2-beta.21102.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
Expand All @@ -96,9 +96,9 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>99b911a57a02fc5d2eeef23e9ab8cbea4505678b</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.208-servicing.21473.49">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.209-servicing.21527.10">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>cd07fb054b734018bf72d3bbc44c8e7bafd6e920</Sha>
<Sha>6ce8786067da5a0c7caaf607eb2060560fd3db06</Sha>
<RepoName>installer</RepoName>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.20419.2">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<PropertyGroup>
<MajorVersion>5</MajorVersion>
<MinorVersion>0</MinorVersion>
<RuntimePatchVersion>11</RuntimePatchVersion>
<SdkPatchVersion>208</SdkPatchVersion>
<RuntimePatchVersion>12</RuntimePatchVersion>
<SdkPatchVersion>209</SdkPatchVersion>
<RuntimeProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</RuntimeProductVersion>
<AspNetCoreProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</AspNetCoreProductVersion>
<SdkProductVersion>$(MajorVersion).$(MinorVersion).$(SdkPatchVersion)</SdkProductVersion>
Expand All @@ -21,9 +21,9 @@
</PropertyGroup>
<!-- Production Dependencies -->
<PropertyGroup>
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.21307.1</PrivateSourceBuildReferencePackagesPackageVersion>
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.21566.2</PrivateSourceBuildReferencePackagesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.207-1375271-20210921.6</PrivateSourceBuiltArtifactsPackageVersion>
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.208-1454404-20211104.5</PrivateSourceBuiltArtifactsPackageVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion global.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "5.0.207"
"dotnet": "5.0.208"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
Expand Down
4 changes: 2 additions & 2 deletions patches/aspnetcore/0007-Support-global.json-on-arm64-as-well.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ index e63ebf7aa7..b8508d981d 100644
+++ b/global.json
@@ -5,13 +5,10 @@
"tools": {
"dotnet": "5.0.207",
"dotnet": "5.0.402",
"runtimes": {
- "dotnet/x64": [
+ "dotnet": [
Expand All @@ -35,7 +35,7 @@ index e63ebf7aa7..b8508d981d 100644
- "$(MicrosoftNETCoreAppInternalPackageVersion)"
- ],
"aspnetcore/x64": [
"3.1.19"
"3.1.20"
]
--
2.30.2
Expand Down
7 changes: 0 additions & 7 deletions smoke-testNuGet.Config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@
<configuration>
<packageSources>
<clear />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="source-built-packages" value="SOURCE_BUILT_PACKAGES" />
Expand Down
19 changes: 10 additions & 9 deletions tools-local/prebuilt-baseline-online.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
<Dir>artifacts/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/</Dir>
<Dir>artifacts/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/</Dir>
<Dir>artifacts/src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/</Dir>
<Dir>artifacts/src/dotnet-aspnetcore.eeb31f66a2803f9166b68edf3e67a26c79e5d7f3/</Dir>
<Dir>artifacts/src/dotnet-aspnetcore.0bc3c376f0cd14335e8b3afca69596acabeb1f80/</Dir>
<Dir>artifacts/src/CliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/</Dir>
<Dir>artifacts/src/command-line-api.6ddde11ed45e3f4b9d80c97670f347dbfda15c3f/</Dir>
<Dir>artifacts/src/cssparser.d6d86bcd8c162b1ae22ef00955ff748d028dd0ee/</Dir>
<Dir>artifacts/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/</Dir>
<Dir>artifacts/src/extensions.a0631e6115806353c03406b4fb1e0fb66b145d58/</Dir>
<Dir>artifacts/src/fsharp.7ce7132f1459095e635194d09d6f73265352029a/</Dir>
<Dir>artifacts/src/Humanizer.b30550eed103a6970d8465fe7c5c16300b70be81/</Dir>
<Dir>artifacts/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/</Dir>
<Dir>artifacts/src/dotnet-installer.6ce8786067da5a0c7caaf607eb2060560fd3db06/</Dir>
<Dir>artifacts/src/known-good-tests./</Dir>
<Dir>artifacts/src/known-good./</Dir>
<Dir>artifacts/src/linker.f321ba23da5fece884b6ff7a853fcccc07f59559/</Dir>
<Dir>artifacts/src/linker.a3f4f2cad4247d5d69f69e2a890917e212487bc2/</Dir>
<Dir>artifacts/src/msbuild.5e4b48a27efce55a613664b58d353ab4c8d1f6c1/</Dir>
<Dir>src/netcorecli-fsc/</Dir>
<Dir>artifacts/src/Newtonsoft.Json.4ab34b0461fb595805d092a46a58f35f66c84d6a/</Dir>
Expand All @@ -24,9 +24,9 @@
<Dir>src/package-source-build/</Dir>
<Dir>artifacts/src/roslyn-analyzers.92e6dca2e4d1966c3b7b657dd158ced2e6a2ae71/</Dir>
<Dir>artifacts/src/roslyn.f8111b17631aa5e2703dc11acd671c6ea22c3af1/</Dir>
<Dir>artifacts/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/</Dir>
<Dir>artifacts/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/</Dir>
<Dir>artifacts/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/</Dir>
<Dir>artifacts/src/dotnet-runtime.7211aa01b34bb55ca67bdddd6e80ce23ee201bd2/</Dir>
<Dir>artifacts/src/dotnet-runtime.7211aa01b34bb55ca67bdddd6e80ce23ee201bd2/</Dir>
<Dir>artifacts/src/dotnet-sdk.a0f0261602eda18ea122e8a135ffd50c7d43bedd/</Dir>
<Dir>artifacts/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/</Dir>
<Dir>artifacts/src/symreader.f8a3ba85aed339fb8d08ca26f3876b28c32d58ee/</Dir>
<Dir>artifacts/src/templating.5a6c095df390fbb5c3f232ab0adedda53d4e2206/</Dir>
Expand Down Expand Up @@ -90,13 +90,13 @@
<Usage Id="microsoft.dotnet.templateLocator" Version="5.0.100-rc.1.20421.19" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.30" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.0.1" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.19" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.20" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.30" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.3.0" Version="3.0.1" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.19" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.20" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.30" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0" Version="3.0.1" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.19" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.20" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="2.1.0" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="3.1.6" IsDirectDependency="true" />
<Usage Id="Microsoft.NET.Sdk.IL" Version="5.0.0-preview.8.20359.4" />
Expand Down Expand Up @@ -264,6 +264,7 @@
<Usage Id="System.Diagnostics.Tracing" Version="4.1.0" />
<Usage Id="System.Diagnostics.Tracing" Version="4.3.0" />
<Usage Id="System.Drawing.Common" Version="4.7.0" />
<Usage Id="System.Drawing.Common" Version="5.0.2" />
<Usage Id="System.Dynamic.Runtime" Version="4.0.11" IsDirectDependency="true" />
<Usage Id="System.Dynamic.Runtime" Version="4.3.0" />
<Usage Id="System.Globalization" Version="4.0.11" IsDirectDependency="true" />
Expand Down

0 comments on commit c250e73

Please sign in to comment.