From f0c33c3a30b6059c913c5d2e422a34fe1bc0b0a2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 24 Nov 2021 04:55:04 +0000 Subject: [PATCH 1/7] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21569.2 to 4.0.1-1.21573.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a16964fe..a1f3b67e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36621631f5982fb9d23644aec68222015ba337a2 + ea1efa85360eea3721aee35c120dcc49afd126be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36621631f5982fb9d23644aec68222015ba337a2 + ea1efa85360eea3721aee35c120dcc49afd126be @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 52021b4b3a9dcfd7b955102adb2901524a62a371 + 1fa6e45dd631b37e7b28a78907240aed8a300d50 diff --git a/eng/Versions.props b/eng/Versions.props index 7c7746fff..bda12b8cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.101-servicing.21569.16 - 6.0.101-servicing.21569.16 + 6.0.101-servicing.21573.15 + 6.0.101-servicing.21573.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 14bc4c5db706488b4d70a150b35ba219a1e26bba Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 6 Dec 2021 15:47:24 +0000 Subject: [PATCH 2/7] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1f3b67e9..156a593fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ea1efa85360eea3721aee35c120dcc49afd126be + 9b8345e5f88fd844fca7911a91210a22d1a1e607 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ea1efa85360eea3721aee35c120dcc49afd126be + 9b8345e5f88fd844fca7911a91210a22d1a1e607 diff --git a/eng/Versions.props b/eng/Versions.props index bda12b8cc..285631e2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.101-servicing.21573.15 - 6.0.101-servicing.21573.15 + 6.0.101-servicing.21580.8 + 6.0.101-servicing.21580.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 769ba58be1521f1757238be15658815a85626f9f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 7 Dec 2021 00:13:42 +0000 Subject: [PATCH 3/7] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index a6823f5e3..00b4554de 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -14,11 +15,13 @@ + + @@ -41,11 +44,14 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 156a593fb..b161d26fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b8345e5f88fd844fca7911a91210a22d1a1e607 + c19a1f82e36033c571b80fb26ca6f92cc943ff1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b8345e5f88fd844fca7911a91210a22d1a1e607 + c19a1f82e36033c571b80fb26ca6f92cc943ff1e diff --git a/eng/Versions.props b/eng/Versions.props index 285631e2f..6c6eed84a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.101-servicing.21580.8 - 6.0.101-servicing.21580.8 + 6.0.101-servicing.21606.7 + 6.0.101-servicing.21606.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c8a4f55c85b139e285ff2c1d65ecd114b89086f4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 11 Dec 2021 01:53:10 +0000 Subject: [PATCH 4/7] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 00b4554de..dbf54bd99 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -15,12 +16,14 @@ + + @@ -45,13 +48,16 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d94ae3c1..0316bd233 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c19a1f82e36033c571b80fb26ca6f92cc943ff1e + 5d42ff6f60a15edadf4bb9f5bdf13edf32c16969 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c19a1f82e36033c571b80fb26ca6f92cc943ff1e + 5d42ff6f60a15edadf4bb9f5bdf13edf32c16969 diff --git a/eng/Versions.props b/eng/Versions.props index 2b904e4aa..d8dd303d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.101-servicing.21606.7 - 6.0.101-servicing.21606.7 + 6.0.102-servicing.21610.17 + 6.0.102-servicing.21610.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e88edad0ea42ff06427faea5eb952b0501a9d918 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 14 Dec 2021 08:43:37 +0000 Subject: [PATCH 5/7] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7fbbc838b..95f33b2c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d42ff6f60a15edadf4bb9f5bdf13edf32c16969 + 18bedcd2b19a6078d1567d032a43f4a6aadd7dfd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d42ff6f60a15edadf4bb9f5bdf13edf32c16969 + 18bedcd2b19a6078d1567d032a43f4a6aadd7dfd diff --git a/eng/Versions.props b/eng/Versions.props index d8dd303d3..03e052e0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.102-servicing.21610.17 - 6.0.102-servicing.21610.17 + 6.0.102-servicing.21613.11 + 6.0.102-servicing.21613.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a6432496b0a94e546e0abfe0201a76919e1c04b1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 15 Dec 2021 02:42:14 +0000 Subject: [PATCH 6/7] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85855f19c..436d2b8d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18bedcd2b19a6078d1567d032a43f4a6aadd7dfd + 8f77a9a5e9f5fe877519bee69cf415eea51f6b3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18bedcd2b19a6078d1567d032a43f4a6aadd7dfd + 8f77a9a5e9f5fe877519bee69cf415eea51f6b3a diff --git a/eng/Versions.props b/eng/Versions.props index 74bb3bc24..e6289a4e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.102-servicing.21613.11 - 6.0.102-servicing.21613.11 + 6.0.102-servicing.21614.19 + 6.0.102-servicing.21614.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 02d5242ed7ca7c3747fc89196cf67aeff260c6ac Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Jan 2022 18:34:20 +0000 Subject: [PATCH 7/7] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Resolve source-build patch conflicts - Remove source-build runtime patch that was backported - Merge branch 'internal/release/6.0.1xx' of https://dnceng.visualstudio.com/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679 - Merge branch 'darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679' of https://dev.azure.com/dnceng/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-9 - Download bits from dotnetbuilds/internal - Merge branch 'darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679' of https://dev.azure.com/dnceng/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-9 - Merge remote-tracking branch 'dnceng/internal/release/6.0.1xx' into darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679 --- .vsts-ci.yml | 5 +- NuGet.config | 12 ++ eng/Version.Details.xml | 116 +++++++++--------- eng/Versions.props | 42 +++---- eng/common/templates/steps/source-build.yml | 4 +- .../job/source-build-create-tarball.yml | 4 +- ...uild-App.Ref-and-the-targeting-packs.patch | 4 +- ...ld-all-packages-when-in-source-build.patch | 34 ----- ...-Microsoft.NET.Build.Tasks-for-netfx.patch | 66 ---------- src/redist/targets/GenerateLayout.targets | 2 +- 10 files changed, 100 insertions(+), 189 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0004-release-6.0-Build-all-packages-when-in-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d91efec67..b20ffc1eb 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -35,11 +35,10 @@ variables: value: '' - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - group: DotNet-MSRC-Storage - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs - value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet - /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) stages: diff --git a/NuGet.config b/NuGet.config index 00da7febe..d896a1219 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,8 +41,16 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a4f3744d..cb9bb6070 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - - https://github.com/dotnet/windowsdesktop - 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef15b555537a90da229ce6474658ae1a9916a932 + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - - https://github.com/dotnet/windowsdesktop - 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef15b555537a90da229ce6474658ae1a9916a932 + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 3a25a7f1cc446b60678ed25c9d829420d6321eba - - https://github.com/dotnet/aspnetcore - ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 - - - https://github.com/dotnet/aspnetcore - ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 - - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7d976438b0fc17f435804e801d5d68d193ec33 + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7d976438b0fc17f435804e801d5d68d193ec33 + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7d976438b0fc17f435804e801d5d68d193ec33 + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4e7d976438b0fc17f435804e801d5d68d193ec33 + 1dcf7acfacf0fe154adcc23270cb0da11ff44ace https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - - https://github.com/dotnet/templating - 7d941613047c847c87dc8d243a54fd1a45a47de7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + 0a0300fa1ff7d5c8be96d11383e99b7b5b0e4fb8 - - https://github.com/dotnet/templating - 7d941613047c847c87dc8d243a54fd1a45a47de7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + 0a0300fa1ff7d5c8be96d11383e99b7b5b0e4fb8 https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f77a9a5e9f5fe877519bee69cf415eea51f6b3a + 4c0649a412b8865957af7610cc9f035484f4997a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f77a9a5e9f5fe877519bee69cf415eea51f6b3a + 4c0649a412b8865957af7610cc9f035484f4997a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 846205b4af05c7a200e1d203536fdc39994b9bd6 + 5ad241b9633924db40503de19cb502bb0aca7718 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0350d04790959e8ebdd3ceab0d34a40f811f019d + fb76229895cae74c1adc62c2411a0730a2f3759b https://github.com/dotnet/fsharp @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 1fa6e45dd631b37e7b28a78907240aed8a300d50 + 9942dc957472b9bf179b11742bc161ef6c79691e diff --git a/eng/Versions.props b/eng/Versions.props index 68885a2d3..477207593 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.1-servicing.21567.5 + 6.0.2-servicing.22064.7 - 6.0.1-servicing.21567.7 + 6.0.2-servicing.22064.8 - 6.0.100 + 6.0.102 @@ -44,20 +44,20 @@ - 6.0.1 - 6.0.0 - 6.0.0-rtm.21526.8 - 6.0.1-servicing.21567.14 - 6.0.1-servicing.21567.14 - 6.0.1-servicing.21567.14 + 6.0.2 + 6.0.2 + 6.0.2-servicing.22064.12 + 6.0.2-servicing.22064.12 + 6.0.2-servicing.22064.12 + 6.0.2-servicing.22064.12 0.2.0 - 6.0.102-servicing.21614.19 - 6.0.102-servicing.21614.19 + 6.0.102-servicing.22069.2 + 6.0.102-servicing.22069.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.1-servicing.21567.5 - 6.0.1-servicing.21567.5 - 6.0.1 - 6.0.1 - 6.0.1 - 6.0.1 + 6.0.2-servicing.22064.6 + 6.0.2-servicing.22064.6 + 6.0.2 + 6.0.2 + 6.0.2 + 6.0.2 2.1.0 - 6.0.1-servicing.21568.2 - 6.0.0-rtm.21523.1 - 6.0.1 - 6.0.0 + 6.0.2-servicing.22064.6 + 6.0.2-servicing.22064.6 + 6.0.2 + 6.0.2 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f..abb1b2bcd 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -43,8 +43,8 @@ steps: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 93e1f1d5e..8e55a40b5 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -42,8 +42,8 @@ jobs: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi ./build.sh \ diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch b/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch index 9cda48cd7..ef507ed95 100644 --- a/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch +++ b/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch @@ -19,9 +19,9 @@ index e100d883e9..d71b308905 100644 aspnetcore-runtime aspnetcore-targeting-pack - -- +- - false +- Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(AspNetCorePatchVersion)' != '2' ">false - true + true diff --git a/src/SourceBuild/tarball/patches/runtime/0004-release-6.0-Build-all-packages-when-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0004-release-6.0-Build-all-packages-when-in-source-build.patch deleted file mode 100644 index 43c68dede..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0004-release-6.0-Build-all-packages-when-in-source-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Santiago Fernandez Madero -Date: Tue, 11 Jan 2022 13:55:22 -0800 -Subject: [PATCH] [release/6.0] Build all packages when in source-build - -Originating PR: https://github.com/dotnet/runtime/pull/63653 ---- - eng/packaging.targets | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/eng/packaging.targets b/eng/packaging.targets -index 6bcf86dc9f2..ee8e95167d9 100644 ---- a/eng/packaging.targets -+++ b/eng/packaging.targets -@@ -34,6 +34,10 @@ - '$(IsRIDSpecificProject)' != 'true' and - '$(PreReleaseVersionLabel)' == 'servicing' and - '$(GitHubRepositoryName)' != 'runtimelab'">false -+ -+ true - - $(XmlDocFileRoot)1033\$(AssemblyName).xml - true -@@ -279,7 +283,7 @@ - - - - - diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch b/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch deleted file mode 100644 index b128d21f3..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 3540e85a194dda1e5448e0aab3212c8aeb5a1aff Mon Sep 17 00:00:00 2001 -From: Eric Erhardt -Date: Fri, 22 Oct 2021 20:48:25 +0000 -Subject: [PATCH] Build Microsoft.NET.Build.Tasks for netfx - -Required for omnisharp to work with a source-built .NET SDK. - -Patch removal issue: https://github.com/dotnet/sdk/issues/22281 ---- - .../Microsoft.DotNet.Compatibility.csproj | 1 - - .../Microsoft.DotNet.PackageValidation.csproj | 1 - - .../Microsoft.NET.Build.Extensions.Tasks.csproj | 1 - - .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 - - 4 files changed, 4 deletions(-) - -diff --git a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj -index 92624be845..f9f8e46329 100644 ---- a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj -+++ b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj -@@ -2,7 +2,6 @@ - - - net6.0;net472 -- net6.0 - true - true - Open -diff --git a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -index 7a8b648652..4241f4577e 100644 ---- a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -+++ b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -@@ -2,7 +2,6 @@ - - - net6.0;net472 -- net6.0 - Open - - -diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj -index 13ada82225..280fbdc83e 100644 ---- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj -+++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj -@@ -16,7 +16,6 @@ - Library - Microsoft.NET.Build.Tasks - $(SdkTargetFramework);net472 -- $(SdkTargetFramework) - - - -diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -index 604ef43bf2..bce39c67d4 100644 ---- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -@@ -13,7 +13,6 @@ - The MSBuild targets and properties for building .NET Core projects. - Library - $(SdkTargetFramework);net472 -- $(SdkTargetFramework) - annotations - - --- -2.31.1 - diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 3917efa60..f13a3ec5f 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -32,7 +32,7 @@ $(RedistLayoutPath)sdk\$(Version)\ true - https://dotnetclimsrc.blob.core.windows.net/dotnet/ + https://dotnetbuilds.blob.core.windows.net/internal/ https://dotnetcli.blob.core.windows.net/dotnet/