Merge pull request #326 from reupen/use-old-compiler-on-azure

Use older VC tool set version on Azure Pipelines
reupen · Aug 27, 2020 · 012a00e · 012a00e
2 parents 0bb5f2d + 4a1d2a3
commit 012a00e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <ItemDefinitionGroup Condition="$(VCToolsVersion) &lt; 14.26">
+    <ClCompile>
+      <AdditionalOptions>-experimental:preprocessor %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/azure/pipeline.yml b/azure/pipeline.yml
@@ -1,6 +1,7 @@
 variables:
   solution: vc16/columns_ui-public.sln
   llvmMsBuildArgs: /p:PlatformToolset=ClangCL;UseLldLink=True;VcpkgAutoLink=False;WholeProgramOptimization=False;SpectreMitigation=
+  vc142MsBuildArgs: /p:VCToolsVersion=14.25.28610
   vcpkgInstallArgs: 'ms-gsl range-v3 wil --overlay-ports=$(System.DefaultWorkingDirectory)\ports'
 jobs:
 - template: job-build.yml
@@ -26,6 +27,7 @@ jobs:
       Release:
         configuration: Release
         publish: true
+    msBuildArgs: ${{ variables.vc142MsBuildArgs }}
     name: vs2019_v142
     platform: Win32
     solution: ${{ variables.solution }}