From c8400dba28a396f3b18a4653e3e5b5a94f719130 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 9 Feb 2024 09:24:13 +0000 Subject: [PATCH 01/19] Put artifacts in well-known locations 1. Shipping and non-shipping artifacts to Arcade default locations: -> artifacts/packages//Shipping -> artifacts/packages//NonShipping Add the local feed for the addition package directory to NuGet.config Remove the non-shipping packages list generation now that artifacts are grouped. 2. Genereated the intermediate PackageVersions* files in -> artifacts/obj/PackageVersions 3. Extract the repo symbol archives intermediates to -> artifacts/obj/Symbols/ 4. Sequence targets better and apply correct DependsOnTargets 5. Small clean-up Fixes https://github.com/dotnet/source-build/issues/4104 Fixes https://github.com/dotnet/source-build/issues/3696 --- eng/pipelines/templates/jobs/vmr-build.yml | 3 +- .../templates/steps/vmr-pull-updates.yml | 15 -- src/SourceBuild/content/Directory.Build.props | 12 +- .../content/Directory.Build.targets | 2 +- src/SourceBuild/content/build.proj | 15 -- .../content/eng/build.sourcebuild.targets | 93 ++++------ .../CheckForPoison.cs | 27 --- .../repo-projects/Directory.Build.props | 9 +- .../repo-projects/Directory.Build.targets | 172 ++++++++++-------- .../content/repo-projects/installer.proj | 2 +- .../repo-projects/package-source-build.proj | 34 ++-- .../source-build-reference-packages.proj | 2 +- 12 files changed, 166 insertions(+), 220 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 4dceb0524646..118fc7106544 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -139,7 +139,6 @@ jobs: vmrPath: $(vmrPath) vmrBranch: ${{ parameters.vmrBranch }} targetRef: $(Build.SourceVersion) # Synchronize the current installer commit - architecture: ${{ parameters.architecture }} - ${{ if parameters.buildFromArchive }}: - script: | @@ -400,7 +399,7 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '$(sourcesPath)/artifacts/${{ parameters.architecture }}/Release/' + - publish: '$(sourcesPath)/artifacts/packages/Release/' artifact: $(Agent.JobName)_Artifacts displayName: Publish Artifacts condition: succeededOrFailed() diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index 01569afa607e..9d06299182a8 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -17,11 +17,6 @@ parameters: type: string default: $(Agent.BuildDirectory)/vmr -- name: architecture - displayName: Architecture used for build artifacts - type: string - default: 'x64' - steps: - checkout: self displayName: Clone dotnet/installer @@ -41,16 +36,6 @@ steps: displayName: Prepare branch ${{ parameters.vmrBranch }} workingDirectory: ${{ parameters.vmrPath }} -- script: | - mkdir -p ${{ parameters.vmrPath }}/artifacts/${{ parameters.architecture }}/Release - displayName: Create artifacts folder (Unix) - condition: ne(variables['Agent.OS'], 'Windows_NT') - -- powershell: | - New-Item -ItemType Directory -Path ${{ parameters.vmrPath }}/artifacts/${{ parameters.architecture }}/Release - displayName: Create artifacts folder (Windows) - condition: eq(variables['Agent.OS'], 'Windows_NT') - - script: | git config --global user.name "dotnet-maestro[bot]" git config --global user.email "dotnet-maestro[bot]@users.noreply.github.com" diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index fabe4be01827..09cfb76dfa1a 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -92,6 +92,9 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'obj')) $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin')) $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'log', '$(Configuration)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'packages', '$(Configuration)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsPackagesDir)', 'NonShipping')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsPackagesDir)', 'Shipping')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng')) @@ -168,14 +171,7 @@ $(NuGetPackageRoot) $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'toolset', 'VSSdkResolvers')) - - - $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', '$(TargetArchitecture)', '$(Configuration)')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(TargetArchitecture)', '$(Configuration)')) - - $([MSBuild]::NormalizeDirectory('$(SharedIntermediateOutputPath)', 'blob-feed')) - $([MSBuild]::NormalizeDirectory('$(SourceBuiltBlobFeedDir)', 'packages')) - $([MSBuild]::NormalizeDirectory('$(SourceBuiltBlobFeedDir)', 'assets')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'Symbols')) $([MSBuild]::NormalizeDirectory('$(PrereqsPackagesDir)', 'prebuilt')) $([MSBuild]::NormalizeDirectory('$(PrereqsPackagesDir)', 'previouslyRestored')) diff --git a/src/SourceBuild/content/Directory.Build.targets b/src/SourceBuild/content/Directory.Build.targets index b8488418c6da..a1f0cb2adafb 100644 --- a/src/SourceBuild/content/Directory.Build.targets +++ b/src/SourceBuild/content/Directory.Build.targets @@ -7,7 +7,7 @@ dotnet-sdk- - + - - - - - - - - diff --git a/src/SourceBuild/content/eng/build.sourcebuild.targets b/src/SourceBuild/content/eng/build.sourcebuild.targets index 21875b5ead9e..ce02d57424f0 100644 --- a/src/SourceBuild/content/eng/build.sourcebuild.targets +++ b/src/SourceBuild/content/eng/build.sourcebuild.targets @@ -15,45 +15,17 @@ - - - - - - - - - - $([System.IO.Path]::GetFileName('%(SymbolsTarball.Identity)')) - $(Filename.Split('.')[1]) - $(ArtifactsTmpDir)Symbols - $(UnifiedSymbolsLayout)/$(RepositoryName) - - - - - - - - + DependsOnTargets="DetermineSourceBuiltSdkVersion"> - $(SharedOutputPath)dotnet-symbols-all-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension) + $(ArtifactsShippingPackagesDir)dotnet-symbols-all-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension) + + WorkingDirectory="$(IntermediateSymbolsRootDir)" /> @@ -64,33 +36,33 @@ AfterTargets="Build" DependsOnTargets="RepackageSymbols"> - + - $(ArtifactsTmpDir)SdkSymbols - $(SharedOutputPath)dotnet-symbols-sdk-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension) - $(ArtifactsTmpDir)Sdk + $(ArtifactsShippingPackagesDir)dotnet-symbols-sdk-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension) + + $(BaseIntermediateOutputPath)SdkSymbols + $(BaseIntermediateOutputPath)Sdk %(SdkTarballItem.Identity) - - + + - + WorkingDirectory="$(IntermediateSdkSymbolsLayout)" /> - - - + + + - $(SharedIntermediateOutputPath)PackageVersions.$(RepositoryName).props - $(SharedIntermediateOutputPath)PackageVersions.$(RepositoryName).Current.props - $(SharedIntermediateOutputPath)PackageVersions.$(RepositoryName).Previous.props - $(SharedIntermediateOutputPath)PackageVersions.$(RepositoryName).Snapshot.props + $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'PackageVersions')) + $(PackageVersionsDir)PackageVersions.$(RepositoryName).props + $(PackageVersionsDir)PackageVersions.$(RepositoryName).Current.props + $(PackageVersionsDir)PackageVersions.$(RepositoryName).Previous.props + $(PackageVersionsDir)PackageVersions.$(RepositoryName).Snapshot.props DependenciesOnly $(ProjectDirectory)global.json diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 6eba35815087..2c4f03001dc9 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -28,6 +28,8 @@ $(PackageReportDir)all-project-assets-json-files.zip $(PackageReportDir)prodcon-build.xml $([MSBuild]::NormalizePath('$(ProjectDirectory)', 'artifacts', 'RepoManifest.xml')) + + $(IntermediateSymbolsRootDir)$(RepositoryName) @@ -79,9 +81,14 @@ Inputs="$(MSBuildProjectFullPath)" Outputs="$(BaseIntermediateOutputPath)UpdateNuGetConfig.complete"> - source-built + + source-built + + source-built-transport + $(SourceBuiltShippingNuGetSourceName);SourceBuiltNonShippingNuGetSourceName + + ExtraSources - $(SourceBuiltNuGetSourceName) $(SourceBuildSources);$(ExtraSourcesNuGetSourceName) @@ -130,8 +137,12 @@ Condition="'$(DotNetBuildSourceOnly)' == 'true'" /> + SourceName="$(SourceBuiltShippingNuGetSourceName)" + SourcePath="$(ArtifactsShippingPackagesDir)" /> + + - <_CurrentSourceBuiltPackages Include="$(SourceBuiltPackagesPath)*.nupkg" - Exclude="$(SourceBuiltPackagesPath)*.symbols.nupkg" /> + <_CurrentSourceBuiltPackages Include="$(ArtifactsShippingPackagesDir)*.nupkg; + $(ArtifactsNonShippingPackagesDir)*.nupkg" + Condition="!$([System.String]::Copy('%(Identity)').EndsWith('.symbols.nupkg'))" /> <_PreviouslyBuiltSourceBuiltPackages Include="$(PrebuiltSourceBuiltPackagesPath)*.nupkg" /> @@ -277,6 +289,18 @@ StopOnFirstFailure="true" /> + + + + + + + + + + + @@ -308,7 +332,8 @@ + $(ArtifactsShippingPackagesDir); + $(ArtifactsNonShippingPackagesDir)" /> - - - - + Outputs="$(BaseIntermediateOutputPath)CopyRepoArtifacts.complete"> - - - + + + - - <_NupkgsDestination>$(SourceBuiltPackagesPath) - <_NupkgsDestination Condition="'$(RepositoryName)' == 'source-build-reference-packages'">$(ReferencePackagesDir) - + + + $(ArtifactsNonShippingPackagesDir) + $(ReferencePackagesDir) + + + + $(ArtifactsShippingPackagesDir) + $(ReferencePackagesDir) + + - + - - - - - - - - - $(PackageListsDir)$(NonShippingPackagesListPrefix)$(RepositoryName).lst - + + - + + - + - + <_InnerPackageCacheFiles Include="$(ProjectDirectory)artifacts/sb/package-cache/**/*" /> + SkipUnchangedFiles="true" + Condition="'@(_InnerPackageCacheFiles)' != ''" /> + Condition="'$(IsUtilityProject)' != 'true' and + '$(CleanWhileBuilding)' == 'true' and + Exists('$(ProjectDirectory)artifacts')"> $([MSBuild]::NormalizeDirectory('$(ProjectDirectory)', 'artifacts', 'buildLogs')) $([MSBuild]::NormalizeDirectory('$(ProjectDirectory)', 'artifacts', 'buildObj')) @@ -464,7 +479,7 @@ Inputs="$(MSBuildProjectFullPath)" Outputs="$(BaseIntermediateOutputPath)ExtractToolPackage.complete"> - <_ToolPackagesRoot Condition="'$(RepositoryName)' != 'source-build-reference-packages'">$(SourceBuiltPackagesPath) + <_ToolPackagesRoot Condition="'$(RepositoryName)' != 'source-build-reference-packages'">$(ArtifactsNonShippingPackagesDir) <_ToolPackagesRoot Condition="'$(RepositoryName)' == 'source-build-reference-packages'">$(ReferencePackagesDir) @@ -503,15 +518,29 @@ + + + + + + + + + - + @@ -537,17 +566,16 @@ - - - - - - - - - - + - + @@ -565,7 +593,7 @@ - + diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj index bcc0fe5f7534..66e458c71292 100644 --- a/src/SourceBuild/content/repo-projects/installer.proj +++ b/src/SourceBuild/content/repo-projects/installer.proj @@ -29,7 +29,7 @@ $(BuildArgs) /p:CoreSetupRid=$(TargetRid) - $(BuildArgs) /p:PublicBaseURL=file:%2F%2F$(SourceBuiltAssetsDir) + $(BuildArgs) /p:PublicBaseURL=file:%2F%2F$(ArtifactsShippingPackagesDir) $(BuildArgs) /p:UsePortableLinuxSharedFramework=false diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj index 822361892091..95311acf9374 100644 --- a/src/SourceBuild/content/repo-projects/package-source-build.proj +++ b/src/SourceBuild/content/repo-projects/package-source-build.proj @@ -14,43 +14,53 @@ - - - - $(SourceBuiltPackagesPath)SourceBuildReferencePackages/ + $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(SourceBuiltArtifactsTarballName)')) + $([MSBuild]::NormalizeDirectory('$(SourceBuildTarballStagingDir)', 'SourceBuildReferencePackages')) + + + - + + DestinationFiles="@(SourceBuildReferencePackagesNupkgFiles -> '$(SourceBuildReferencePackagesDestination)%(Filename)%(Extension)')" + Condition="'@(SourceBuildReferencePackagesNupkgFiles)' != ''" /> + + + - $(SharedOutputPath)$(SourceBuiltArtifactsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension) + $(ArtifactsShippingPackagesDir)$(SourceBuiltArtifactsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension) .version - + - + + WorkingDirectory="$(SourceBuildTarballStagingDir)" /> + + diff --git a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj index cff1f387aab1..f9aa99180c07 100644 --- a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj +++ b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj @@ -3,7 +3,7 @@ + + <_PackagesNotCreatedReason Include="^ There may have been a silent failure in the repo build." /> + <_PackagesNotCreatedReason Include="^ To confirm, check the build log file for undetected errors that may have prevented package creation: $(RepoConsoleLogFile)" Condition="'$(MinimalConsoleLogOutput)' == 'true'" /> + <_PackagesNotCreatedReason Include="^ The packages may have been written to an unexpected directory. For example, some repos used bin/ and changed to artifacts/ to match Arcade. Check RepoManifestFile in $(MSBuildProjectFullPath) (currently '$(RepoManifestFile)')" /> + + + + + + + + + - + @@ -520,58 +534,23 @@ + Condition="@(RepoSymbolsArchive->Count()) > 1" /> - - - - - - - <_PackagesNotCreatedReason Include="^ There may have been a silent failure in the submodule build. To confirm, check the build log file for undetected errors that may have prevented package creation: $(RepoConsoleLogFile)" /> - <_PackagesNotCreatedReason Include="^ This error might be a false positive if $(RepositoryName) intentionally builds no nuget packages. If so, set the SkipEnsurePackagesCreated property to true in $(MSBuildProjectFullPath)" /> - <_PackagesNotCreatedReason Include="^ The 'bin' directory might be dirty from a previous build and the package files already existed. If so, perform a clean build, or check which packages were already in 'bin' by opening $(CurrentSourceBuiltPackageVersionPropsPath)" /> - <_PackagesNotCreatedReason Include="^ The packages may have been written to an unexpected directory. For example, some repos used bin/ and changed to artifacts/ to match Arcade. Check RepoManifestFile in $(MSBuildProjectFullPath) (currently '$(RepoManifestFile)')" /> - - - - - - - - - - - - - - - - - - - true + true From 5b6cdd40190ada7f2d79c65c4428dcb89bf5a2ab Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 9 Feb 2024 19:26:02 +0000 Subject: [PATCH 05/19] PR feedback and fixes --- .devcontainer/vmr-source-build/README.md | 2 +- eng/pipelines/templates/jobs/vmr-build.yml | 17 ++++-- .../content/.devcontainer/README.md | 2 +- src/SourceBuild/content/Directory.Build.props | 1 + src/SourceBuild/content/README.md | 8 +-- .../content/eng/build.sourcebuild.targets | 16 +++--- .../repo-projects/Directory.Build.targets | 54 +++++++++++-------- .../content/repo-projects/installer.proj | 2 +- .../repo-projects/package-source-build.proj | 6 +-- 9 files changed, 64 insertions(+), 44 deletions(-) diff --git a/.devcontainer/vmr-source-build/README.md b/.devcontainer/vmr-source-build/README.md index 50430e7a6d3b..61d8c511654b 100644 --- a/.devcontainer/vmr-source-build/README.md +++ b/.devcontainer/vmr-source-build/README.md @@ -13,7 +13,7 @@ This Codespace can help you debug the source build of .NET. In case you have run `/workspaces/dotnet` with the PR changes pulled into it. You can then attempt to source-build the VMR which is what the VMR leg in the installer PR build doing. This build takes about 45 minutes and, after completion, produces an archived .NET SDK located in -`/workspaces/dotnet/artifacts/packages/Release/Shipping`. +`/workspaces/dotnet/artifacts/assets/Release`. ## Build the SDK diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 118fc7106544..108bf60d4bd3 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -347,7 +347,9 @@ jobs: CopyWithRelativeFolders "artifacts/" $targetFolder "*.binlog" CopyWithRelativeFolders "artifacts/" $targetFolder "*.log" - CopyWithRelativeFolders "artifacts/prebuilt-report/" $targetFolder + if ("${{ parameters.buildSourceOnly }}" -eq $True) { + CopyWithRelativeFolders "artifacts/prebuilt-report/" $targetFolder + } CopyWithRelativeFolders "src/" $targetFolder "*.binlog" CopyWithRelativeFolders "src/" $targetFolder "*.log" CopyWithRelativeFolders "test/" $targetFolder "*.binlog" @@ -369,7 +371,9 @@ jobs: cd "$(sourcesPath)" find artifacts/ -type f -name "*.binlog" -exec rsync -R {} -t ${targetFolder} \; find artifacts/ -type f -name "*.log" -exec rsync -R {} -t ${targetFolder} \; - find artifacts/prebuilt-report/ -exec rsync -R {} -t ${targetFolder} \; + if [[ "${{ parameters.buildSourceOnly }}" == "True" ]]; then + find artifacts/prebuilt-report/ -exec rsync -R {} -t ${targetFolder} \; + fi find src/ -type f -name "*.binlog" -exec rsync -R {} -t ${targetFolder} \; find src/ -type f -name "*.log" -exec rsync -R {} -t ${targetFolder} \; find test/ -type f -name "*.binlog" -exec rsync -R {} -t ${targetFolder} \; @@ -399,8 +403,15 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '$(sourcesPath)/artifacts/packages/Release/' + - publish: '$(sourcesPath)/assets/Release/' artifact: $(Agent.JobName)_Artifacts displayName: Publish Artifacts condition: succeededOrFailed() continueOnError: true + + # When building from source, the Private.SourceBuilt.Artifacts archive already contains the nuget packages + - ${{ if ne(parameters.buildSourceOnly, 'true') }}: + - publish: '$(sourcesPath)/packages/Release/' + artifact: $(Agent.JobName)_Packages + displayName: Publish Packages + condition: ${{ parameters.buildSourceOnly }} diff --git a/src/SourceBuild/content/.devcontainer/README.md b/src/SourceBuild/content/.devcontainer/README.md index c525f43a17b1..72be00877cab 100644 --- a/src/SourceBuild/content/.devcontainer/README.md +++ b/src/SourceBuild/content/.devcontainer/README.md @@ -10,7 +10,7 @@ This Codespace can help you debug the source build of .NET. This build takes about 45 minutes and, after completion, produces an archived .NET SDK located in -`/workspaces/dotnet/artifacts/x64/Release`. In case you selected the `prebuilt-sdk` +`/workspaces/dotnet/artifacts/assets/Release`. In case you selected the `prebuilt-sdk` Codespace, the built-from-source SDK will already be there. ## Build the SDK diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 09cfb76dfa1a..16a155c5d0de 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -172,6 +172,7 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'toolset', 'VSSdkResolvers')) $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'Symbols')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'assets', '$(Configuration)')) $([MSBuild]::NormalizeDirectory('$(PrereqsPackagesDir)', 'prebuilt')) $([MSBuild]::NormalizeDirectory('$(PrereqsPackagesDir)', 'previouslyRestored')) diff --git a/src/SourceBuild/content/README.md b/src/SourceBuild/content/README.md index 105cca1b3759..979698d823a7 100644 --- a/src/SourceBuild/content/README.md +++ b/src/SourceBuild/content/README.md @@ -109,21 +109,21 @@ In case you don't want to / cannot prepare your environment per the requirements ./build.sh -sb --clean-while-building ``` - The resulting SDK is placed at `artifacts/packages/Release/Shipping/dotnet-sdk-9.0.100-[your-RID].tar.gz` (for Unix) or `artifacts/packages/Release/Shipping/dotnet-sdk-9.0.100-[your-RID].zip` (for Windows). + The resulting SDK is placed at `artifacts/assets/Release/dotnet-sdk-9.0.100-[your-RID].tar.gz` (for Unix) or `artifacts/assets/Release/dotnet-sdk-9.0.100-[your-RID].zip` (for Windows). 4. *(Optional)* **Unpack and install the .NET SDK** For Unix: ```bash mkdir -p $HOME/dotnet - tar zxf artifacts/packages/Release/Shipping/dotnet-sdk-9.0.100-[your-RID].tar.gz -C $HOME/dotnet + tar zxf artifacts/assets/Release/dotnet-sdk-9.0.100-[your-RID].tar.gz -C $HOME/dotnet ln -s $HOME/dotnet/dotnet /usr/bin/dotnet ``` For Windows: ```cmd mkdir %userprofile%\dotnet - tar -xf artifacts/packages/Release/Shipping/dotnet-sdk-9.0.100-[your RID].zip -C %userprofile%\dotnet + tar -xf artifacts/assets/Release/dotnet-sdk-9.0.100-[your RID].zip -C %userprofile%\dotnet set "PATH=%userprofile%\dotnet;%PATH%" ``` @@ -152,7 +152,7 @@ git clone https://github.com/dotnet/dotnet . ./prep.sh && ./build.sh -sb --clean-while-building mkdir -p $HOME/.dotnet -tar -zxf artifacts/packages/Release/Shipping/dotnet-sdk-9.0.100-centos.8-x64.tar.gz -C $HOME/.dotnet +tar -zxf artifacts/assets/Release/dotnet-sdk-9.0.100-centos.8-x64.tar.gz -C $HOME/.dotnet ln -s $HOME/.dotnet/dotnet /usr/bin/dotnet ``` diff --git a/src/SourceBuild/content/eng/build.sourcebuild.targets b/src/SourceBuild/content/eng/build.sourcebuild.targets index ce02d57424f0..f619bb4f735d 100644 --- a/src/SourceBuild/content/eng/build.sourcebuild.targets +++ b/src/SourceBuild/content/eng/build.sourcebuild.targets @@ -20,7 +20,7 @@ AfterTargets="Build" DependsOnTargets="DetermineSourceBuiltSdkVersion"> - $(ArtifactsShippingPackagesDir)dotnet-symbols-all-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension) + $(ArtifactsAssetsDir)dotnet-symbols-all-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension) @@ -36,11 +36,11 @@ AfterTargets="Build" DependsOnTargets="RepackageSymbols"> - + - $(ArtifactsShippingPackagesDir)dotnet-symbols-sdk-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension) + $(ArtifactsAssetsDir)dotnet-symbols-sdk-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension) $(BaseIntermediateOutputPath)SdkSymbols $(BaseIntermediateOutputPath)Sdk @@ -83,7 +83,7 @@ Inputs="$(MSBuildProjectFullPath)" Outputs="$(BaseIntermediateOutputPath)ReportPoisonUsage.complete" > - + @@ -122,8 +122,8 @@ - - + + @@ -170,7 +170,7 @@ DependsOnTargets="DetermineSourceBuiltSdkVersion" Condition="'@(SmokeTestsPrereqs->Count())' != '0'"> - $(ArtifactsShippingPackagesDir)dotnet-smoke-test-prereqs.$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension) + $(ArtifactsAssetsDir)dotnet-smoke-test-prereqs.$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension) $(SmokeTestsArtifactsDir)prereq-packages/ @@ -204,7 +204,7 @@ DependsOnTargets="DetermineSourceBuiltSdkVersion" Condition="'@(PrebuiltFile->Count())' != '0'"> - $(ArtifactsShippingPackagesDir)$(SourceBuiltPrebuiltsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension) + $(ArtifactsAssetsDir)$(SourceBuiltPrebuiltsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension) $(ResultingPrebuiltPackagesDir) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 1c29c4a10432..c375095e5651 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -210,8 +210,7 @@ Inputs="$(MSBuildProjectFullPath)" Outputs="$(BaseIntermediateOutputPath)CreateBuildInputProps.complete"> - <_CurrentSourceBuiltPackages Include="$(ArtifactsShippingPackagesDir)*.nupkg; - $(ArtifactsNonShippingPackagesDir)*.nupkg" + <_CurrentSourceBuiltPackages Include="$(ArtifactsPackagesDir)**\*.nupkg" Condition="!$([System.String]::Copy('%(Identity)').EndsWith('.symbols.nupkg'))" /> <_PreviouslyBuiltSourceBuiltPackages Include="$(PrebuiltSourceBuiltPackagesPath)*.nupkg" /> @@ -332,7 +331,8 @@ + $(ArtifactsNonShippingPackagesDir); + $(ArtifactsAssetsDir)" /> - <_PackagesNotCreatedReason Include="^ There may have been a silent failure in the repo build." /> - <_PackagesNotCreatedReason Include="^ To confirm, check the build log file for undetected errors that may have prevented package creation: $(RepoConsoleLogFile)" Condition="'$(MinimalConsoleLogOutput)' == 'true'" /> - <_PackagesNotCreatedReason Include="^ The packages may have been written to an unexpected directory. For example, some repos used bin/ and changed to artifacts/ to match Arcade. Check RepoManifestFile in $(MSBuildProjectFullPath) (currently '$(RepoManifestFile)')" /> + <_ArtifactsNotCreatedReason Include="^ There may have been a silent failure in the repo build." /> + <_ArtifactsNotCreatedReason Include="^ To confirm, check the build log file for undetected errors that may have prevented package creation: $(RepoConsoleLogFile)" Condition="'$(MinimalConsoleLogOutput)' == 'true'" /> + <_ArtifactsNotCreatedReason Include="^ The packages may have been written to an unexpected directory. For example, some repos used bin/ and changed to artifacts/ to match Arcade. Check RepoManifestFile in $(MSBuildProjectFullPath) (currently '$(RepoManifestFile)')" /> - @@ -394,19 +394,24 @@ - - + + + + + + + $(ArtifactsNonShippingPackagesDir) $(ReferencePackagesDir) - + - + $(ArtifactsShippingPackagesDir) $(ReferencePackagesDir) - + - + + + + + - - + + diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj index 66e458c71292..5c232717e08b 100644 --- a/src/SourceBuild/content/repo-projects/installer.proj +++ b/src/SourceBuild/content/repo-projects/installer.proj @@ -29,7 +29,7 @@ $(BuildArgs) /p:CoreSetupRid=$(TargetRid) - $(BuildArgs) /p:PublicBaseURL=file:%2F%2F$(ArtifactsShippingPackagesDir) + $(BuildArgs) /p:PublicBaseURL=file:%2F%2F$(ArtifactsAssetsDir) $(BuildArgs) /p:UsePortableLinuxSharedFramework=false diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj index 95311acf9374..928dda9ffbad 100644 --- a/src/SourceBuild/content/repo-projects/package-source-build.proj +++ b/src/SourceBuild/content/repo-projects/package-source-build.proj @@ -34,10 +34,8 @@ Condition="'@(SourceBuildReferencePackagesNupkgFiles)' != ''" /> - + $(ArtifactsShippingPackagesDir)$(SourceBuiltArtifactsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension) From 161c22daf4aad748a06bc02cb80269528241e3ec Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 9 Feb 2024 20:53:09 +0100 Subject: [PATCH 06/19] Update vmr-build.yml --- 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 108bf60d4bd3..d6934c205462 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -403,7 +403,7 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '$(sourcesPath)/assets/Release/' + - publish: '$(sourcesPath)/artifacts/assets/Release/' artifact: $(Agent.JobName)_Artifacts displayName: Publish Artifacts condition: succeededOrFailed() @@ -411,7 +411,7 @@ jobs: # When building from source, the Private.SourceBuilt.Artifacts archive already contains the nuget packages - ${{ if ne(parameters.buildSourceOnly, 'true') }}: - - publish: '$(sourcesPath)/packages/Release/' + - publish: '$(sourcesPath)/artifacts/packages/Release/' artifact: $(Agent.JobName)_Packages displayName: Publish Packages condition: ${{ parameters.buildSourceOnly }} From a83daea12ac6159df6c09253c28b2e4f4333f084 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 9 Feb 2024 20:58:00 +0000 Subject: [PATCH 07/19] PR feedback & fix --- eng/pipelines/templates/jobs/vmr-build.yml | 5 +---- .../content/repo-projects/Directory.Build.targets | 12 +++++++----- .../content/repo-projects/package-source-build.proj | 9 +++++++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 108bf60d4bd3..415e9fdc419f 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -347,9 +347,6 @@ jobs: CopyWithRelativeFolders "artifacts/" $targetFolder "*.binlog" CopyWithRelativeFolders "artifacts/" $targetFolder "*.log" - if ("${{ parameters.buildSourceOnly }}" -eq $True) { - CopyWithRelativeFolders "artifacts/prebuilt-report/" $targetFolder - } CopyWithRelativeFolders "src/" $targetFolder "*.binlog" CopyWithRelativeFolders "src/" $targetFolder "*.log" CopyWithRelativeFolders "test/" $targetFolder "*.binlog" @@ -414,4 +411,4 @@ jobs: - publish: '$(sourcesPath)/packages/Release/' artifact: $(Agent.JobName)_Packages displayName: Publish Packages - condition: ${{ parameters.buildSourceOnly }} + condition: ${{ parameters.buildSourceOnly }} \ No newline at end of file diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index c375095e5651..4b415506e800 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -383,10 +383,6 @@ - - - - + + + + @@ -544,7 +544,9 @@ diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj index 928dda9ffbad..ba469b0791b2 100644 --- a/src/SourceBuild/content/repo-projects/package-source-build.proj +++ b/src/SourceBuild/content/repo-projects/package-source-build.proj @@ -33,9 +33,14 @@ DestinationFiles="@(SourceBuildReferencePackagesNupkgFiles -> '$(SourceBuildReferencePackagesDestination)%(Filename)%(Extension)')" Condition="'@(SourceBuildReferencePackagesNupkgFiles)' != ''" /> + + + + - + $(ArtifactsShippingPackagesDir)$(SourceBuiltArtifactsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension) From 44e2d4e9edab39167f607a39321176312336fafc Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sat, 10 Feb 2024 07:58:15 +0000 Subject: [PATCH 08/19] Fixes --- eng/pipelines/templates/jobs/vmr-build.yml | 3 +-- src/SourceBuild/content/Directory.Build.targets | 2 +- .../content/repo-projects/package-source-build.proj | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 4f9f043496ed..7681b9424183 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -410,5 +410,4 @@ jobs: - ${{ if ne(parameters.buildSourceOnly, 'true') }}: - publish: '$(sourcesPath)/artifacts/packages/Release/' artifact: $(Agent.JobName)_Packages - displayName: Publish Packages - condition: ${{ parameters.buildSourceOnly }} \ No newline at end of file + displayName: Publish Packages \ No newline at end of file diff --git a/src/SourceBuild/content/Directory.Build.targets b/src/SourceBuild/content/Directory.Build.targets index a1f0cb2adafb..3dff8e15853e 100644 --- a/src/SourceBuild/content/Directory.Build.targets +++ b/src/SourceBuild/content/Directory.Build.targets @@ -7,7 +7,7 @@ dotnet-sdk- - + source-built-transport - $(SourceBuiltShippingNuGetSourceName);SourceBuiltNonShippingNuGetSourceName + $(SourceBuiltShippingNuGetSourceName);$(SourceBuiltNonShippingNuGetSourceName) ExtraSources From e7c6d8b8ce52a5b992f54a99b3f56a6617accb13 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sat, 10 Feb 2024 12:52:15 +0100 Subject: [PATCH 10/19] Update vmr-build.yml --- eng/pipelines/vmr-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/vmr-build.yml b/eng/pipelines/vmr-build.yml index 45733f9d2293..a6be89dc8328 100644 --- a/eng/pipelines/vmr-build.yml +++ b/eng/pipelines/vmr-build.yml @@ -56,9 +56,9 @@ stages: isBuiltFromVmr: false isSourceOnlyBuild: ${{ variables.isSourceOnlyBuild }} ${{ if eq(variables.isSourceOnlyBuild, 'true') }}: - scope: ultralite + scope: full ${{ else }}: - scope: lite + scope: full # In case the VMR Build stage is temporarily disabled, the VMR synchronization step is run to validate # that the PR can be merged and later synchronized into the VMR without problems. From 8ae223cffee23c89f8162fd6d33b0babcd84be1c Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 12 Feb 2024 16:34:27 +0100 Subject: [PATCH 11/19] Update vmr-build.yml --- eng/pipelines/templates/stages/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 0b276ab7d67d..4ea119a68343 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -122,7 +122,7 @@ stages: container: ${{ variables.alpine319Container }} buildFromArchive: false # 🚫 buildSourceOnly: true # ✅ - enablePoison: false # 🚫 + enablePoison: true # 🚫 excludeOmniSharpTests: true # ✅ runOnline: true # ✅ runTests: true # ✅ From c78bdd866055c181acfd115b3d0c444d1d49ae3e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 12 Feb 2024 18:03:49 +0000 Subject: [PATCH 12/19] Exclude Private.SourceBuilt.Artifacts and include nuget packages --- src/SourceBuild/content/eng/build.sourcebuild.targets | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/build.sourcebuild.targets b/src/SourceBuild/content/eng/build.sourcebuild.targets index f619bb4f735d..38ee20c1b0ec 100644 --- a/src/SourceBuild/content/eng/build.sourcebuild.targets +++ b/src/SourceBuild/content/eng/build.sourcebuild.targets @@ -82,13 +82,16 @@ Condition="'$(EnablePoison)' == 'true'" Inputs="$(MSBuildProjectFullPath)" Outputs="$(BaseIntermediateOutputPath)ReportPoisonUsage.complete" > + - + + - + - Date: Mon, 12 Feb 2024 19:16:29 +0000 Subject: [PATCH 13/19] Add SBRPs back to poison check --- .../content/eng/build.sourcebuild.targets | 5 ++++- .../CheckForPoison.cs | 16 +++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/content/eng/build.sourcebuild.targets b/src/SourceBuild/content/eng/build.sourcebuild.targets index 38ee20c1b0ec..b9db6d6c45ce 100644 --- a/src/SourceBuild/content/eng/build.sourcebuild.targets +++ b/src/SourceBuild/content/eng/build.sourcebuild.targets @@ -82,11 +82,14 @@ Condition="'$(EnablePoison)' == 'true'" Inputs="$(MSBuildProjectFullPath)" Outputs="$(BaseIntermediateOutputPath)ReportPoisonUsage.complete" > - + + + + diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs index 5dcf0e5ced09..86bd45f99911 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs @@ -28,6 +28,8 @@ public class CheckForPoison : Task /// The files to check for poison and/or hash matches. Zips and /// nupkgs will be extracted and checked recursively. /// %(Identity): Path to the initial set of files. + /// Add SourceBuildReferencePackage metadata and set to true to + /// indicate that the file comes from SBRP. /// [Required] public ITaskItem[] FilesToCheck { get; set; } @@ -147,11 +149,13 @@ public class CheckForPoison : Task private const string SbrpAttributeType = "System.Reflection.AssemblyMetadataAttribute"; - private record CandidateFileEntry(string ExtractedPath, string DisplayPath); + private const string SbrpMetadataName = "IsSourceBuildReferencePackage"; + + private record CandidateFileEntry(string ExtractedPath, string DisplayPath, bool IsSourceBuildReferencePackage); public override bool Execute() { - IEnumerable poisons = GetPoisonedFiles(FilesToCheck.Select(f => f.ItemSpec), HashCatalogFilePath, MarkerFileName); + IEnumerable poisons = GetPoisonedFiles(FilesToCheck, HashCatalogFilePath, MarkerFileName); // if we should write out the poison report, do that if (!string.IsNullOrWhiteSpace(PoisonReportOutputFilePath)) @@ -179,12 +183,14 @@ public override bool Execute() /// File path to the file hash catalog /// Marker file name to check for in poisoned nupkgs /// List of poisoned packages and files found and reasons for each - internal IEnumerable GetPoisonedFiles(IEnumerable initialCandidates, string catalogedPackagesFilePath, string markerFileName) + internal IEnumerable GetPoisonedFiles(IEnumerable initialCandidates, string catalogedPackagesFilePath, string markerFileName) { IEnumerable catalogedPackages = ReadCatalog(catalogedPackagesFilePath); var poisons = new List(); var candidateQueue = new Queue(initialCandidates.Select(candidate => - new CandidateFileEntry(candidate, Utility.MakeRelativePath(candidate, ProjectDirPath)))); + new CandidateFileEntry(candidate.ItemSpec, + Utility.MakeRelativePath(candidate.ItemSpec, ProjectDirPath), + candidate.GetMetadata(SbrpMetadataName) == "true"))); if (!string.IsNullOrWhiteSpace(OverrideTempPath)) { @@ -276,7 +282,7 @@ private static PoisonedFileEntry CheckSingleFile(IEnumerable Date: Mon, 12 Feb 2024 19:29:04 +0000 Subject: [PATCH 14/19] Build fix --- .../CheckForPoison.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs index 86bd45f99911..bd5e0b84ce91 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs @@ -430,7 +430,7 @@ private static PoisonedFileEntry ExtractAndCheckZipFileOnly(IEnumerable Date: Mon, 12 Feb 2024 19:42:56 +0000 Subject: [PATCH 15/19] Fix typo --- .../CheckForPoison.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs index bd5e0b84ce91..b60804502c5c 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs @@ -430,7 +430,7 @@ private static PoisonedFileEntry ExtractAndCheckZipFileOnly(IEnumerable Date: Mon, 12 Feb 2024 20:57:29 +0000 Subject: [PATCH 16/19] Fix exclude --- src/SourceBuild/content/eng/build.sourcebuild.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/build.sourcebuild.targets b/src/SourceBuild/content/eng/build.sourcebuild.targets index b9db6d6c45ce..d6447c69a962 100644 --- a/src/SourceBuild/content/eng/build.sourcebuild.targets +++ b/src/SourceBuild/content/eng/build.sourcebuild.targets @@ -85,7 +85,7 @@ + Condition="!$([System.String]::Copy('%(Filename)').StartsWith('$(SourceBuiltArtifactsTarballName)'))" /> From 99ee8a5374e5109868c926e3c8e0f8b0b8760480 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 13 Feb 2024 06:46:59 +0000 Subject: [PATCH 17/19] Arrgh. Remove differently --- src/SourceBuild/content/eng/build.sourcebuild.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/eng/build.sourcebuild.targets b/src/SourceBuild/content/eng/build.sourcebuild.targets index d6447c69a962..00b1439ef7d6 100644 --- a/src/SourceBuild/content/eng/build.sourcebuild.targets +++ b/src/SourceBuild/content/eng/build.sourcebuild.targets @@ -84,8 +84,8 @@ Outputs="$(BaseIntermediateOutputPath)ReportPoisonUsage.complete" > - + + From 1f525ad1b091ffd7244619490fd0381a8ffc8e39 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 13 Feb 2024 09:50:23 +0100 Subject: [PATCH 18/19] Update vmr-build.yml --- eng/pipelines/templates/stages/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 4ea119a68343..0b276ab7d67d 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -122,7 +122,7 @@ stages: container: ${{ variables.alpine319Container }} buildFromArchive: false # 🚫 buildSourceOnly: true # ✅ - enablePoison: true # 🚫 + enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ runOnline: true # ✅ runTests: true # ✅ From 25402f33d9396f61f7fed1a47974723c0ff8ac46 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 13 Feb 2024 16:18:05 +0100 Subject: [PATCH 19/19] Update vmr-build.yml --- eng/pipelines/vmr-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/vmr-build.yml b/eng/pipelines/vmr-build.yml index a6be89dc8328..45733f9d2293 100644 --- a/eng/pipelines/vmr-build.yml +++ b/eng/pipelines/vmr-build.yml @@ -56,9 +56,9 @@ stages: isBuiltFromVmr: false isSourceOnlyBuild: ${{ variables.isSourceOnlyBuild }} ${{ if eq(variables.isSourceOnlyBuild, 'true') }}: - scope: full + scope: ultralite ${{ else }}: - scope: full + scope: lite # In case the VMR Build stage is temporarily disabled, the VMR synchronization step is run to validate # that the PR can be merged and later synchronized into the VMR without problems.