From 9df6b5b98a0d052c2ae7d8ba14d482560ebbc7ad Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Thu, 22 Apr 2021 13:39:48 -0500 Subject: [PATCH 1/8] Update from BarBuildID 86632 --- NuGet.config | 15 +++++++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- 2 files changed, 49 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index f67b051da0..d01274d3a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,9 +2,24 @@ + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84cdc3168c..6dc840ddab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,9 +27,9 @@ 1127689f262d52ea8ff68ef03d706fa62b3b40a1 linker - + https://github.com/dotnet/coreclr - 0897c45fb56b1ddd9fa69cb5329fac1ce700b8eb + 803ce08ee96925f9d08021c9c6b96af8f27d16c4 coreclr coreclr-portable @@ -37,26 +37,26 @@ https://github.com/dotnet/standard a5b5f2e1e369972c8ff1e2183979fab6099f52ef - - https://github.com/dotnet/corefx - 6e37696a5420057596d61119614574db9037c652 + + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + 585ae475d8aebdecf310d7509585003721509c5a corefx corefx-portable - - https://github.com/dotnet/core-setup - 826c2c2f8f0506c4fdb57ddc71b1dc4af9cb781c + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + dc339bd0fb2ec082e3afdc0a5ade2066a86d1681 core-setup core-setup-portable - - https://github.com/dotnet/aspnetcore-tooling - aec2954c62f9ca32403ef572f8e64b417c6b67e8 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling + b4f2d7437db4b5f36375cfcf1de316e3e42fcee6 aspnetcore-tooling - + https://github.com/dotnet/templating - f8760d033ff55c8e24944bf18f8e007bea4deb50 + 7116c61c686c40fa0cb33f6f96a3631f8764846e templating @@ -72,14 +72,14 @@ 6f8eb3a2e1db6b458451b9cfd2a4f5557769b041 nuget-client - - https://github.com/dotnet/extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 194782ed2ccc8f5103e741c8421a60c3618c8fed aspnet-extensions - - https://github.com/dotnet/sdk - 5565e6b21b7a11560fb88e73dce4c097fac6260d + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + e78e47c7ee386dfe0c1c30d8db2bb15d517cb825 sdk @@ -96,37 +96,37 @@ https://github.com/dotnet/xliff-tasks 173ee3bd61c9549557eefa3cfb718bdef157cb87 - - https://github.com/dotnet/aspnetcore - 440dadc05b2bed38e6a726c2492db90e77d43c62 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 8ca3954ca335343ce6dd1d14d8d1c6c3369710b7 aspnetcore - - https://github.com/dotnet/cli - b637fb8974fdc0ddc880dfd16cf681c7eb7febb6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-cli + 6a07d0e5d0f8a660113e5d6007d5b107ef8a6b8b cli https://github.com/dotnet/fsharp dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e - - https://github.com/dotnet/websdk - f55130b54ae93962c362692267601941f693291b + + https://dev.azure.com/dnceng/internal/_git/dotnet-websdk + 165b36ca8a73efee5660465ec1281d24fddf67e5 websdk https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - - https://github.com/dotnet/toolset - 3c0bb6e7e1a5526407ab9ba284bed18f9b841251 + + https://dev.azure.com/dnceng/internal/_git/dotnet-toolset + af8eb8e1d2dc75ee3152b57aea2d49ec6a7d3f48 toolset - - https://github.com/dotnet/installer - 07ddd844dccc1dadbec69b4c9628ec7689b5468d + + https://dev.azure.com/dnceng/internal/_git/dotnet-installer + 612a6634c59d6c946d232929055665bc64b18f49 core-sdk From ca2cc71d3ea1860a7b592833b33ed11b804271e1 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Thu, 22 Apr 2021 13:49:18 -0500 Subject: [PATCH 2/8] Update to N-1 versions --- eng/Versions.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index df0d8b8e17..43c74ae7f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,6 +8,6 @@ 1.0.0-beta.20374.1 - 0.1.0-3.1.113.3 + 0.1.0-3.1.114 diff --git a/global.json b/global.json index 9e299fe8f8..45d752bc56 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.113" + "dotnet": "3.1.114" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From e92e2f9962ebee2e2fa08bd9bd3320f9485fff46 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Thu, 22 Apr 2021 14:09:53 -0500 Subject: [PATCH 3/8] Update internal feed list in build.sh --- build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index cfe08d5610..aeeb528d24 100755 --- a/build.sh +++ b/build.sh @@ -118,10 +118,11 @@ if [ "${internalPackageFeedPat:-}" ]; then # TODO: Read these from nuget.config # The internal transport isn't added by Darc, though, so it will still need special-casing. export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [ - {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-440dadc0/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, - {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-aec2954c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, - {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-826c2c2f/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, - {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-1c79cde9/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-8ca3954c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-b4f2d743/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-dc339bd0/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-194782ed/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-templating-7116c61c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f8760d03/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, {"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/3-1-13-2-18-21/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"} From db5feff84ef814b5aa542c419378c1c7124ab75f Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 22 Apr 2021 19:47:13 +0000 Subject: [PATCH 4/8] Reconcile patches --- patches/aspnetcore/0006-Fix-version-number.patch | 10 +++++----- ...move-Yarn-dependency-not-used-in-source-build.patch | 4 ++-- .../0011-Support-global.json-on-arm64-as-well.patch | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/aspnetcore/0006-Fix-version-number.patch b/patches/aspnetcore/0006-Fix-version-number.patch index 7f1487b120..fe08210a50 100644 --- a/patches/aspnetcore/0006-Fix-version-number.patch +++ b/patches/aspnetcore/0006-Fix-version-number.patch @@ -7,17 +7,17 @@ This file is actually a very long minified JS file with a version number at the end. The file is treated as binary, making this patch less clear, but it's easy to update/reapply it with a text editor. --- - .../Web.JS/dist/Release/blazor.server.js | Bin 242561 -> 242562 bytes + .../Web.JS/dist/Release/blazor.server.js | Bin 242561 -> 242561 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js -index 1c602124e2c7a54b062e3b1d52c32580a70927bd..8a9b6408fae1502713f054bfe01cc281c130417d 100644 +index 1c602124e2c7a54b062e3b1d52c32580a70927bd..af706d7529f40614d5ec3a568060b0459ad4ca23 100644 GIT binary patch -delta 23 -ecmZpC&e!yuuc3vpg=q_O^=5VxrP^3cYc2qA5(onT +delta 22 +dcmZpC&e!;yuc3vpg=q_O^=39xrP^3cYXE2a2lxO0 delta 22 -dcmZpA&e!;yuc3vpg=q_O^=39BrP^3cYXE2e2lfB} +dcmZpC&e!;yuc3vpg=q_O^=39BrP^3cYXE2I2lW5| -- 2.18.0 diff --git a/patches/aspnetcore/0007-Remove-Yarn-dependency-not-used-in-source-build.patch b/patches/aspnetcore/0007-Remove-Yarn-dependency-not-used-in-source-build.patch index 044e4a8dae..b1e6ecba82 100644 --- a/patches/aspnetcore/0007-Remove-Yarn-dependency-not-used-in-source-build.patch +++ b/patches/aspnetcore/0007-Remove-Yarn-dependency-not-used-in-source-build.patch @@ -35,8 +35,8 @@ index 97783de603..de628eca3c 100644 }, "msbuild-sdks": { - "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21158.9", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21158.9" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21161.1", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21161.1" } 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 index 36eec6b93a..19c5906526 100644 diff --git a/patches/aspnetcore/0011-Support-global.json-on-arm64-as-well.patch b/patches/aspnetcore/0011-Support-global.json-on-arm64-as-well.patch index be56479eec..9d78d4d03b 100644 --- a/patches/aspnetcore/0011-Support-global.json-on-arm64-as-well.patch +++ b/patches/aspnetcore/0011-Support-global.json-on-arm64-as-well.patch @@ -24,7 +24,7 @@ index de628eca3c..3fb6244e52 100644 +++ b/global.json @@ -5,10 +5,7 @@ "tools": { - "dotnet": "3.1.113", + "dotnet": "3.1.114", "runtimes": { - "dotnet/x64": [ - "$(MicrosoftNETCoreAppInternalPackageVersion)" From daad24ea7bca2aa788f3915011a2dcdef62e120a Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 22 Apr 2021 21:01:43 +0000 Subject: [PATCH 5/8] Update online baseline --- tools-local/prebuilt-baseline-online.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index bdfff11115..ddbbad87ca 100644 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -48,7 +48,7 @@ - + @@ -363,4 +363,4 @@ - + \ No newline at end of file From a17d754795b9924f7b9aca03055f6514d7a3bc02 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 22 Apr 2021 22:24:55 +0000 Subject: [PATCH 6/8] Update internal feeds in smoke-testNuget.Config --- smoke-testNuGet.Config | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config index 71e2e3596f..33eaa405fd 100644 --- a/smoke-testNuGet.Config +++ b/smoke-testNuGet.Config @@ -3,9 +3,24 @@ + + + + + + + + + + + + + + + From c838e2db98ddc38125af9b996202d4d03d18ad43 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 11 May 2021 15:16:23 +0000 Subject: [PATCH 7/8] Convert internal URIs to public --- eng/Version.Details.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dc840ddab..2e92107731 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,19 +38,19 @@ a5b5f2e1e369972c8ff1e2183979fab6099f52ef - https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + https://github.com/dotnet/corefx 585ae475d8aebdecf310d7509585003721509c5a corefx corefx-portable - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + https://github.com/dotnet/core-setup dc339bd0fb2ec082e3afdc0a5ade2066a86d1681 core-setup core-setup-portable - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling + https://github.com/dotnet/aspnetcore-tooling b4f2d7437db4b5f36375cfcf1de316e3e42fcee6 aspnetcore-tooling @@ -73,12 +73,12 @@ nuget-client - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + https://github.com/dotnet/extensions 194782ed2ccc8f5103e741c8421a60c3618c8fed aspnet-extensions - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + https://github.com/dotnet/sdk e78e47c7ee386dfe0c1c30d8db2bb15d517cb825 sdk @@ -97,12 +97,12 @@ 173ee3bd61c9549557eefa3cfb718bdef157cb87 - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + https://github.com/dotnet/aspnetcore 8ca3954ca335343ce6dd1d14d8d1c6c3369710b7 aspnetcore - https://dev.azure.com/dnceng/internal/_git/dotnet-cli + https://github.com/dotnet/cli 6a07d0e5d0f8a660113e5d6007d5b107ef8a6b8b cli @@ -111,7 +111,7 @@ dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e - https://dev.azure.com/dnceng/internal/_git/dotnet-websdk + https://github.com/dotnet/websdk 165b36ca8a73efee5660465ec1281d24fddf67e5 websdk @@ -120,12 +120,12 @@ 55e7e45431c9c05656c999b902686e7402664573 - https://dev.azure.com/dnceng/internal/_git/dotnet-toolset + https://github.com/dotnet/toolset af8eb8e1d2dc75ee3152b57aea2d49ec6a7d3f48 toolset - https://dev.azure.com/dnceng/internal/_git/dotnet-installer + https://github.com/dotnet/installer 612a6634c59d6c946d232929055665bc64b18f49 core-sdk From 4b54771592f6f6f92056ed85815dba9c2e132917 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 11 May 2021 15:29:07 +0000 Subject: [PATCH 8/8] Remove internal feeds from nuget.config --- NuGet.config | 17 ----------------- smoke-testNuGet.Config | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index d01274d3a7..e6625a0473 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,24 +2,7 @@ - - - - - - - - - - - - - - - - - diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config index 33eaa405fd..89a765e6c9 100644 --- a/smoke-testNuGet.Config +++ b/smoke-testNuGet.Config @@ -3,24 +3,7 @@ - - - - - - - - - - - - - - - - -