From c704989c56e1069c0e2b00f29efca3446682fe44 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 28 Jan 2025 13:04:47 -0800 Subject: [PATCH 01/23] Add steps to install, set up, and remove diagnostic certs for DAC signing. --- eng/pipelines/templates/jobs/vmr-build.yml | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 9c570993ed5d..6fed05fb087e 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -205,6 +205,8 @@ jobs: ### Signing variables - ${{ if eq(parameters.sign, 'True') }}: + - name: _SignDiagnosticFilesArgs + value: '' - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: # The _SignType variable is used by microbuild installation - name: _SignType @@ -216,6 +218,11 @@ jobs: value: real - name: signArguments value: -sign /p:DotNetSignType=real /p:TeamName=$(_TeamName) + - name: _EnableDacSigning + ${{ if and(eq(parameters.isBuiltFromVmr, true), ne(parameters.buildSourceOnly, 'True')) }}: + value: true + ${{ else }}: + value: false - ${{ else }}: - name: signArguments value: '' @@ -361,15 +368,31 @@ jobs: inputs: versionSpec: 20.x + - ${{ if eq(variables['_EnableDacSigning'], 'true') }}: + - template: ${{ variables['Build.SourcesDirectory'] }}/src/runtime/eng/pipelines/coreclr/templates/install-diagnostic-certs.yml + parameters: + isOfficialBuild: true + certNames: + - 'dotnetesrp-diagnostics-aad-ssl-cert' + - 'dotnet-diagnostics-esrp-pki-onecert' + vaultName: 'clrdiag-esrp-id' + azureSubscription: 'diagnostics-esrp-kvcertuser' + - script: build.cmd $(baseArguments) $(targetArguments) $(signArguments) $(buildPassArguments) + $(_SignDiagnosicFilesArgs) ${{ parameters.extraProperties }} displayName: Build workingDirectory: ${{ variables.sourcesPath }} + - ${{ if eq(variables['_EnableDacSigning'], 'true') }}: + - template: ${{ variables['Build.SourcesDirectory'] }}/src/runtime/eng/pipelines/coreclr/templates/remove-diagnostic-certs.yml + parameters: + isOfficialBuild: true + - ${{ if eq(parameters.runTests, 'True') }}: - script: build.cmd $(baseArguments) From f90b6bb25d598ef935c2c8afb07499e72b63c862 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 28 Jan 2025 13:20:00 -0800 Subject: [PATCH 02/23] Forward down the ESRP tool path when we're doing real signing. --- src/SourceBuild/content/repo-projects/runtime.proj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index 5c9771da6f8f..6c86129a0263 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -32,6 +32,9 @@ $(BuildArgs) /p:UseSystemLibs=$(UseSystemLibs) + + $(BuildArgs) /p:DotNetEsrpToolPath=$(DotNetEsrpToolPath) + $(BuildArgs) /p:NetCoreAppToolCurrentVersion=10.0 From 9e3c8bc5be9db9081e72a1f3335d139268c59712 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 28 Jan 2025 13:47:38 -0800 Subject: [PATCH 03/23] Add a win-x86 join job to run the cross-os DAC signing. --- eng/pipelines/templates/stages/vmr-build.yml | 18 ++++++++++++++++++ .../content/repo-projects/dotnet.proj | 7 ++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 7e8cba1bd990..0d77fca64a04 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -857,6 +857,24 @@ stages: - Windows_x86 - Windows_arm64 + - template: ../jobs/vmr-build.yml + parameters: + buildName: Windows + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + pool: ${{ parameters.pool_Windows }} + targetOS: windows + targetArchitecture: x86 + runTests: false + buildPass: 2 + reuseBuildArtifactsFrom: + - AzureLinux_x64_Cross_x64 + - AzureLinux_x64_Cross_Alpine_x64 + - AzureLinux_x64_Cross_arm64 + - AzureLinux_x64_Cross_Alpine_arm64 + - AzureLinux_x64_Cross_arm + - AzureLinux_x64_Cross_Alpine_arm + ### FINAL JOIN ### - ${{ if and(parameters.isBuiltFromVmr, not(parameters.isSourceOnlyBuild), ne(variables['Build.Reason'], 'PullRequest')) }}: - stage: VMR_Final_Join diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj index 4280ef0ee0b9..147ea9de9e78 100644 --- a/src/SourceBuild/content/repo-projects/dotnet.proj +++ b/src/SourceBuild/content/repo-projects/dotnet.proj @@ -15,9 +15,14 @@ - + + + + + + From e661045b453a288a8efa1982612f2a5c9d5233a5 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 29 Jan 2025 11:32:19 -0800 Subject: [PATCH 04/23] Add comments around the install/remove step templates. --- eng/pipelines/templates/jobs/vmr-build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 6fed05fb087e..5b615b5b9a18 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -369,6 +369,7 @@ jobs: versionSpec: 20.x - ${{ if eq(variables['_EnableDacSigning'], 'true') }}: + # TODO: Once we turn off the dotnet/runtime official build, move these templates into the VMR's eng folder. - template: ${{ variables['Build.SourcesDirectory'] }}/src/runtime/eng/pipelines/coreclr/templates/install-diagnostic-certs.yml parameters: isOfficialBuild: true @@ -377,6 +378,7 @@ jobs: - 'dotnet-diagnostics-esrp-pki-onecert' vaultName: 'clrdiag-esrp-id' azureSubscription: 'diagnostics-esrp-kvcertuser' + scriptRoot: '$(Build.SourcesDirectory)/src/runtime' - script: build.cmd $(baseArguments) @@ -389,9 +391,11 @@ jobs: workingDirectory: ${{ variables.sourcesPath }} - ${{ if eq(variables['_EnableDacSigning'], 'true') }}: + # TODO: Once we turn off the dotnet/runtime official build, move these templates into the VMR's eng folder. - template: ${{ variables['Build.SourcesDirectory'] }}/src/runtime/eng/pipelines/coreclr/templates/remove-diagnostic-certs.yml parameters: isOfficialBuild: true + scriptRoot: '$(Build.SourcesDirectory)/src/runtime' - ${{ if eq(parameters.runTests, 'True') }}: - script: build.cmd From 0f5b16ea759637ae3729c58e034bc5412144b488 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 29 Jan 2025 11:37:13 -0800 Subject: [PATCH 05/23] Add comments about our BuildPhase2 jobs --- src/SourceBuild/content/repo-projects/dotnet.proj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj index 147ea9de9e78..06994988f388 100644 --- a/src/SourceBuild/content/repo-projects/dotnet.proj +++ b/src/SourceBuild/content/repo-projects/dotnet.proj @@ -16,11 +16,13 @@ + + From b515aa09ff71919bc6bc82001be67418dbd65d96 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 30 Jan 2025 10:59:46 -0800 Subject: [PATCH 06/23] Pass down IsOfficialBuild variable --- eng/pipelines/templates/jobs/vmr-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 5b615b5b9a18..b6ddf8f31dc0 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -372,7 +372,7 @@ jobs: # TODO: Once we turn off the dotnet/runtime official build, move these templates into the VMR's eng folder. - template: ${{ variables['Build.SourcesDirectory'] }}/src/runtime/eng/pipelines/coreclr/templates/install-diagnostic-certs.yml parameters: - isOfficialBuild: true + isOfficialBuild: ${{ variables.isOfficialBuild }} certNames: - 'dotnetesrp-diagnostics-aad-ssl-cert' - 'dotnet-diagnostics-esrp-pki-onecert' @@ -394,7 +394,7 @@ jobs: # TODO: Once we turn off the dotnet/runtime official build, move these templates into the VMR's eng folder. - template: ${{ variables['Build.SourcesDirectory'] }}/src/runtime/eng/pipelines/coreclr/templates/remove-diagnostic-certs.yml parameters: - isOfficialBuild: true + isOfficialBuild: ${{ variables.isOfficialBuild }} scriptRoot: '$(Build.SourcesDirectory)/src/runtime' - ${{ if eq(parameters.runTests, 'True') }}: From c555fff224d5f701b3d82fbb2b3fe3e016c4e157 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 5 Feb 2025 11:39:44 -0800 Subject: [PATCH 07/23] Add patch to enable building runtime projects in BuildPass=2 --- ...e-building-projects-during-BuildPass.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch diff --git a/src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch b/src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch new file mode 100644 index 000000000000..47e795f8aa27 --- /dev/null +++ b/src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch @@ -0,0 +1,22 @@ +From ce566bbc998ae3140a21e360b3e09a3f4ff5084b Mon Sep 17 00:00:00 2001 +From: Jeremy Koritzinsky +Date: Wed, 5 Feb 2025 11:35:24 -0800 +Subject: [PATCH] Enable building projects during BuildPass=2 in dotnet/runtime + +Backport: https://github.com/dotnet/runtime/pull/112201 +--- + eng/Build.props | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/eng/Build.props b/eng/Build.props +index b2d72fb52aaea7..01705fc98d4f17 100644 +--- a/eng/Build.props ++++ b/eng/Build.props +@@ -5,5 +5,7 @@ + + + ++ ++ + + From 6b06843a93b0640fc23044653cbab7b1f51d1683 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 5 Feb 2025 11:40:03 -0800 Subject: [PATCH 08/23] Update eng/pipelines/templates/stages/vmr-build.yml Co-authored-by: Viktor Hofer --- eng/pipelines/templates/stages/vmr-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index aac37d65a854..30cc54cb7b8c 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -866,7 +866,6 @@ stages: pool: ${{ parameters.pool_Windows }} targetOS: windows targetArchitecture: x86 - runTests: false buildPass: 2 reuseBuildArtifactsFrom: - AzureLinux_x64_Cross_x64 From 6838590c51d63f68dee30485fce7c10606c47d39 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 5 Feb 2025 15:03:55 -0800 Subject: [PATCH 09/23] Update patch --- ...1-Enable-building-projects-during-BuildPass.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch b/src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch index 47e795f8aa27..4b5645a021f6 100644 --- a/src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch +++ b/src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch @@ -20,3 +20,15 @@ index b2d72fb52aaea7..01705fc98d4f17 100644 + +diff --git a/eng/Build.props b/eng/Build.props +index 01705fc98d4..45d7d76c82a 100644 +--- a/eng/Build.props ++++ b/eng/Build.props +@@ -6,6 +6,6 @@ + + + +- ++ + + From dc37e486fc9ebc8664d237e3ccf4de8f9519bc8c Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 6 Feb 2025 10:43:47 -0800 Subject: [PATCH 10/23] Update patch --- ...-Enable-building-projects-during-BuildPass.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch b/src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch index 4b5645a021f6..755e1fa2398f 100644 --- a/src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch +++ b/src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch @@ -32,3 +32,16 @@ index 01705fc98d4..45d7d76c82a 100644 + +diff --git a/eng/Subsets.props b/eng/Subsets.props +index efb52377533..1a32d113896 100644 +--- a/eng/Subsets.props ++++ b/eng/Subsets.props +@@ -69,7 +69,7 @@ + mono+packs + + +- crossdacpack ++ crossdacpack + + + From 48bb56167ea8034e6b2c4b2f57aac9dcdf02be91 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 6 Feb 2025 10:44:15 -0800 Subject: [PATCH 11/23] Rename patch file --- ...patch => 0002-Enable-building-projects-during-BuildPass.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/SourceBuild/patches/runtime/{0001-Enable-building-projects-during-BuildPass.patch => 0002-Enable-building-projects-during-BuildPass.patch} (100%) diff --git a/src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch b/src/SourceBuild/patches/runtime/0002-Enable-building-projects-during-BuildPass.patch similarity index 100% rename from src/SourceBuild/patches/runtime/0001-Enable-building-projects-during-BuildPass.patch rename to src/SourceBuild/patches/runtime/0002-Enable-building-projects-during-BuildPass.patch From 161770a80f388b181421d98bf9aaa310290bcc7d Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 6 Feb 2025 13:58:58 -0800 Subject: [PATCH 12/23] Allow a repository to reference packages produced by itself in earlier build passes. --- eng/pipelines/templates/jobs/vmr-build.yml | 2 ++ .../content/repo-projects/Directory.Build.targets | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index da1dc5b93a1e..21bd63d84204 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -233,6 +233,8 @@ jobs: - ${{ else }}: - name: signArguments value: '' + - name: _SignDiagnosticFilesArgs + value: '' ### Build Pass - ${{ if ne(parameters.buildPass, '') }}: diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 68d0d163e1a3..43944359761e 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -215,6 +215,16 @@ SourcePath="%(RepositoryReferenceInfo.NonShippingPackagesPath)" Condition="Exists('%(RepositoryReferenceInfo.NonShippingPackagesPath)')" /> + + + + Date: Thu, 6 Feb 2025 14:03:26 -0800 Subject: [PATCH 13/23] Use RepositoryReferenceInfo instead for this case. --- .../repo-projects/Directory.Build.props | 1 + .../repo-projects/Directory.Build.targets | 19 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 7e9dab487c46..5859110e7fe7 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -52,6 +52,7 @@ source-build-reference-package-cache source-built- + previous-build-pass- $([MSBuild]::ValueOrDefault('$(ARCADE_BOOTSTRAP_VERSION)', '$(ArcadeSdkVersion)')) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 43944359761e..be21afc998fd 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -117,6 +117,15 @@ + + + $(PreviousBuildPassSourceNamePrefix)$(RepositoryName) + $(PreviousBuildPassSourceNamePrefix)transport-$(RepositoryName) + $(ArtifactsShippingPackagesDir)/$(RepositoryName)/ + $(ArtifactsNonShippingPackagesDir)/$(RepositoryName)/ + + + @@ -215,16 +224,6 @@ SourcePath="%(RepositoryReferenceInfo.NonShippingPackagesPath)" Condition="Exists('%(RepositoryReferenceInfo.NonShippingPackagesPath)')" /> - - - - Date: Fri, 7 Feb 2025 12:49:31 -0800 Subject: [PATCH 14/23] Update task to understand "previous build pass" sources --- .../UpdateNuGetConfigPackageSourcesMappings.cs | 4 ++++ src/SourceBuild/content/repo-projects/Directory.Build.targets | 1 + 2 files changed, 5 insertions(+) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs index 62c89d61077a..cc04f0771391 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs @@ -50,6 +50,9 @@ public class UpdateNuGetConfigPackageSourcesMappings : Task [Required] public string SourceBuiltSourceNamePrefix { get; set; } + [Required] + public string PreviousBuildPassSourceNamePrefix { get; set; } + public string SbrpCacheSourceName { get; set; } public string ReferencePackagesSourceName { get; set; } @@ -255,6 +258,7 @@ private XElement GetPackageMappingsElementForSource(string packageSource) { bool isCurrentSourceBuiltSource = packageSource.StartsWith(SourceBuiltSourceNamePrefix) || + packageSource.StartsWith(PreviousBuildPassSourceNamePrefix) || packageSource.Equals(SbrpCacheSourceName) || packageSource.Equals(ReferencePackagesSourceName); diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index be21afc998fd..1ded130d42f8 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -245,6 +245,7 @@ PreviouslySourceBuiltSourceName="$(PreviouslySourceBuiltNuGetSourceName)" PrebuiltSourceName="$(PrebuiltNuGetSourceName)" SourceBuiltSourceNamePrefix="$(SourceBuiltSourceNamePrefix)" + PreviousBuildPassSourceNamePrefix="$(PreviousBuildPassSourceNamePrefix)" CustomSources="$(NetSdkSupportingFeedName)" /> From 760f202531770d78f907325185823eaf1f01a9df Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 7 Feb 2025 14:55:51 -0800 Subject: [PATCH 15/23] Update tests --- .../Microsoft.DotNet.Tests/PackageSourceMappingsTests.cs | 3 ++- .../expected/sb-mappings-offline.config | 6 +++--- .../expected/sb-mappings-online.config | 6 +++--- .../expected/sb-nomappings-offline.config | 6 +++--- .../expected/sb-nomappings-online.config | 6 +++--- .../PackageSourceMappingsTests/expected/ub-mappings.config | 6 +++--- .../expected/ub-nomappings.config | 6 +++--- .../original/sb-mappings-offline.config | 4 ++-- .../original/sb-mappings-online.config | 4 ++-- .../original/sb-nomappings-offline.config | 4 ++-- .../original/sb-nomappings-online.config | 4 ++-- .../PackageSourceMappingsTests/original/ub-mappings.config | 4 ++-- .../original/ub-nomappings.config | 2 +- 13 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/PackageSourceMappingsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/PackageSourceMappingsTests.cs index d6c39b535c8c..ee8d91a3db34 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/PackageSourceMappingsTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/PackageSourceMappingsTests.cs @@ -20,7 +20,7 @@ public class PackageSourceMappingsTests private const string NetSdkSupportingFeedName = "net-sdk-supporting-feed"; private const string ArcadeSourceName = "source-built-arcade"; - private const string RuntimeSourceName = "source-built-runtime"; + private const string RuntimeSourceName = "previous-build-pass--runtime"; private const string PrebuiltSourceName = "prebuilt"; private const string PreviouslySourceBuiltSourceName = "previously-source-built"; private const string ReferencePackagesSourceName = "reference-packages"; @@ -89,6 +89,7 @@ private static void RunTest(string nugetConfigFilename, bool useOnlineFeeds, str SbrpCacheSourceName = "source-build-reference-package-cache", SbrpRepoSrcPath = TestSetup.SourceBuildReferencePackagesRepo, SourceBuiltSourceNamePrefix = "source-built-", + PreviousBuildPassSourceNamePrefix = "previous-build-pass-", NuGetConfigFile = modifiedNugetConfig, BuildWithOnlineFeeds = useOnlineFeeds, SourceBuildSources = sources, diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-offline.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-offline.config index eff02a7bd07b..64cb9a3423c7 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-offline.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-offline.config @@ -2,7 +2,7 @@ - + @@ -25,7 +25,7 @@ --> - + @@ -48,4 +48,4 @@ - \ No newline at end of file + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-online.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-online.config index ca37e3a21d22..2ffbe13cf594 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-online.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-online.config @@ -2,7 +2,7 @@ - + @@ -38,7 +38,7 @@ --> - + @@ -282,4 +282,4 @@ - \ No newline at end of file + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-offline.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-offline.config index 57658e3f9c94..b2df699382a0 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-offline.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-offline.config @@ -3,7 +3,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-online.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-online.config index 2a741f4ceb63..4cd6abd3a72c 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-online.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-online.config @@ -3,7 +3,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -73,4 +73,4 @@ - \ No newline at end of file + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-mappings.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-mappings.config index 8b218d55536d..9df423078611 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-mappings.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-mappings.config @@ -3,7 +3,7 @@ - + @@ -11,7 +11,7 @@ - + @@ -74,4 +74,4 @@ - \ No newline at end of file + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-nomappings.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-nomappings.config index 3c6dddadb947..9cde8e6c4f8c 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-nomappings.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-nomappings.config @@ -4,7 +4,7 @@ - + @@ -15,7 +15,7 @@ - + @@ -52,4 +52,4 @@ - \ No newline at end of file + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-mappings-offline.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-mappings-offline.config index 13914fc9ddd8..0ea66cca112c 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-mappings-offline.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-mappings-offline.config @@ -2,7 +2,7 @@ - + @@ -133,4 +133,4 @@ - \ No newline at end of file + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-mappings-online.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-mappings-online.config index b1446820ee45..2f4c93bb9abd 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-mappings-online.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-mappings-online.config @@ -2,7 +2,7 @@ - + @@ -146,4 +146,4 @@ - \ No newline at end of file + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-nomappings-offline.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-nomappings-offline.config index f84ad454ccfb..e5377c52dbf9 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-nomappings-offline.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-nomappings-offline.config @@ -3,7 +3,7 @@ - + @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-nomappings-online.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-nomappings-online.config index ac466ed14ed3..e86e4ba81a04 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-nomappings-online.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/sb-nomappings-online.config @@ -3,7 +3,7 @@ - + @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/ub-mappings.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/ub-mappings.config index 64d46fc17667..48a896c71f64 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/ub-mappings.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/ub-mappings.config @@ -3,7 +3,7 @@ - + @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/ub-nomappings.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/ub-nomappings.config index f39b94f4b00c..b93ba6ce789e 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/ub-nomappings.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/original/ub-nomappings.config @@ -4,7 +4,7 @@ - + From b3c142d7b9dff9871fb979dd0572cb3cacf2eb8f Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 7 Feb 2025 15:09:47 -0800 Subject: [PATCH 16/23] Remove patch --- ...e-building-projects-during-BuildPass.patch | 47 ------------------- 1 file changed, 47 deletions(-) delete mode 100644 src/SourceBuild/patches/runtime/0002-Enable-building-projects-during-BuildPass.patch diff --git a/src/SourceBuild/patches/runtime/0002-Enable-building-projects-during-BuildPass.patch b/src/SourceBuild/patches/runtime/0002-Enable-building-projects-during-BuildPass.patch deleted file mode 100644 index 755e1fa2398f..000000000000 --- a/src/SourceBuild/patches/runtime/0002-Enable-building-projects-during-BuildPass.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ce566bbc998ae3140a21e360b3e09a3f4ff5084b Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Wed, 5 Feb 2025 11:35:24 -0800 -Subject: [PATCH] Enable building projects during BuildPass=2 in dotnet/runtime - -Backport: https://github.com/dotnet/runtime/pull/112201 ---- - eng/Build.props | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/eng/Build.props b/eng/Build.props -index b2d72fb52aaea7..01705fc98d4f17 100644 ---- a/eng/Build.props -+++ b/eng/Build.props -@@ -5,5 +5,7 @@ - - - -+ -+ - - -diff --git a/eng/Build.props b/eng/Build.props -index 01705fc98d4..45d7d76c82a 100644 ---- a/eng/Build.props -+++ b/eng/Build.props -@@ -6,6 +6,6 @@ - - - -- -+ - - -diff --git a/eng/Subsets.props b/eng/Subsets.props -index efb52377533..1a32d113896 100644 ---- a/eng/Subsets.props -+++ b/eng/Subsets.props -@@ -69,7 +69,7 @@ - mono+packs - - -- crossdacpack -+ crossdacpack - - - From 5d84d876343a0e4e478f923cb7bd8777a4845c7e Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 7 Feb 2025 16:33:14 -0800 Subject: [PATCH 17/23] Fix double-dash --- .../test/Microsoft.DotNet.Tests/PackageSourceMappingsTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/PackageSourceMappingsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/PackageSourceMappingsTests.cs index ee8d91a3db34..452063d9ee4d 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/PackageSourceMappingsTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/PackageSourceMappingsTests.cs @@ -20,7 +20,7 @@ public class PackageSourceMappingsTests private const string NetSdkSupportingFeedName = "net-sdk-supporting-feed"; private const string ArcadeSourceName = "source-built-arcade"; - private const string RuntimeSourceName = "previous-build-pass--runtime"; + private const string RuntimeSourceName = "previous-build-pass-runtime"; private const string PrebuiltSourceName = "prebuilt"; private const string PreviouslySourceBuiltSourceName = "previously-source-built"; private const string ReferencePackagesSourceName = "reference-packages"; From f41a134b36e34325cb4f24df99dcc6445bbddf15 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 10 Feb 2025 11:38:09 -0800 Subject: [PATCH 18/23] Add the previously-source-built prefix in one more place --- .../UpdateNuGetConfigPackageSourcesMappings.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs index cc04f0771391..7d526832d0df 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs @@ -332,6 +332,10 @@ private void DiscoverPackagesFromAllSourceBuildSources(XElement pkgSourcesElemen { AddToDictionary(currentPackages, id, version); } + else if (packageSource.StartsWith(PreviousBuildPassSourceNamePrefix)) + { + AddToDictionary(currentPackages, id, version); + } else if (packageSource.Equals(ReferencePackagesSourceName)) { AddToDictionary(referencePackages, id, version); From c60dbc3c35ae87dde798087646a02b92c0d383d8 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 10 Feb 2025 13:47:25 -0800 Subject: [PATCH 19/23] Remove trailing newlines --- .../expected/sb-mappings-offline.config | 2 +- .../expected/sb-mappings-online.config | 2 +- .../expected/sb-nomappings-offline.config | 2 +- .../expected/sb-nomappings-online.config | 2 +- .../PackageSourceMappingsTests/expected/ub-mappings.config | 2 +- .../PackageSourceMappingsTests/expected/ub-nomappings.config | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-offline.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-offline.config index 64cb9a3423c7..524e9574dca0 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-offline.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-offline.config @@ -48,4 +48,4 @@ - + \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-online.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-online.config index 2ffbe13cf594..1b58b83ff9ac 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-online.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-mappings-online.config @@ -282,4 +282,4 @@ - + \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-offline.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-offline.config index b2df699382a0..469b54cf902e 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-offline.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-offline.config @@ -34,4 +34,4 @@ - + \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-online.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-online.config index 4cd6abd3a72c..5acd77490a93 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-online.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/sb-nomappings-online.config @@ -73,4 +73,4 @@ - + \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-mappings.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-mappings.config index 9df423078611..be07e46d91c4 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-mappings.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-mappings.config @@ -74,4 +74,4 @@ - + \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-nomappings.config b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-nomappings.config index 9cde8e6c4f8c..1c7970432b67 100755 --- a/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-nomappings.config +++ b/src/SourceBuild/content/test/Microsoft.DotNet.Tests/assets/PackageSourceMappingsTests/expected/ub-nomappings.config @@ -52,4 +52,4 @@ - + \ No newline at end of file From c93ea9fb903c229bc1dacf2c95d85405549363ee Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 11 Feb 2025 11:52:54 -0800 Subject: [PATCH 20/23] Disable building the host tools in later build passes. --- src/SourceBuild/content/repo-projects/runtime.proj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index a5883dbcc24f..9871bad57951 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -40,6 +40,11 @@ $(BuildArgs) /p:UsingToolMicrosoftNetCompilers=false + + + $(BuildArgs) /p:BuildHostTools=false + + From 1224193785b0f095d2fe3721cd31e824db2e0930 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 11 Feb 2025 14:43:59 -0800 Subject: [PATCH 21/23] Be more explicit where we're disabling this component --- .../content/repo-projects/runtime.proj | 5 ---- .../runtime/0003-dont-build-host-tools.patch | 24 +++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 src/SourceBuild/patches/runtime/0003-dont-build-host-tools.patch diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index 9871bad57951..a5883dbcc24f 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -40,11 +40,6 @@ $(BuildArgs) /p:UsingToolMicrosoftNetCompilers=false - - - $(BuildArgs) /p:BuildHostTools=false - - diff --git a/src/SourceBuild/patches/runtime/0003-dont-build-host-tools.patch b/src/SourceBuild/patches/runtime/0003-dont-build-host-tools.patch new file mode 100644 index 000000000000..af355e329341 --- /dev/null +++ b/src/SourceBuild/patches/runtime/0003-dont-build-host-tools.patch @@ -0,0 +1,24 @@ +From 282fb06e2d46d0a6b80a4ee737e402063f3409c3 Mon Sep 17 00:00:00 2001 +From: Jeremy Koritzinsky +Date: Tue, 11 Feb 2025 14:40:59 -0800 +Subject: [PATCH] Don't build host tools when building the cross-os DACs + +Backport: https://github.com/dotnet/runtime/pull/112454 +--- + .../Microsoft.CrossOsDiag.Private.CoreCLR.proj | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/coreclr/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj b/src/coreclr/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj +index 4fbe217f42068c..2687500c79b917 100644 +--- a/src/coreclr/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj ++++ b/src/coreclr/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj +@@ -32,7 +32,8 @@ + <_CrossOSDacProject Include="@(SupportedRid->'$(RepoRoot)Build.proj')" + AdditionalProperties="TargetOS=%(TargetOS); + TargetArchitecture=%(TargetArchitecture); +- Subset=linuxdac+alpinedac" /> ++ Subset=linuxdac+alpinedac ++ BuildHostTools=false" /> + <_RuntimePrereqsProject Include="$(CoreClrProjectRoot)runtime-prereqs.proj" /> + + From 7b78f03639a2c813e99ad205fb2233782fa031d8 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 11 Feb 2025 23:07:25 -0800 Subject: [PATCH 22/23] Update 0003-dont-build-host-tools.patch --- .../patches/runtime/0003-dont-build-host-tools.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/patches/runtime/0003-dont-build-host-tools.patch b/src/SourceBuild/patches/runtime/0003-dont-build-host-tools.patch index af355e329341..507d06f5b771 100644 --- a/src/SourceBuild/patches/runtime/0003-dont-build-host-tools.patch +++ b/src/SourceBuild/patches/runtime/0003-dont-build-host-tools.patch @@ -17,7 +17,7 @@ index 4fbe217f42068c..2687500c79b917 100644 AdditionalProperties="TargetOS=%(TargetOS); TargetArchitecture=%(TargetArchitecture); - Subset=linuxdac+alpinedac" /> -+ Subset=linuxdac+alpinedac ++ Subset=linuxdac+alpinedac; + BuildHostTools=false" /> <_RuntimePrereqsProject Include="$(CoreClrProjectRoot)runtime-prereqs.proj" /> From ca303cd55b7bbe869e26eb57c8173c7d946c8aba Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 12 Feb 2025 09:20:00 -0800 Subject: [PATCH 23/23] Update runtime.proj --- src/SourceBuild/content/repo-projects/runtime.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index a5883dbcc24f..9abf002995ca 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -30,7 +30,7 @@ $(BuildArgs) /p:UseSystemLibs=$(UseSystemLibs) - $(BuildArgs) /p:DotNetEsrpToolPath=$(DotNetEsrpToolPath) + $(BuildArgs) /p:DotNetEsrpToolPath=$(DotNetEsrpToolPath) $(BuildArgs) /p:NetCoreAppToolCurrentVersion=10.0