diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-12-01 11:31:31 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-12-01 12:30:49 -0600 |
| commit | becc2bb059013f488d753ab51218064b3358ac91 (patch) | |
| tree | 63b9872b849d790c45abab5f3f55493675eb9799 | |
| parent | 3edfc3425d213d8d63120ece61f01a3e81a38333 (diff) | |
| download | wix-becc2bb059013f488d753ab51218064b3358ac91.tar.gz wix-becc2bb059013f488d753ab51218064b3358ac91.tar.bz2 wix-becc2bb059013f488d753ab51218064b3358ac91.zip | |
Only build mbanative for latest toolset.
This allows using Appveyor's latest VS2019 image.
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | src/api/burn/burn.proj | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/appveyor.yml b/appveyor.yml index 5f017682..fa0fec4e 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
| @@ -5,7 +5,7 @@ branches: | |||
| 5 | - master | 5 | - master |
| 6 | - develop | 6 | - develop |
| 7 | 7 | ||
| 8 | image: vs2019-16-11-2 | 8 | image: Visual Studio 2019 |
| 9 | 9 | ||
| 10 | version: 0.0.0.{build} | 10 | version: 0.0.0.{build} |
| 11 | configuration: Release | 11 | configuration: Release |
diff --git a/src/api/burn/burn.proj b/src/api/burn/burn.proj index 6020efa2..535f70e7 100644 --- a/src/api/burn/burn.proj +++ b/src/api/burn/burn.proj | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | <!-- Build --> | 7 | <!-- Build --> |
| 8 | 8 | ||
| 9 | <!-- Let bextutil build balutil. --> | ||
| 10 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" /> | 9 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" /> |
| 11 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" /> | 10 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" /> |
| 12 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" /> | 11 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" /> |
| @@ -15,12 +14,14 @@ | |||
| 15 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86" /> | 14 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86" /> |
| 16 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" /> | 15 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" /> |
| 17 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" /> | 16 | <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" /> |
| 18 | 17 | ||
| 19 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86;PlatformToolset=v140" /> | 18 | <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" /> |
| 20 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64;PlatformToolset=v140" /> | 19 | <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" /> |
| 21 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86;PlatformToolset=v141" /> | 20 | <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" /> |
| 22 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64;PlatformToolset=v141" /> | 21 | <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" /> |
| 23 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" /> | 22 | <ProjectReference Include="balutil\balutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" /> |
| 23 | |||
| 24 | <!-- Let mbanative build balutil for latest toolset. --> | ||
| 24 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86" /> | 25 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86" /> |
| 25 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64" /> | 26 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64" /> |
| 26 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64" /> | 27 | <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64" /> |