From 3a4f974ade428b858ced8a0d8914cad0ce5ffebf Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Fri, 8 Oct 2021 15:51:24 +0100 Subject: [PATCH] Provisioning windows stable (#14711) * Provisioning vs * extra args * (x86) variable * Fix naming and variables --- azure-pipelines.yml | 1 + build/provisioning/vs.csx | 4 ++++ build/steps/build-windows.yml | 7 +++++++ 3 files changed, 12 insertions(+) create mode 100644 build/provisioning/vs.csx diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 76e96355e16..f4cc2d6e411 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -76,6 +76,7 @@ stages: - template: build/steps/build-windows.yml parameters: provisionatorPath : 'build/provisioning/provisioning.csx' + provisionatorVSPath : 'build/provisioning/vs.csx' - job: nuget_pack_hosted workspace: clean: all diff --git a/build/provisioning/vs.csx b/build/provisioning/vs.csx new file mode 100644 index 00000000000..14083b0902a --- /dev/null +++ b/build/provisioning/vs.csx @@ -0,0 +1,4 @@ +VisualStudio (VisualStudioChannel.Stable, VisualStudioTier.Enterprise, 16, @"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise", true) + .Workload (VisualStudioWorkload.ManagedDesktop) + .Workload (VisualStudioWorkload.NetCrossPlat) + .Workload (VisualStudioWorkload.Universal); \ No newline at end of file diff --git a/build/steps/build-windows.yml b/build/steps/build-windows.yml index a07c3053744..2aca12965bd 100644 --- a/build/steps/build-windows.yml +++ b/build/steps/build-windows.yml @@ -21,6 +21,13 @@ steps: inputs: provisioning_script: ${{ parameters.provisionatorPath }} provisioning_extra_args: ${{ parameters.provisionator.extraArguments }} + + - task: xamops.azdevex.provisionator-task.provisionator@1 + displayName: 'Provisioning VS' + condition: eq(variables['provisioningVS'], 'true') + inputs: + provisioning_script: ${{ parameters.provisionatorVSPath }} + provisioning_extra_args: ${{ parameters.provisionator.extraArguments }} # - task: UseDotNet@2 # displayName: "Install .net core $(DOTNET_VERSION)"