diff --git a/.vsts.pipelines/jobs/ci-linux.yml b/.vsts.pipelines/jobs/ci-linux.yml index c627c9e095..7d879ba355 100644 --- a/.vsts.pipelines/jobs/ci-linux.yml +++ b/.vsts.pipelines/jobs/ci-linux.yml @@ -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 diff --git a/build.sh b/build.sh index 32a135c941..161f631417 100755 --- a/build.sh +++ b/build.sh @@ -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'"}, diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f4b73138b..3bacb7717d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,14 +22,14 @@ c01a538851a8ab1a1fbeb2e6243f391fff7587b4 aspnet-xdt - - https://github.com/mono/linker - f321ba23da5fece884b6ff7a853fcccc07f59559 + + https://github.com/dotnet/linker + a3f4f2cad4247d5d69f69e2a890917e212487bc2 linker - + https://github.com/dotnet/runtime - f431858f8b1f1510723ace6343786c9194dbd7fc + 7211aa01b34bb55ca67bdddd6e80ce23ee201bd2 runtime runtime-portable @@ -63,9 +63,9 @@ d525b0e670f3b6cbd5c73a35f04730a9f658c852 nuget-client - + https://github.com/dotnet/sdk - 25b3161b802eae78d7a306cf404da7af1762e222 + a0f0261602eda18ea122e8a135ffd50c7d43bedd sdk @@ -83,9 +83,9 @@ https://github.com/dotnet/xliff-tasks d2bec3a64076f8463de4756913712badfce0a01d - + https://github.com/dotnet/aspnetcore - eeb31f66a2803f9166b68edf3e67a26c79e5d7f3 + 0bc3c376f0cd14335e8b3afca69596acabeb1f80 aspnetcore @@ -96,9 +96,9 @@ https://github.com/microsoft/vstest 99b911a57a02fc5d2eeef23e9ab8cbea4505678b - + https://github.com/dotnet/installer - cd07fb054b734018bf72d3bbc44c8e7bafd6e920 + 6ce8786067da5a0c7caaf607eb2060560fd3db06 installer diff --git a/eng/Versions.props b/eng/Versions.props index cc86e591d6..bae812f74c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,8 +4,8 @@ 5 0 - 11 - 208 + 12 + 209 $(MajorVersion).$(MinorVersion).$(RuntimePatchVersion) $(MajorVersion).$(MinorVersion).$(RuntimePatchVersion) $(MajorVersion).$(MinorVersion).$(SdkPatchVersion) @@ -21,9 +21,9 @@ - 1.0.0-beta.21307.1 + 1.0.0-beta.21566.2 - 0.1.0-5.0.207-1375271-20210921.6 + 0.1.0-5.0.208-1454404-20211104.5 diff --git a/global.json b/global.json index 49fd1447a1..e766840b8f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.207" + "dotnet": "5.0.208" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/patches/aspnetcore/0007-Support-global.json-on-arm64-as-well.patch b/patches/aspnetcore/0007-Support-global.json-on-arm64-as-well.patch index 939ff62a52..06f33c9931 100644 --- a/patches/aspnetcore/0007-Support-global.json-on-arm64-as-well.patch +++ b/patches/aspnetcore/0007-Support-global.json-on-arm64-as-well.patch @@ -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": [ @@ -35,7 +35,7 @@ index e63ebf7aa7..b8508d981d 100644 - "$(MicrosoftNETCoreAppInternalPackageVersion)" - ], "aspnetcore/x64": [ - "3.1.19" + "3.1.20" ] -- 2.30.2 diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config index 408390b256..2a59ca589a 100644 --- a/smoke-testNuGet.Config +++ b/smoke-testNuGet.Config @@ -2,13 +2,6 @@ - - - - - - - diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index 114200be8b..621dd9b50d 100644 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -4,7 +4,7 @@ artifacts/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ artifacts/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/ artifacts/src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/ - artifacts/src/dotnet-aspnetcore.eeb31f66a2803f9166b68edf3e67a26c79e5d7f3/ + artifacts/src/dotnet-aspnetcore.0bc3c376f0cd14335e8b3afca69596acabeb1f80/ artifacts/src/CliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ artifacts/src/command-line-api.6ddde11ed45e3f4b9d80c97670f347dbfda15c3f/ artifacts/src/cssparser.d6d86bcd8c162b1ae22ef00955ff748d028dd0ee/ @@ -12,10 +12,10 @@ artifacts/src/extensions.a0631e6115806353c03406b4fb1e0fb66b145d58/ artifacts/src/fsharp.7ce7132f1459095e635194d09d6f73265352029a/ artifacts/src/Humanizer.b30550eed103a6970d8465fe7c5c16300b70be81/ - artifacts/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/ + artifacts/src/dotnet-installer.6ce8786067da5a0c7caaf607eb2060560fd3db06/ artifacts/src/known-good-tests./ artifacts/src/known-good./ - artifacts/src/linker.f321ba23da5fece884b6ff7a853fcccc07f59559/ + artifacts/src/linker.a3f4f2cad4247d5d69f69e2a890917e212487bc2/ artifacts/src/msbuild.5e4b48a27efce55a613664b58d353ab4c8d1f6c1/ src/netcorecli-fsc/ artifacts/src/Newtonsoft.Json.4ab34b0461fb595805d092a46a58f35f66c84d6a/ @@ -24,9 +24,9 @@ src/package-source-build/ artifacts/src/roslyn-analyzers.92e6dca2e4d1966c3b7b657dd158ced2e6a2ae71/ artifacts/src/roslyn.f8111b17631aa5e2703dc11acd671c6ea22c3af1/ - artifacts/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/ - artifacts/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/ - artifacts/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/ + artifacts/src/dotnet-runtime.7211aa01b34bb55ca67bdddd6e80ce23ee201bd2/ + artifacts/src/dotnet-runtime.7211aa01b34bb55ca67bdddd6e80ce23ee201bd2/ + artifacts/src/dotnet-sdk.a0f0261602eda18ea122e8a135ffd50c7d43bedd/ artifacts/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/ artifacts/src/symreader.f8a3ba85aed339fb8d08ca26f3876b28c32d58ee/ artifacts/src/templating.5a6c095df390fbb5c3f232ab0adedda53d4e2206/ @@ -90,13 +90,13 @@ - + - + - + @@ -264,6 +264,7 @@ +