aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-06-18 21:58:51 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-06-18 22:08:12 +1000
commit1571b2e9a0dc0925e8d4bfacc19d7acd29068ff8 (patch)
tree97702e3c53055554a60a009e37de2dd21b3fa479 /src
parentb7ee8f1eaa4e67b3eeba426b4bc528b35042dbea (diff)
downloadwix-1571b2e9a0dc0925e8d4bfacc19d7acd29068ff8.tar.gz
wix-1571b2e9a0dc0925e8d4bfacc19d7acd29068ff8.tar.bz2
wix-1571b2e9a0dc0925e8d4bfacc19d7acd29068ff8.zip
Add v142, x64, ARM, and ARM64.
Diffstat (limited to 'src')
-rw-r--r--src/balutil/balutil.nuspec8
-rw-r--r--src/balutil/balutil.vcxproj22
-rw-r--r--src/balutil/build/WixToolset.BalUtil.props5
-rw-r--r--src/balutil/packages.config2
-rw-r--r--src/bextutil/bextutil.nuspec8
-rw-r--r--src/bextutil/bextutil.vcxproj22
-rw-r--r--src/bextutil/build/WixToolset.BextUtil.props5
-rw-r--r--src/bextutil/packages.config2
-rw-r--r--src/mbanative/mbanative.vcxproj22
-rw-r--r--src/mbanative/packages.config2
-rw-r--r--src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec10
-rw-r--r--src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj4
12 files changed, 94 insertions, 18 deletions
diff --git a/src/balutil/balutil.nuspec b/src/balutil/balutil.nuspec
index e82610e3..b9d8d139 100644
--- a/src/balutil/balutil.nuspec
+++ b/src/balutil/balutil.nuspec
@@ -21,6 +21,14 @@
21 <file src="build\$id$.props" target="build\" /> 21 <file src="build\$id$.props" target="build\" />
22 <file src="inc\*" target="build\native\include" /> 22 <file src="inc\*" target="build\native\include" />
23 <file src="..\..\build\$configuration$\v140\x86\balutil.lib" target="build\native\v140\x86" /> 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" />
24 <file src="..\..\build\$configuration$\v141\x86\balutil.lib" target="build\native\v141\x86" /> 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" />
25 </files> 33 </files>
26</package> 34</package>
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj
index 31f0a9f7..f4207910 100644
--- a/src/balutil/balutil.vcxproj
+++ b/src/balutil/balutil.vcxproj
@@ -3,13 +3,29 @@
3 3
4<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 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')" /> 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 7
8 <ItemGroup Label="ProjectConfigurations"> 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>
9 <ProjectConfiguration Include="Debug|Win32"> 17 <ProjectConfiguration Include="Debug|Win32">
10 <Configuration>Debug</Configuration> 18 <Configuration>Debug</Configuration>
11 <Platform>Win32</Platform> 19 <Platform>Win32</Platform>
12 </ProjectConfiguration> 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>
13 <ProjectConfiguration Include="Release|Win32"> 29 <ProjectConfiguration Include="Release|Win32">
14 <Configuration>Release</Configuration> 30 <Configuration>Release</Configuration>
15 <Platform>Win32</Platform> 31 <Platform>Win32</Platform>
@@ -28,7 +44,7 @@
28 <ProjectGuid>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</ProjectGuid> 44 <ProjectGuid>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</ProjectGuid>
29 <ConfigurationType>StaticLibrary</ConfigurationType> 45 <ConfigurationType>StaticLibrary</ConfigurationType>
30 <TargetName>balutil</TargetName> 46 <TargetName>balutil</TargetName>
31 <PlatformToolset>v141</PlatformToolset> 47 <PlatformToolset>v142</PlatformToolset>
32 <CharacterSet>MultiByte</CharacterSet> 48 <CharacterSet>MultiByte</CharacterSet>
33 <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description> 49 <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description>
34 </PropertyGroup> 50 </PropertyGroup>
@@ -91,7 +107,7 @@
91 <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> 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>
92 </PropertyGroup> 108 </PropertyGroup>
93 <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'))" /> 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'))" />
95 <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'))" /> 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'))" />
96 </Target> 112 </Target>
97</Project> 113</Project>
diff --git a/src/balutil/build/WixToolset.BalUtil.props b/src/balutil/build/WixToolset.BalUtil.props
index 0c92a3fb..45b97f6a 100644
--- a/src/balutil/build/WixToolset.BalUtil.props
+++ b/src/balutil/build/WixToolset.BalUtil.props
@@ -20,4 +20,9 @@
20 <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> 20 <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
21 </Link> 21 </Link>
22 </ItemDefinitionGroup> 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>
23</Project> 28</Project>
diff --git a/src/balutil/packages.config b/src/balutil/packages.config
index 251df9d0..be537005 100644
--- a/src/balutil/packages.config
+++ b/src/balutil/packages.config
@@ -2,5 +2,5 @@
2<packages> 2<packages>
3 <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> 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" /> 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 6</packages> \ No newline at end of file
diff --git a/src/bextutil/bextutil.nuspec b/src/bextutil/bextutil.nuspec
index 40488610..a1276b6f 100644
--- a/src/bextutil/bextutil.nuspec
+++ b/src/bextutil/bextutil.nuspec
@@ -21,6 +21,14 @@
21 <file src="build\$id$.props" target="build\" /> 21 <file src="build\$id$.props" target="build\" />
22 <file src="inc\*" target="build\native\include" /> 22 <file src="inc\*" target="build\native\include" />
23 <file src="..\..\build\$configuration$\v140\x86\bextutil.lib" target="build\native\v140\x86" /> 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" />
24 <file src="..\..\build\$configuration$\v141\x86\bextutil.lib" target="build\native\v141\x86" /> 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" />
25 </files> 33 </files>
26</package> 34</package>
diff --git a/src/bextutil/bextutil.vcxproj b/src/bextutil/bextutil.vcxproj
index d6fa3816..b4aee2c7 100644
--- a/src/bextutil/bextutil.vcxproj
+++ b/src/bextutil/bextutil.vcxproj
@@ -3,13 +3,29 @@
3 3
4<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 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')" /> 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 7
8 <ItemGroup Label="ProjectConfigurations"> 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>
9 <ProjectConfiguration Include="Debug|Win32"> 17 <ProjectConfiguration Include="Debug|Win32">
10 <Configuration>Debug</Configuration> 18 <Configuration>Debug</Configuration>
11 <Platform>Win32</Platform> 19 <Platform>Win32</Platform>
12 </ProjectConfiguration> 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>
13 <ProjectConfiguration Include="Release|Win32"> 29 <ProjectConfiguration Include="Release|Win32">
14 <Configuration>Release</Configuration> 30 <Configuration>Release</Configuration>
15 <Platform>Win32</Platform> 31 <Platform>Win32</Platform>
@@ -28,7 +44,7 @@
28 <ProjectGuid>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</ProjectGuid> 44 <ProjectGuid>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</ProjectGuid>
29 <ConfigurationType>StaticLibrary</ConfigurationType> 45 <ConfigurationType>StaticLibrary</ConfigurationType>
30 <TargetName>bextutil</TargetName> 46 <TargetName>bextutil</TargetName>
31 <PlatformToolset>v141</PlatformToolset> 47 <PlatformToolset>v142</PlatformToolset>
32 <CharacterSet>MultiByte</CharacterSet> 48 <CharacterSet>MultiByte</CharacterSet>
33 <Description>WiX Toolset Bundle Extension native utility library</Description> 49 <Description>WiX Toolset Bundle Extension native utility library</Description>
34 </PropertyGroup> 50 </PropertyGroup>
@@ -80,7 +96,7 @@
80 <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> 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>
81 </PropertyGroup> 97 </PropertyGroup>
82 <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'))" /> 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'))" />
84 <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'))" /> 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'))" />
85 </Target> 101 </Target>
86</Project> 102</Project>
diff --git a/src/bextutil/build/WixToolset.BextUtil.props b/src/bextutil/build/WixToolset.BextUtil.props
index 3e2980ec..60a2db54 100644
--- a/src/bextutil/build/WixToolset.BextUtil.props
+++ b/src/bextutil/build/WixToolset.BextUtil.props
@@ -20,4 +20,9 @@
20 <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies> 20 <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
21 </Link> 21 </Link>
22 </ItemDefinitionGroup> 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>
23</Project> 28</Project>
diff --git a/src/bextutil/packages.config b/src/bextutil/packages.config
index 251df9d0..be537005 100644
--- a/src/bextutil/packages.config
+++ b/src/bextutil/packages.config
@@ -2,5 +2,5 @@
2<packages> 2<packages>
3 <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> 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" /> 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 6</packages> \ No newline at end of file
diff --git a/src/mbanative/mbanative.vcxproj b/src/mbanative/mbanative.vcxproj
index 0a740a9f..29842a9b 100644
--- a/src/mbanative/mbanative.vcxproj
+++ b/src/mbanative/mbanative.vcxproj
@@ -3,13 +3,29 @@
3 3
4<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 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')" /> 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 7
8 <ItemGroup Label="ProjectConfigurations"> 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>
9 <ProjectConfiguration Include="Debug|Win32"> 17 <ProjectConfiguration Include="Debug|Win32">
10 <Configuration>Debug</Configuration> 18 <Configuration>Debug</Configuration>
11 <Platform>Win32</Platform> 19 <Platform>Win32</Platform>
12 </ProjectConfiguration> 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>
13 <ProjectConfiguration Include="Release|Win32"> 29 <ProjectConfiguration Include="Release|Win32">
14 <Configuration>Release</Configuration> 30 <Configuration>Release</Configuration>
15 <Platform>Win32</Platform> 31 <Platform>Win32</Platform>
@@ -27,7 +43,7 @@
27 <PropertyGroup Label="Globals"> 43 <PropertyGroup Label="Globals">
28 <ProjectGuid>{665E0441-17F9-4105-B202-EDF274657F6E}</ProjectGuid> 44 <ProjectGuid>{665E0441-17F9-4105-B202-EDF274657F6E}</ProjectGuid>
29 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
30 <PlatformToolset>v141</PlatformToolset> 46 <PlatformToolset>v142</PlatformToolset>
31 <CharacterSet>Unicode</CharacterSet> 47 <CharacterSet>Unicode</CharacterSet>
32 <TargetName>mbanative</TargetName> 48 <TargetName>mbanative</TargetName>
33 <ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile> 49 <ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile>
@@ -78,7 +94,7 @@
78 <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> 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>
79 </PropertyGroup> 95 </PropertyGroup>
80 <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'))" /> 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'))" />
82 <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'))" /> 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'))" />
83 </Target> 99 </Target>
84</Project> 100</Project>
diff --git a/src/mbanative/packages.config b/src/mbanative/packages.config
index 251df9d0..be537005 100644
--- a/src/mbanative/packages.config
+++ b/src/mbanative/packages.config
@@ -2,5 +2,5 @@
2<packages> 2<packages>
3 <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> 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" /> 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 6</packages> \ No newline at end of file
diff --git a/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec b/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
index a8546092..c95531da 100644
--- a/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
+++ b/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
@@ -13,7 +13,13 @@
13 </metadata> 13 </metadata>
14 14
15 <files> 15 <files>
16 <file src="v141\x86\mbanative.dll" target="runtimes\win-x86\native" /> 16 <file src="v142\x86\mbanative.dll" target="runtimes\win-x86\native" />
17 <file src="v141\x86\mbanative.pdb" 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" />
18 </files> 24 </files>
19</package> 25</package>
diff --git a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
index 8691f89f..34a51a05 100644
--- a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+++ b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -8,10 +8,6 @@
8 <RuntimeIdentifier>win-x86</RuntimeIdentifier> 8 <RuntimeIdentifier>win-x86</RuntimeIdentifier>
9 </PropertyGroup> 9 </PropertyGroup>
10 10
11 <PropertyGroup>
12 <NoWarn>NU1701</NoWarn>
13 </PropertyGroup>
14
15 <ItemGroup> 11 <ItemGroup>
16 <ProjectReference Include="..\..\mbanative\mbanative.vcxproj"> 12 <ProjectReference Include="..\..\mbanative\mbanative.vcxproj">
17 <Project>{665E0441-17F9-4105-B202-EDF274657F6E}</Project> 13 <Project>{665E0441-17F9-4105-B202-EDF274657F6E}</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-23 04:27:36 +0000