Add v142, x64, ARM, and ARM64.
Sean Hall committed
Jun 18, 2020 at 21:58 UTC
1571b2e9a0dc0925e8d4bfacc19d7acd29068ff8
14 files changed
+149
-19
appveyor.cmd
+9
@@ -5,8 +5,17 @@
5
nuget restore
6
7
msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140
8
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140
9
10
msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141
11
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141
12
+msbuild -p:Configuration=%_C%;Platform=ARM;PlatformToolset=v141
13
+msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141
14
+
15
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142
16
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142
17
+msbuild -p:Configuration=%_C%;Platform=ARM;PlatformToolset=v142
18
+msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142
19
20
@rem msbuild -t:VSTest -p:Configuration=%_C% src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj
21
balutil.sln
+46
-1
@@ -15,47 +15,92 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "
15
EndProject
16
Global
17
GlobalSection(SolutionConfigurationPlatforms) = preSolution
18
+ Debug|ARM = Debug|ARM
19
+ Debug|ARM64 = Debug|ARM64
20
Debug|x64 = Debug|x64
21
Debug|x86 = Debug|x86
22
+ Release|ARM = Release|ARM
23
+ Release|ARM64 = Release|ARM64
24
Release|x64 = Release|x64
25
Release|x86 = Release|x86
26
EndGlobalSection
27
GlobalSection(ProjectConfigurationPlatforms) = postSolution
28
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM.ActiveCfg = Debug|ARM
29
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM.Build.0 = Debug|ARM
30
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM64.ActiveCfg = Debug|ARM64
31
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM64.Build.0 = Debug|ARM64
32
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x64.ActiveCfg = Debug|x64
33
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x64.Build.0 = Debug|x64
34
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x86.ActiveCfg = Debug|Win32
35
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x86.Build.0 = Debug|Win32
36
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM.ActiveCfg = Release|ARM
37
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM.Build.0 = Release|ARM
38
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM64.ActiveCfg = Release|ARM64
39
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM64.Build.0 = Release|ARM64
40
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.ActiveCfg = Release|x64
41
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.Build.0 = Release|x64
42
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.ActiveCfg = Release|Win32
43
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.Build.0 = Release|Win32
44
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM.ActiveCfg = Debug|ARM
45
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM.Build.0 = Debug|ARM
46
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM64.ActiveCfg = Debug|ARM64
47
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM64.Build.0 = Debug|ARM64
48
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x64.ActiveCfg = Debug|x64
49
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x64.Build.0 = Debug|x64
50
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x86.ActiveCfg = Debug|Win32
51
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x86.Build.0 = Debug|Win32
52
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM.ActiveCfg = Release|ARM
53
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM.Build.0 = Release|ARM
54
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM64.ActiveCfg = Release|ARM64
55
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM64.Build.0 = Release|ARM64
56
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x64.ActiveCfg = Release|x64
57
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x64.Build.0 = Release|x64
58
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x86.ActiveCfg = Release|Win32
59
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x86.Build.0 = Release|Win32
60
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|ARM.ActiveCfg = Debug|Any CPU
61
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|ARM.Build.0 = Debug|Any CPU
62
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
63
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|ARM64.Build.0 = Debug|Any CPU
64
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x64.ActiveCfg = Debug|Any CPU
65
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x64.Build.0 = Debug|Any CPU
66
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x86.ActiveCfg = Debug|Any CPU
67
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x86.Build.0 = Debug|Any CPU
68
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|ARM.ActiveCfg = Release|Any CPU
69
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|ARM.Build.0 = Release|Any CPU
70
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|ARM64.ActiveCfg = Release|Any CPU
71
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|ARM64.Build.0 = Release|Any CPU
72
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x64.ActiveCfg = Release|Any CPU
73
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x64.Build.0 = Release|Any CPU
74
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x86.ActiveCfg = Release|Any CPU
75
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x86.Build.0 = Release|Any CPU
76
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM.ActiveCfg = Debug|ARM
77
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM.Build.0 = Debug|ARM
78
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM64.ActiveCfg = Debug|ARM64
79
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM64.Build.0 = Debug|ARM64
80
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x64.ActiveCfg = Debug|x64
81
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x64.Build.0 = Debug|x64
82
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x86.ActiveCfg = Debug|Win32
83
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x86.Build.0 = Debug|Win32
52
- {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.ActiveCfg = Release|Win32
84
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM.ActiveCfg = Release|ARM
85
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM.Build.0 = Release|ARM
86
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM64.ActiveCfg = Release|ARM64
87
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM64.Build.0 = Release|ARM64
88
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.ActiveCfg = Release|x64
89
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.Build.0 = Release|x64
90
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.ActiveCfg = Release|Win32
91
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.Build.0 = Release|Win32
92
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|ARM.ActiveCfg = Debug|Any CPU
93
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|ARM.Build.0 = Debug|Any CPU
94
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
95
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|ARM64.Build.0 = Debug|Any CPU
96
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x64.ActiveCfg = Debug|Any CPU
97
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x64.Build.0 = Debug|Any CPU
98
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x86.ActiveCfg = Debug|Any CPU
99
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x86.Build.0 = Debug|Any CPU
100
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|ARM.ActiveCfg = Release|Any CPU
101
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|ARM.Build.0 = Release|Any CPU
102
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|ARM64.ActiveCfg = Release|Any CPU
103
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|ARM64.Build.0 = Release|Any CPU
104
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|x64.ActiveCfg = Release|Any CPU
105
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|x64.Build.0 = Release|Any CPU
106
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|x86.ActiveCfg = Release|Any CPU
src/balutil/balutil.nuspec
+8
@@ -21,6 +21,14 @@
21
<file src="build\$id$.props" target="build\" />
22
<file src="inc\*" target="build\native\include" />
23
<file src="..\..\build\$configuration$\v140\x86\balutil.lib" target="build\native\v140\x86" />
24
+ <file src="..\..\build\$configuration$\v140\x64\balutil.lib" target="build\native\v140\x64" />
25
<file src="..\..\build\$configuration$\v141\x86\balutil.lib" target="build\native\v141\x86" />
26
+ <file src="..\..\build\$configuration$\v141\x64\balutil.lib" target="build\native\v141\x64" />
27
+ <file src="..\..\build\$configuration$\v141\ARM\balutil.lib" target="build\native\v141\ARM" />
28
+ <file src="..\..\build\$configuration$\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" />
29
+ <file src="..\..\build\$configuration$\v142\x86\balutil.lib" target="build\native\v142\x86" />
30
+ <file src="..\..\build\$configuration$\v142\x64\balutil.lib" target="build\native\v142\x64" />
31
+ <file src="..\..\build\$configuration$\v142\ARM\balutil.lib" target="build\native\v142\ARM" />
32
+ <file src="..\..\build\$configuration$\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" />
33
</files>
34
</package>
src/balutil/balutil.vcxproj
+19
-3
@@ -3,13 +3,29 @@
3
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
6
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
6
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
7
8
<ItemGroup Label="ProjectConfigurations">
9
+ <ProjectConfiguration Include="Debug|ARM">
10
+ <Configuration>Debug</Configuration>
11
+ <Platform>ARM</Platform>
12
+ </ProjectConfiguration>
13
+ <ProjectConfiguration Include="Debug|ARM64">
14
+ <Configuration>Debug</Configuration>
15
+ <Platform>ARM64</Platform>
16
+ </ProjectConfiguration>
17
<ProjectConfiguration Include="Debug|Win32">
18
<Configuration>Debug</Configuration>
19
<Platform>Win32</Platform>
20
</ProjectConfiguration>
21
+ <ProjectConfiguration Include="Release|ARM">
22
+ <Configuration>Release</Configuration>
23
+ <Platform>ARM</Platform>
24
+ </ProjectConfiguration>
25
+ <ProjectConfiguration Include="Release|ARM64">
26
+ <Configuration>Release</Configuration>
27
+ <Platform>ARM64</Platform>
28
+ </ProjectConfiguration>
29
<ProjectConfiguration Include="Release|Win32">
30
<Configuration>Release</Configuration>
31
<Platform>Win32</Platform>
@@ -28,7 +44,7 @@
44
<ProjectGuid>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</ProjectGuid>
45
<ConfigurationType>StaticLibrary</ConfigurationType>
46
<TargetName>balutil</TargetName>
31
- <PlatformToolset>v141</PlatformToolset>
47
+ <PlatformToolset>v142</PlatformToolset>
48
<CharacterSet>MultiByte</CharacterSet>
49
<Description>WiX Toolset Bootstrapper Application Layer native utility library</Description>
50
</PropertyGroup>
@@ -91,7 +107,7 @@
107
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
108
</PropertyGroup>
109
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
94
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
110
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
111
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
112
</Target>
113
</Project>
src/balutil/build/WixToolset.BalUtil.props
+5
@@ -20,4 +20,9 @@
20
<AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
21
</Link>
22
</ItemDefinitionGroup>
23
+ <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
24
+ <Link>
25
+ <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
26
+ </Link>
27
+ </ItemDefinitionGroup>
28
</Project>
src/balutil/packages.config
+1
-1
@@ -2,5 +2,5 @@
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5
- <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
5
+ <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
6
</packages>
\ No newline at end of file
src/bextutil/bextutil.nuspec
+8
@@ -21,6 +21,14 @@
21
<file src="build\$id$.props" target="build\" />
22
<file src="inc\*" target="build\native\include" />
23
<file src="..\..\build\$configuration$\v140\x86\bextutil.lib" target="build\native\v140\x86" />
24
+ <file src="..\..\build\$configuration$\v140\x64\bextutil.lib" target="build\native\v140\x64" />
25
<file src="..\..\build\$configuration$\v141\x86\bextutil.lib" target="build\native\v141\x86" />
26
+ <file src="..\..\build\$configuration$\v141\x64\bextutil.lib" target="build\native\v141\x64" />
27
+ <file src="..\..\build\$configuration$\v141\ARM\bextutil.lib" target="build\native\v141\ARM" />
28
+ <file src="..\..\build\$configuration$\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" />
29
+ <file src="..\..\build\$configuration$\v142\x86\bextutil.lib" target="build\native\v142\x86" />
30
+ <file src="..\..\build\$configuration$\v142\x64\bextutil.lib" target="build\native\v142\x64" />
31
+ <file src="..\..\build\$configuration$\v142\ARM\bextutil.lib" target="build\native\v142\ARM" />
32
+ <file src="..\..\build\$configuration$\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" />
33
</files>
34
</package>
src/bextutil/bextutil.vcxproj
+19
-3
@@ -3,13 +3,29 @@
3
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
6
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
6
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
7
8
<ItemGroup Label="ProjectConfigurations">
9
+ <ProjectConfiguration Include="Debug|ARM">
10
+ <Configuration>Debug</Configuration>
11
+ <Platform>ARM</Platform>
12
+ </ProjectConfiguration>
13
+ <ProjectConfiguration Include="Debug|ARM64">
14
+ <Configuration>Debug</Configuration>
15
+ <Platform>ARM64</Platform>
16
+ </ProjectConfiguration>
17
<ProjectConfiguration Include="Debug|Win32">
18
<Configuration>Debug</Configuration>
19
<Platform>Win32</Platform>
20
</ProjectConfiguration>
21
+ <ProjectConfiguration Include="Release|ARM">
22
+ <Configuration>Release</Configuration>
23
+ <Platform>ARM</Platform>
24
+ </ProjectConfiguration>
25
+ <ProjectConfiguration Include="Release|ARM64">
26
+ <Configuration>Release</Configuration>
27
+ <Platform>ARM64</Platform>
28
+ </ProjectConfiguration>
29
<ProjectConfiguration Include="Release|Win32">
30
<Configuration>Release</Configuration>
31
<Platform>Win32</Platform>
@@ -28,7 +44,7 @@
44
<ProjectGuid>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</ProjectGuid>
45
<ConfigurationType>StaticLibrary</ConfigurationType>
46
<TargetName>bextutil</TargetName>
31
- <PlatformToolset>v141</PlatformToolset>
47
+ <PlatformToolset>v142</PlatformToolset>
48
<CharacterSet>MultiByte</CharacterSet>
49
<Description>WiX Toolset Bundle Extension native utility library</Description>
50
</PropertyGroup>
@@ -80,7 +96,7 @@
96
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
97
</PropertyGroup>
98
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
83
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
99
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
100
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
101
</Target>
102
</Project>
src/bextutil/build/WixToolset.BextUtil.props
+5
@@ -20,4 +20,9 @@
20
<AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
21
</Link>
22
</ItemDefinitionGroup>
23
+ <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
24
+ <Link>
25
+ <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
26
+ </Link>
27
+ </ItemDefinitionGroup>
28
</Project>
src/bextutil/packages.config
+1
-1
@@ -2,5 +2,5 @@
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5
- <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
5
+ <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
6
</packages>
\ No newline at end of file
src/mbanative/mbanative.vcxproj
+19
-3
@@ -3,13 +3,29 @@
3
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
6
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
6
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
7
8
<ItemGroup Label="ProjectConfigurations">
9
+ <ProjectConfiguration Include="Debug|ARM">
10
+ <Configuration>Debug</Configuration>
11
+ <Platform>ARM</Platform>
12
+ </ProjectConfiguration>
13
+ <ProjectConfiguration Include="Debug|ARM64">
14
+ <Configuration>Debug</Configuration>
15
+ <Platform>ARM64</Platform>
16
+ </ProjectConfiguration>
17
<ProjectConfiguration Include="Debug|Win32">
18
<Configuration>Debug</Configuration>
19
<Platform>Win32</Platform>
20
</ProjectConfiguration>
21
+ <ProjectConfiguration Include="Release|ARM">
22
+ <Configuration>Release</Configuration>
23
+ <Platform>ARM</Platform>
24
+ </ProjectConfiguration>
25
+ <ProjectConfiguration Include="Release|ARM64">
26
+ <Configuration>Release</Configuration>
27
+ <Platform>ARM64</Platform>
28
+ </ProjectConfiguration>
29
<ProjectConfiguration Include="Release|Win32">
30
<Configuration>Release</Configuration>
31
<Platform>Win32</Platform>
@@ -27,7 +43,7 @@
43
<PropertyGroup Label="Globals">
44
<ProjectGuid>{665E0441-17F9-4105-B202-EDF274657F6E}</ProjectGuid>
45
<ConfigurationType>DynamicLibrary</ConfigurationType>
30
- <PlatformToolset>v141</PlatformToolset>
46
+ <PlatformToolset>v142</PlatformToolset>
47
<CharacterSet>Unicode</CharacterSet>
48
<TargetName>mbanative</TargetName>
49
<ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile>
@@ -78,7 +94,7 @@
94
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
95
</PropertyGroup>
96
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
81
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
97
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
98
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
99
</Target>
100
</Project>
src/mbanative/packages.config
+1
-1
@@ -2,5 +2,5 @@
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5
- <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
5
+ <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
6
</packages>
\ No newline at end of file
src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
+8
-2
@@ -13,7 +13,13 @@
13
</metadata>
14
15
<files>
16
- <file src="v141\x86\mbanative.dll" target="runtimes\win-x86\native" />
17
- <file src="v141\x86\mbanative.pdb" target="runtimes\win-x86\native" />
16
+ <file src="v142\x86\mbanative.dll" target="runtimes\win-x86\native" />
17
+ <file src="v142\x86\mbanative.pdb" target="runtimes\win-x86\native" />
18
+ <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" />
19
+ <file src="v142\x64\mbanative.pdb" target="runtimes\win-x64\native" />
20
+ <file src="v142\ARM\mbanative.dll" target="runtimes\win-arm\native" />
21
+ <file src="v142\ARM\mbanative.pdb" target="runtimes\win-arm\native" />
22
+ <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
23
+ <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" />
24
</files>
25
</package>
src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
-4
@@ -8,10 +8,6 @@
8
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
9
</PropertyGroup>
10
11
- <PropertyGroup>
12
- <NoWarn>NU1701</NoWarn>
13
- </PropertyGroup>
14
-
11
<ItemGroup>
12
<ProjectReference Include="..\..\mbanative\mbanative.vcxproj">
13
<Project>{665E0441-17F9-4105-B202-EDF274657F6E}</Project>