From 892222071f73062f969f4f6ed1df8f759b9327b7 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Wed, 3 Nov 2021 15:12:59 +0100 Subject: [PATCH 01/14] GetRuntimeInformation.targets: determine PortableProductMonikerRid based on HostOSName and Architecture. --- src/redist/targets/GetRuntimeInformation.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 5133c3a38..01f704c7d 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -28,6 +28,8 @@ '$(Rid)' == 'linux-musl-x64' ">$(Rid) $(OSName)-$(Architecture) + $(HostOSName)-$(Architecture) + dotnet-sdk-internal$(PgoTerm) dotnet-sdk$(PgoTerm) From e856a47d99d772bef1f496b142ff7ae05056831d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 10 Nov 2021 10:11:02 -0600 Subject: [PATCH 02/14] Revert "Enable public tarball CI" (#12629) This reverts commit ec426f0634687e3ebb1aba197bd795c1bf65277e. --- eng/source-build-tarball-build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml index 036c285f7..2c7a9ae59 100644 --- a/eng/source-build-tarball-build.yml +++ b/eng/source-build-tarball-build.yml @@ -3,11 +3,8 @@ pr: none resources: pipelines: - pipeline: installer-build-resource - ${{ if eq(variables['System.TeamProject'], 'public') }}: - source: installer - ${{ if ne(variables['System.TeamProject'], 'public') }}: - source: dotnet-installer-official-ci - trigger: true # Run pipeline when any run of installer CI completes + source: dotnet-installer-official-ci + trigger: true # Run pipeline when any run of dotnet-installer-official-ci completes stages: - stage: build From 5a3e064b8859bb162375e77c23d66d10379a454c Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 10 Nov 2021 10:48:36 -0800 Subject: [PATCH 03/14] [release/6.0.1xx] update Asp.Net templates (#12597) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0cde85cd3..b0eda23fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.11 + 5.0.12 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.20 + 3.1.21 3.2.1 4.8.0-rc2.19462.10 From 3a49af80627ea59ef7974ece94f38690366d0bd0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 19:49:57 +0000 Subject: [PATCH 04/14] Update dependencies from https://github.com/dotnet/arcade build 20211108.5 (#12630) [release/6.0.1xx] Update dependencies from dotnet/arcade --- NuGet.config | 22 ------------------- eng/Version.Details.xml | 12 +++++----- eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- .../templates/job/source-index-stage1.yml | 2 +- eng/common/templates/jobs/jobs.yml | 4 ++-- global.json | 4 ++-- 8 files changed, 14 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index de42f9ad5..b995dca0c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,38 +7,16 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dfe53685..99237e507 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + 8ebefe290f57089d60100465111e78f223ee91db - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + 8ebefe290f57089d60100465111e78f223ee91db - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + 8ebefe290f57089d60100465111e78f223ee91db https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b0eda23fd..d29adc000 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21519.3 + 6.0.0-beta.21558.5 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 69eb67849..4882dd931 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -62,7 +62,7 @@ jobs: pool: # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019. ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}: - name: Hosted VS2017 + vmImage: windows-2019 ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: vmImage: windows-2019 steps: diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index e8bc77d2e..2b55a567f 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 1cc0c29e4..d8990549e 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 condition: '' dependsOn: '' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index a1f8fce96..90015a7e5 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -83,7 +83,7 @@ jobs: - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} @@ -96,4 +96,4 @@ jobs: dependsOn: - Asset_Registry_Publish pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 diff --git a/global.json b/global.json index 4f5a20ba8..4e1426906 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21519.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21519.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21558.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21558.5" } } From 2747a16e30c5c3a70762ef9f1a977a880137035a Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 10 Nov 2021 14:45:09 -0800 Subject: [PATCH 05/14] [release/6.0.2xx] update Asp.Net templates (#12598) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8b6a478c8..7e8888edf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.11 + 5.0.12 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.20 + 3.1.21 3.2.1 4.8.0-rc2.19462.10 From c0af1d694a5dc477531aa4b808459d7764c8d7e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 23:05:56 +0000 Subject: [PATCH 06/14] Update dependencies from https://github.com/dotnet/arcade build 20211110.2 (#12633) [release/6.0.1xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99237e507..5711c22d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 8ebefe290f57089d60100465111e78f223ee91db + ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/arcade - 8ebefe290f57089d60100465111e78f223ee91db + ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/arcade - 8ebefe290f57089d60100465111e78f223ee91db + ee9b7f19853685805c612103282c8d9486c7db86 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d29adc000..7c1e724fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21558.5 + 6.0.0-beta.21560.2 diff --git a/global.json b/global.json index 4e1426906..b785d4545 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-rc.2.21426.20", + "dotnet": "6.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21558.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21558.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21560.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21560.2" } } From 7667cec39ead40fc45b31349d794d99d70acac75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 23:16:51 +0000 Subject: [PATCH 07/14] [release/6.0.2xx] Update dependencies from dotnet/arcade (#12631) [release/6.0.2xx] Update dependencies from dotnet/arcade --- NuGet.config | 22 ------------------- eng/Version.Details.xml | 12 +++++----- eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- .../templates/job/source-index-stage1.yml | 2 +- eng/common/templates/jobs/jobs.yml | 4 ++-- global.json | 6 ++--- 8 files changed, 15 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index de42f9ad5..b995dca0c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,38 +7,16 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dfe53685..5711c22d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/arcade - 85f3aa16d8797b5020f1fda11df1a958feb5f8df + ee9b7f19853685805c612103282c8d9486c7db86 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7e8888edf..18ed2689e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21519.3 + 6.0.0-beta.21560.2 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 69eb67849..4882dd931 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -62,7 +62,7 @@ jobs: pool: # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019. ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}: - name: Hosted VS2017 + vmImage: windows-2019 ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: vmImage: windows-2019 steps: diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index e8bc77d2e..2b55a567f 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 1cc0c29e4..d8990549e 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 condition: '' dependsOn: '' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index a1f8fce96..90015a7e5 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -83,7 +83,7 @@ jobs: - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} @@ -96,4 +96,4 @@ jobs: dependsOn: - Asset_Registry_Publish pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 diff --git a/global.json b/global.json index 4f5a20ba8..b785d4545 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-rc.2.21426.20", + "dotnet": "6.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21519.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21519.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21560.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21560.2" } } From 28afaeb89a04eb9c82588a3fc4ee743a0f92a0d2 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 10 Nov 2021 18:14:49 -0600 Subject: [PATCH 08/14] Flow environment variable into run-build (#12637) --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 4dfcc58ed..594a355fa 100755 --- a/build.sh +++ b/build.sh @@ -55,5 +55,5 @@ if [ ! -z "$BUILD_IN_DOCKER" ]; then else # Run under sudo so we can set ulimit # See https://github.com/dotnet/core-eng/issues/14808 - sudo $DIR/run-build.sh $args + sudo -E $DIR/run-build.sh $args fi From 84217d6e27612436f1f64bcede354549afd4d495 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 11 Nov 2021 08:22:24 -0600 Subject: [PATCH 09/14] Specify depth when updating submodules (#12588) --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index cb1a5adfe..75fd838e8 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -170,7 +170,7 @@ Condition="$(IsRootRepo) != 'true'" /> From 9afbd7fef892bd3b4a18c7a140e914f52b68c5cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Nov 2021 17:46:25 +0000 Subject: [PATCH 10/14] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211111.1 (#12638) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-alpha.1.21521.1 -> To Version 6.0.0-alpha.1.21561.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5711c22d8..53cb1f886 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ee9b7f19853685805c612103282c8d9486c7db86 - + https://github.com/dotnet/source-build-reference-packages - fc184172bf8144f7c91a7bc0226b7d90c5821576 + 897a9709eb370a92bce2391d77b03d06149cbb6c From 0527f050188743e0a5d3da602391208323b7a291 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 11 Nov 2021 13:16:59 -0600 Subject: [PATCH 11/14] dotnet/runtime: Enable source-link in source-build for '.version' file (#12527) --- ...nk-in-source-build-for-.version-file.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch b/src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch new file mode 100644 index 000000000..bec3c2a3f --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Tue, 26 Oct 2021 15:41:57 -0500 +Subject: [PATCH] Enable source-link in source-build for '.version' file + +See https://github.com/dotnet/source-build/issues/2569 +--- + eng/SourceBuild.props | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index bba40f534e5..b70f668a15b 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -23,14 +23,6 @@ + minimal + + +- +- +- +- +- +- +- +- + + From 8c09aecb906fb500a0df08af1972fbf952c174cb Mon Sep 17 00:00:00 2001 From: Alex Perovich Date: Mon, 15 Nov 2021 08:37:15 -0800 Subject: [PATCH 12/14] Port #12374 to release/6.0.2xx (#12635) Add downloading of runtime assets from dotnetbuilds --- .vsts-ci.yml | 2 ++ .../tarball/content/repos/installer.proj | 7 ++--- src/redist/targets/GenerateLayout.targets | 31 +++++++++++-------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5d0247741..d801654bb 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -36,9 +36,11 @@ variables: - ${{ 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) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) stages: - stage: build diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj index a3a2f394c..712d7cd14 100644 --- a/src/SourceBuild/tarball/content/repos/installer.proj +++ b/src/SourceBuild/tarball/content/repos/installer.proj @@ -31,11 +31,8 @@ $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 $(BuildCommandArgs) /p:CoreSetupRid=$(TargetRid) - - $(BuildCommandArgs) /p:CoreSetupBlobRootUrl=file:%2F%2F$(SourceBuiltAssetsDir) - - - $(BuildCommandArgs) /p:DotnetToolsetBlobRootUrl=file:%2F%2F$(SourceBuiltAssetsDir) + + $(BuildCommandArgs) /p:PublicBaseURL=file:%2F%2F$(SourceBuiltAssetsDir) $(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index f2cc4113b..3917efa60 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -34,9 +34,7 @@ true https://dotnetclimsrc.blob.core.windows.net/dotnet/ - https://dotnetcli.blob.core.windows.net/dotnet/ - https://dotnetcli.blob.core.windows.net/dotnet/ - https://dotnetcli.blob.core.windows.net/dotnet/ + https://dotnetcli.blob.core.windows.net/dotnet/ $(HostRid) $(OSName)-$(Architecture) @@ -104,11 +102,11 @@ - $(CoreSetupBlobRootUrl)Runtime/ - $(CoreSetupBlobRootUrl) - $(CoreSetupBlobRootUrl)aspnetcore/Runtime/ - $(CoreSetupBlobRootUrl) - $(CoreSetupBlobRootUrl)WindowsDesktop/ + $(PublicBaseURL)Runtime/ + $(PublicBaseURL) + $(PublicBaseURL)aspnetcore/Runtime/ + $(PublicBaseURL) + $(PublicBaseURL)WindowsDesktop/ $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimePackageVersion) $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) @@ -245,8 +243,8 @@ - $(DotnetToolsetBlobRootUrl)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion) - $(DotnetToolsetBlobRootUrl) + $(PublicBaseURL)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion) + $(PublicBaseURL) dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip sdk/$(Version) @@ -344,9 +342,7 @@ Replaces the public base url with the private one. --> %(BaseUrl) - $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(CoreSetupBlobRootUrl)', '$(InternalBaseURL)')) - $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(DotnetExtensionsBlobRootUrl)', '$(InternalBaseURL)')) - $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(DotnetToolsetBlobRootUrl)', '$(InternalBaseURL)')) + $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(PublicBaseURL)', '$(InternalBaseURL)')) - 6.0.0-beta.21560.2 + 6.0.0-beta.21562.1 diff --git a/global.json b/global.json index b785d4545..e6d26905e 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21560.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21560.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21562.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21562.1" } } From bbe021ff2b53fecb0ebb17b589889c512f8c240b Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 16 Nov 2021 18:19:09 +0000 Subject: [PATCH 14/14] Resolve source-build patch conflicts --- ...nk-in-source-build-for-.version-file.patch | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch b/src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch deleted file mode 100644 index bec3c2a3f..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0003-Enable-source-link-in-source-build-for-.version-file.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Tue, 26 Oct 2021 15:41:57 -0500 -Subject: [PATCH] Enable source-link in source-build for '.version' file - -See https://github.com/dotnet/source-build/issues/2569 ---- - eng/SourceBuild.props | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index bba40f534e5..b70f668a15b 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -23,14 +23,6 @@ - minimal - - -- -- -- -- -- -- -- -- - -