From b1fdc5eec2d5280c5c74e7da3cf6ae7bdc0831fc Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 13 Nov 2024 14:08:22 +0100 Subject: [PATCH 1/6] Add VMR leg that builds test projects Fixes https://github.com/dotnet/source-build/issues/4168 Running as part of the PR to get some initial results. --- eng/pipelines/templates/stages/vmr-build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 33a4bdae80b6..79394a305337 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -404,6 +404,18 @@ stages: targetOS: windows targetArchitecture: x64 + - template: ../jobs/vmr-build.yml + parameters: + buildName: Windows_BuildTests + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: ${{ parameters.pool_Windows }} + targetOS: windows + targetArchitecture: x64 + extraProperties: /p:DotNetBuildTests=true + runTests: false + - template: ../jobs/vmr-build.yml parameters: buildName: Android_Shortstack From dbc229e094bb7d12db4ba964923e6f6de8e0a210 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 3 Jan 2025 12:36:13 +0100 Subject: [PATCH 2/6] Remove redundant architecture parameter in YAML --- 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 d07c9fec508d..d1304b2f58fe 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -436,7 +436,6 @@ stages: buildName: Windows_BuildTests isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} - architecture: x64 pool: ${{ parameters.pool_Windows }} targetOS: windows targetArchitecture: x64 From e99b7236075376b754eca9f492e4872eb00766d5 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 30 Jan 2025 12:32:16 -0800 Subject: [PATCH 3/6] Move the job to PR section --- eng/pipelines/templates/stages/vmr-build.yml | 23 ++++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 636964797dc9..454d53c16240 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -374,6 +374,17 @@ stages: targetOS: linux targetArchitecture: x64 + - template: ../jobs/vmr-build.yml + parameters: + buildName: Windows_BuildTests + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + pool: ${{ parameters.pool_Windows }} + targetOS: windows + targetArchitecture: x64 + extraProperties: /p:DotNetBuildTests=true + runTests: false + #### VERTICAL BUILD (Official) #### - ${{ if not(parameters.isSourceOnlyBuild) }}: - stage: VMR_Vertical_Build @@ -396,18 +407,6 @@ stages: targetOS: windows targetArchitecture: x64 - - template: ../jobs/vmr-build.yml - parameters: - buildName: Windows_BuildTests - isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} - vmrBranch: ${{ variables.VmrBranch }} - sign: ${{ variables.signEnabled }} - pool: ${{ parameters.pool_Windows }} - targetOS: windows - targetArchitecture: x64 - extraProperties: /p:DotNetBuildTests=true - runTests: false - - template: ../jobs/vmr-build.yml parameters: buildName: Windows From 2a71f6545ffb91d9946db4feab04a687c62792f5 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Fri, 31 Jan 2025 10:33:07 -0800 Subject: [PATCH 4/6] Opt-out of winforms tests build --- src/SourceBuild/content/repo-projects/winforms.proj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/winforms.proj b/src/SourceBuild/content/repo-projects/winforms.proj index 9981d3347f2b..690d4c21ed0b 100644 --- a/src/SourceBuild/content/repo-projects/winforms.proj +++ b/src/SourceBuild/content/repo-projects/winforms.proj @@ -3,6 +3,9 @@ true + + true + $(BuildArgs) $(FlagParameterPrefix)v $(LogVerbosity) $(BuildArgs) $(FlagParameterPrefix)NativeToolsOnMachine From 9f8dde9aaa97fbb44d2e75a9e94ee6e484a4bd3c Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Mon, 3 Feb 2025 15:32:43 -0800 Subject: [PATCH 5/6] Do not build sdk tests on non-Windows platforms --- src/SourceBuild/content/repo-projects/sdk.proj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index d374626251e9..cb35ff50c040 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -3,6 +3,9 @@ true + + true + $(BuildArgs) -nativeToolsOnMachine $(BuildArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk $(BuildArgs) /p:PortableRid=$(PortableRid) From 62638639a06c27b2c722fb0074b58cc4ef4e0c8d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 5 Feb 2025 22:11:34 +0100 Subject: [PATCH 6/6] Update eng/pipelines/templates/stages/vmr-build.yml --- 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 b455127f0dd8..53b0ebc785e2 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -383,7 +383,6 @@ stages: targetOS: windows targetArchitecture: x64 extraProperties: /p:DotNetBuildTests=true - runTests: false #### VERTICAL BUILD (Official) #### - ${{ if not(parameters.isSourceOnlyBuild) }}: