aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Directory.Build.props2
-rw-r--r--src/Directory.vcxproj.props3
-rw-r--r--src/api/burn/balutil/balutil.nuspec6
-rw-r--r--src/api/burn/bextutil/bextutil.nuspec6
-rw-r--r--src/libs/dutil/WixToolset.DUtil/dutil.nuspec6
-rw-r--r--src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec6
-rw-r--r--src/wix.vsconfig1
7 files changed, 14 insertions, 16 deletions
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index db9bf0b2..9f727a23 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -20,7 +20,7 @@
20 <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> 20 <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
21 21
22 <!-- This is C++-specific but used from managed projects to pick up native build artifacts. --> 22 <!-- This is C++-specific but used from managed projects to pick up native build artifacts. -->
23 <WixNativeSdkLibraryToolset>v141</WixNativeSdkLibraryToolset> 23 <WixNativeSdkLibraryToolset>v143</WixNativeSdkLibraryToolset>
24 <PlatformToolset Condition=" '$(ConfigurationType)' == 'StaticLibrary' ">$(WixNativeSdkLibraryToolset)</PlatformToolset> 24 <PlatformToolset Condition=" '$(ConfigurationType)' == 'StaticLibrary' ">$(WixNativeSdkLibraryToolset)</PlatformToolset>
25 <PlatformToolset Condition=" '$(PlatformToolset)' == '' ">v143</PlatformToolset> 25 <PlatformToolset Condition=" '$(PlatformToolset)' == '' ">v143</PlatformToolset>
26 26
diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props
index 9064973d..078309a2 100644
--- a/src/Directory.vcxproj.props
+++ b/src/Directory.vcxproj.props
@@ -10,9 +10,8 @@
10 <OutDir>$(OutputPath)$(PlatformFolder)\</OutDir> 10 <OutDir>$(OutputPath)$(PlatformFolder)\</OutDir>
11 </PropertyGroup> 11 </PropertyGroup>
12 12
13 <!-- This is needed for v141 toolset, which doesn't understand `10.0` -->
14 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''"> 13 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
15 <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> 14 <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
16 </PropertyGroup> 15 </PropertyGroup>
17 16
18 <PropertyGroup Condition=" '$(CLRSupport)'!='true' "> 17 <PropertyGroup Condition=" '$(CLRSupport)'!='true' ">
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec
index be51ec79..e412d891 100644
--- a/src/api/burn/balutil/balutil.nuspec
+++ b/src/api/burn/balutil/balutil.nuspec
@@ -22,8 +22,8 @@
22 <file src="$projectFolder$\build\$id$.props" target="build\" /> 22 <file src="$projectFolder$\build\$id$.props" target="build\" />
23 <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> 23 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
24 <file src="$projectFolder$\inc\*" target="build\native\include" /> 24 <file src="$projectFolder$\inc\*" target="build\native\include" />
25 <file src="..\..\v141\x86\balutil.lib" target="build\native\v14\x86" /> 25 <file src="..\..\v143\x86\balutil.lib" target="build\native\v14\x86" />
26 <file src="..\..\v141\x64\balutil.lib" target="build\native\v14\x64" /> 26 <file src="..\..\v143\x64\balutil.lib" target="build\native\v14\x64" />
27 <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v14\ARM64" /> 27 <file src="..\..\v143\ARM64\balutil.lib" target="build\native\v14\ARM64" />
28 </files> 28 </files>
29</package> 29</package>
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 125e8807..dd17e79d 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -22,8 +22,8 @@
22 <file src="$projectFolder$\build\$id$.props" target="build\" /> 22 <file src="$projectFolder$\build\$id$.props" target="build\" />
23 <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> 23 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
24 <file src="$projectFolder$\inc\*" target="build\native\include" /> 24 <file src="$projectFolder$\inc\*" target="build\native\include" />
25 <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" /> 25 <file src="..\..\v143\x86\bextutil.lib" target="build\native\v14\x86" />
26 <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" /> 26 <file src="..\..\v143\x64\bextutil.lib" target="build\native\v14\x64" />
27 <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" /> 27 <file src="..\..\v143\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
28 </files> 28 </files>
29</package> 29</package>
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
index 122ad9f9..a87da122 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
@@ -18,8 +18,8 @@
18 <file src="$projectFolder$\build\$id$.props" target="build\" /> 18 <file src="$projectFolder$\build\$id$.props" target="build\" />
19 <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> 19 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
20 <file src="$projectFolder$\inc\*" target="build\native\include" /> 20 <file src="$projectFolder$\inc\*" target="build\native\include" />
21 <file src="..\..\v141\x64\dutil.lib" target="build\native\v14\x64" /> 21 <file src="..\..\v143\x64\dutil.lib" target="build\native\v14\x64" />
22 <file src="..\..\v141\x86\dutil.lib" target="build\native\v14\x86" /> 22 <file src="..\..\v143\x86\dutil.lib" target="build\native\v14\x86" />
23 <file src="..\..\v141\ARM64\dutil.lib" target="build\native\v14\ARM64" /> 23 <file src="..\..\v143\ARM64\dutil.lib" target="build\native\v14\ARM64" />
24 </files> 24 </files>
25</package> 25</package>
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
index 74e925fe..c2c4159e 100644
--- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
@@ -21,8 +21,8 @@
21 <file src="$projectFolder$\build\$id$.props" target="build\" /> 21 <file src="$projectFolder$\build\$id$.props" target="build\" />
22 <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> 22 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
23 <file src="$projectFolder$\inc\*" target="build\native\include" /> 23 <file src="$projectFolder$\inc\*" target="build\native\include" />
24 <file src="..\..\v141\x64\wcautil.lib" target="build\native\v14\x64" /> 24 <file src="..\..\v143\x64\wcautil.lib" target="build\native\v14\x64" />
25 <file src="..\..\v141\x86\wcautil.lib" target="build\native\v14\x86" /> 25 <file src="..\..\v143\x86\wcautil.lib" target="build\native\v14\x86" />
26 <file src="..\..\v141\ARM64\wcautil.lib" target="build\native\v14\ARM64" /> 26 <file src="..\..\v143\ARM64\wcautil.lib" target="build\native\v14\ARM64" />
27 </files> 27 </files>
28</package> 28</package>
diff --git a/src/wix.vsconfig b/src/wix.vsconfig
index f72cc5e4..8fb74dfc 100644
--- a/src/wix.vsconfig
+++ b/src/wix.vsconfig
@@ -1,6 +1,5 @@
1{ 1{
2 "version": "1.0", 2 "version": "1.0",
3 "components": [ 3 "components": [
4 "Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre"
5 ] 4 ]
6} 5}