From 84ad8a41da813dd2045e5720f829902664541c5f Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Tue, 21 Jun 2022 00:05:51 -0700 Subject: [PATCH 1/4] Native tools --- azure-pipelines.yml | 3 ++- eng/Build.ps1 | 2 ++ eng/build.sh | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 73cb34c178f..4bb35114eae 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -275,7 +275,8 @@ stages: - job: Windows pool: # The PR build definition sets this variable: - # WindowsMachineQueueName=Build.Windows.10.Amd64.VS2019.Open + # was WindowsMachineQueueName=Build.Windows.Amd64.VS2022.Open + # currently Windows.vs2022.amd64 # and there is an alternate build definition that sets this to a queue that is always scouting the # next preview of Visual Studio. name: NetCore1ESPool-Public diff --git a/eng/Build.ps1 b/eng/Build.ps1 index ce23ae7da0f..23b98d8dedc 100644 --- a/eng/Build.ps1 +++ b/eng/Build.ps1 @@ -454,6 +454,8 @@ try { $env:DOTNET_ROOT = "$dotnetPath" Get-Item -Path Env: + $env:NativeToolsOnMachine = $true + if ($bootstrap) { $script:BuildMessage = "Failure building bootstrap compiler" $bootstrapDir = Make-BootstrapBuild diff --git a/eng/build.sh b/eng/build.sh index 284bae206d4..4175d2cbda8 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -218,6 +218,9 @@ function BuildSolution { local projects="$repo_root/$solution" + + export NativeToolsOnMachine=true + # https://github.com/dotnet/roslyn/issues/23736 local enable_analyzers=!$skip_analyzers UNAME="$(uname)" From f00600b00c544a59303f9b624a9189fc216d877a Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Tue, 21 Jun 2022 10:33:46 -0700 Subject: [PATCH 2/4] image --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4bb35114eae..b43406a26e5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -276,11 +276,11 @@ stages: pool: # The PR build definition sets this variable: # was WindowsMachineQueueName=Build.Windows.Amd64.VS2022.Open - # currently Windows.vs2022.amd64 + # currently Windows.vs2022.amd64.open # and there is an alternate build definition that sets this to a queue that is always scouting the # next preview of Visual Studio. name: NetCore1ESPool-Public - demands: ImageOverride -equals $(WindowsMachineQueueName) + demands: ImageOverride -equals Windows.vs2022.amd64.open #$(WindowsMachineQueueName) timeoutInMinutes: 120 strategy: maxParallel: 4 From 322b7feb5e3e8bfd3e31c260b3900a422b014c2c Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Tue, 21 Jun 2022 10:35:50 -0700 Subject: [PATCH 3/4] Not linux --- eng/build.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/build.sh b/eng/build.sh index 4175d2cbda8..284bae206d4 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -218,9 +218,6 @@ function BuildSolution { local projects="$repo_root/$solution" - - export NativeToolsOnMachine=true - # https://github.com/dotnet/roslyn/issues/23736 local enable_analyzers=!$skip_analyzers UNAME="$(uname)" From 2894315d591349904a6863a4436fbfd8b922bfed Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Tue, 21 Jun 2022 20:31:34 -0700 Subject: [PATCH 4/4] Remove temp hack --- azure-pipelines.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b43406a26e5..384ee54c0fa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -275,12 +275,11 @@ stages: - job: Windows pool: # The PR build definition sets this variable: - # was WindowsMachineQueueName=Build.Windows.Amd64.VS2022.Open - # currently Windows.vs2022.amd64.open + # WindowsMachineQueueName=Windows.vs2022.amd64.open # and there is an alternate build definition that sets this to a queue that is always scouting the # next preview of Visual Studio. name: NetCore1ESPool-Public - demands: ImageOverride -equals Windows.vs2022.amd64.open #$(WindowsMachineQueueName) + demands: ImageOverride -equals $(WindowsMachineQueueName) timeoutInMinutes: 120 strategy: maxParallel: 4