diff options
author | Bob Arnson <bob@firegiant.com> | 2020-09-22 21:58:43 -0400 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2020-09-22 22:11:14 -0400 |
commit | dcf13e60f0b165a8942e7e7d98f5f0702f7d1e84 (patch) | |
tree | 7a7e04ef2a13e24e51e51cc2ec290f24ee2b43f5 | |
parent | 522458420df786eb653009d616127e1060b3ab9b (diff) | |
download | wix-dcf13e60f0b165a8942e7e7d98f5f0702f7d1e84.tar.gz wix-dcf13e60f0b165a8942e7e7d98f5f0702f7d1e84.tar.bz2 wix-dcf13e60f0b165a8942e7e7d98f5f0702f7d1e84.zip |
Remove ARM32
-rw-r--r-- | appveyor.cmd | 2 | ||||
-rw-r--r-- | src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec | 2 | ||||
-rw-r--r-- | src/balutil/balutil.nuspec | 2 | ||||
-rw-r--r-- | src/balutil/balutil.vcxproj | 20 | ||||
-rw-r--r-- | src/balutil/packages.config | 2 | ||||
-rw-r--r-- | src/bextutil/bextutil.nuspec | 2 | ||||
-rw-r--r-- | src/bextutil/bextutil.vcxproj | 20 | ||||
-rw-r--r-- | src/bextutil/packages.config | 2 | ||||
-rw-r--r-- | src/mbanative/mbanative.vcxproj | 20 | ||||
-rw-r--r-- | src/mbanative/packages.config | 2 |
10 files changed, 21 insertions, 53 deletions
diff --git a/appveyor.cmd b/appveyor.cmd index 34f8beb0..3b170ad4 100644 --- a/appveyor.cmd +++ b/appveyor.cmd | |||
@@ -9,12 +9,10 @@ msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 || exit /b | |||
9 | 9 | ||
10 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 || exit /b | 10 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 || exit /b |
11 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 || exit /b | 11 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 || exit /b |
12 | msbuild -p:Configuration=%_C%;Platform=ARM;PlatformToolset=v141 || exit /b | ||
13 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 || exit /b | 12 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 || exit /b |
14 | 13 | ||
15 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 || exit /b | 14 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 || exit /b |
16 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 || exit /b | 15 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 || exit /b |
17 | msbuild -p:Configuration=%_C%;Platform=ARM;PlatformToolset=v142 || exit /b | ||
18 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b | 16 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b |
19 | 17 | ||
20 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b | 18 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b |
diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec index 3a9f05df..cf7d014d 100644 --- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec +++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec | |||
@@ -21,8 +21,6 @@ | |||
21 | <file src="net20\$id$.dll" target="lib\net20" /> | 21 | <file src="net20\$id$.dll" target="lib\net20" /> |
22 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> | 22 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> |
23 | 23 | ||
24 | <file src="v142\ARM\mbanative.dll" target="runtimes\win-arm\native" /> | ||
25 | <file src="v142\ARM\mbanative.pdb" target="runtimes\win-arm\native" /> | ||
26 | <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" /> | 24 | <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" /> |
27 | <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" /> | 25 | <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" /> |
28 | <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" /> | 26 | <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" /> |
diff --git a/src/balutil/balutil.nuspec b/src/balutil/balutil.nuspec index 60c32bb1..e38362ec 100644 --- a/src/balutil/balutil.nuspec +++ b/src/balutil/balutil.nuspec | |||
@@ -23,11 +23,9 @@ | |||
23 | <file src="..\..\build\$configuration$\v140\x64\balutil.lib" target="build\native\v140\x64" /> | 23 | <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" /> | 24 | <file src="..\..\build\$configuration$\v141\x86\balutil.lib" target="build\native\v141\x86" /> |
25 | <file src="..\..\build\$configuration$\v141\x64\balutil.lib" target="build\native\v141\x64" /> | 25 | <file src="..\..\build\$configuration$\v141\x64\balutil.lib" target="build\native\v141\x64" /> |
26 | <file src="..\..\build\$configuration$\v141\ARM\balutil.lib" target="build\native\v141\ARM" /> | ||
27 | <file src="..\..\build\$configuration$\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" /> | 26 | <file src="..\..\build\$configuration$\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" /> |
28 | <file src="..\..\build\$configuration$\v142\x86\balutil.lib" target="build\native\v142\x86" /> | 27 | <file src="..\..\build\$configuration$\v142\x86\balutil.lib" target="build\native\v142\x86" /> |
29 | <file src="..\..\build\$configuration$\v142\x64\balutil.lib" target="build\native\v142\x64" /> | 28 | <file src="..\..\build\$configuration$\v142\x64\balutil.lib" target="build\native\v142\x64" /> |
30 | <file src="..\..\build\$configuration$\v142\ARM\balutil.lib" target="build\native\v142\ARM" /> | ||
31 | <file src="..\..\build\$configuration$\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" /> | 29 | <file src="..\..\build\$configuration$\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" /> |
32 | </files> | 30 | </files> |
33 | </package> | 31 | </package> |
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj index 39be0bed..8697b5ab 100644 --- a/src/balutil/balutil.vcxproj +++ b/src/balutil/balutil.vcxproj | |||
@@ -3,29 +3,21 @@ | |||
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.33\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" /> | 5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" /> |
6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" /> | 6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.51\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.51\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"> | 9 | <ProjectConfiguration Include="Debug|ARM64"> |
14 | <Configuration>Debug</Configuration> | 10 | <Configuration>Debug</Configuration> |
15 | <Platform>ARM64</Platform> | 11 | <Platform>ARM64</Platform> |
16 | </ProjectConfiguration> | 12 | </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"> | 13 | <ProjectConfiguration Include="Release|ARM64"> |
26 | <Configuration>Release</Configuration> | 14 | <Configuration>Release</Configuration> |
27 | <Platform>ARM64</Platform> | 15 | <Platform>ARM64</Platform> |
28 | </ProjectConfiguration> | 16 | </ProjectConfiguration> |
17 | <ProjectConfiguration Include="Debug|Win32"> | ||
18 | <Configuration>Debug</Configuration> | ||
19 | <Platform>Win32</Platform> | ||
20 | </ProjectConfiguration> | ||
29 | <ProjectConfiguration Include="Release|Win32"> | 21 | <ProjectConfiguration Include="Release|Win32"> |
30 | <Configuration>Release</Configuration> | 22 | <Configuration>Release</Configuration> |
31 | <Platform>Win32</Platform> | 23 | <Platform>Win32</Platform> |
@@ -107,7 +99,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> | 99 | <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> | 100 | </PropertyGroup> |
109 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props'))" /> | 101 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props'))" /> |
110 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props'))" /> | 102 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.51\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.51\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'))" /> | 103 | <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> | 104 | </Target> |
113 | </Project> | 105 | </Project> |
diff --git a/src/balutil/packages.config b/src/balutil/packages.config index e8417860..4db0b6a7 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.33" targetFramework="native" /> | 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.33" targetFramework="native" /> |
5 | <package id="WixToolset.DUtil" version="4.0.49" targetFramework="native" /> | 5 | <package id="WixToolset.DUtil" version="4.0.51" 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 e8a08075..752dbb97 100644 --- a/src/bextutil/bextutil.nuspec +++ b/src/bextutil/bextutil.nuspec | |||
@@ -23,11 +23,9 @@ | |||
23 | <file src="..\..\build\$configuration$\v140\x64\bextutil.lib" target="build\native\v140\x64" /> | 23 | <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" /> | 24 | <file src="..\..\build\$configuration$\v141\x86\bextutil.lib" target="build\native\v141\x86" /> |
25 | <file src="..\..\build\$configuration$\v141\x64\bextutil.lib" target="build\native\v141\x64" /> | 25 | <file src="..\..\build\$configuration$\v141\x64\bextutil.lib" target="build\native\v141\x64" /> |
26 | <file src="..\..\build\$configuration$\v141\ARM\bextutil.lib" target="build\native\v141\ARM" /> | ||
27 | <file src="..\..\build\$configuration$\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" /> | 26 | <file src="..\..\build\$configuration$\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" /> |
28 | <file src="..\..\build\$configuration$\v142\x86\bextutil.lib" target="build\native\v142\x86" /> | 27 | <file src="..\..\build\$configuration$\v142\x86\bextutil.lib" target="build\native\v142\x86" /> |
29 | <file src="..\..\build\$configuration$\v142\x64\bextutil.lib" target="build\native\v142\x64" /> | 28 | <file src="..\..\build\$configuration$\v142\x64\bextutil.lib" target="build\native\v142\x64" /> |
30 | <file src="..\..\build\$configuration$\v142\ARM\bextutil.lib" target="build\native\v142\ARM" /> | ||
31 | <file src="..\..\build\$configuration$\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" /> | 29 | <file src="..\..\build\$configuration$\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" /> |
32 | </files> | 30 | </files> |
33 | </package> | 31 | </package> |
diff --git a/src/bextutil/bextutil.vcxproj b/src/bextutil/bextutil.vcxproj index 32518202..c27d8aee 100644 --- a/src/bextutil/bextutil.vcxproj +++ b/src/bextutil/bextutil.vcxproj | |||
@@ -3,29 +3,21 @@ | |||
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.33\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" /> | 5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" /> |
6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" /> | 6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.51\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.51\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"> | 9 | <ProjectConfiguration Include="Debug|ARM64"> |
14 | <Configuration>Debug</Configuration> | 10 | <Configuration>Debug</Configuration> |
15 | <Platform>ARM64</Platform> | 11 | <Platform>ARM64</Platform> |
16 | </ProjectConfiguration> | 12 | </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"> | 13 | <ProjectConfiguration Include="Release|ARM64"> |
26 | <Configuration>Release</Configuration> | 14 | <Configuration>Release</Configuration> |
27 | <Platform>ARM64</Platform> | 15 | <Platform>ARM64</Platform> |
28 | </ProjectConfiguration> | 16 | </ProjectConfiguration> |
17 | <ProjectConfiguration Include="Debug|Win32"> | ||
18 | <Configuration>Debug</Configuration> | ||
19 | <Platform>Win32</Platform> | ||
20 | </ProjectConfiguration> | ||
29 | <ProjectConfiguration Include="Release|Win32"> | 21 | <ProjectConfiguration Include="Release|Win32"> |
30 | <Configuration>Release</Configuration> | 22 | <Configuration>Release</Configuration> |
31 | <Platform>Win32</Platform> | 23 | <Platform>Win32</Platform> |
@@ -96,7 +88,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> | 88 | <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> | 89 | </PropertyGroup> |
98 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props'))" /> | 90 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props'))" /> |
99 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props'))" /> | 91 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.51\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.51\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'))" /> | 92 | <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> | 93 | </Target> |
102 | </Project> | 94 | </Project> |
diff --git a/src/bextutil/packages.config b/src/bextutil/packages.config index e8417860..4db0b6a7 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.33" targetFramework="native" /> | 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.33" targetFramework="native" /> |
5 | <package id="WixToolset.DUtil" version="4.0.49" targetFramework="native" /> | 5 | <package id="WixToolset.DUtil" version="4.0.51" 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 c2d0bded..3fe9ef6b 100644 --- a/src/mbanative/mbanative.vcxproj +++ b/src/mbanative/mbanative.vcxproj | |||
@@ -6,29 +6,21 @@ | |||
6 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> | 6 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> |
7 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> | 7 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> |
8 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" /> | 8 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" /> |
9 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" /> | 9 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.51\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.51\build\WixToolset.DUtil.props')" /> |
10 | 10 | ||
11 | <ItemGroup Label="ProjectConfigurations"> | 11 | <ItemGroup Label="ProjectConfigurations"> |
12 | <ProjectConfiguration Include="Debug|ARM"> | ||
13 | <Configuration>Debug</Configuration> | ||
14 | <Platform>ARM</Platform> | ||
15 | </ProjectConfiguration> | ||
16 | <ProjectConfiguration Include="Debug|ARM64"> | 12 | <ProjectConfiguration Include="Debug|ARM64"> |
17 | <Configuration>Debug</Configuration> | 13 | <Configuration>Debug</Configuration> |
18 | <Platform>ARM64</Platform> | 14 | <Platform>ARM64</Platform> |
19 | </ProjectConfiguration> | 15 | </ProjectConfiguration> |
20 | <ProjectConfiguration Include="Debug|Win32"> | ||
21 | <Configuration>Debug</Configuration> | ||
22 | <Platform>Win32</Platform> | ||
23 | </ProjectConfiguration> | ||
24 | <ProjectConfiguration Include="Release|ARM"> | ||
25 | <Configuration>Release</Configuration> | ||
26 | <Platform>ARM</Platform> | ||
27 | </ProjectConfiguration> | ||
28 | <ProjectConfiguration Include="Release|ARM64"> | 16 | <ProjectConfiguration Include="Release|ARM64"> |
29 | <Configuration>Release</Configuration> | 17 | <Configuration>Release</Configuration> |
30 | <Platform>ARM64</Platform> | 18 | <Platform>ARM64</Platform> |
31 | </ProjectConfiguration> | 19 | </ProjectConfiguration> |
20 | <ProjectConfiguration Include="Debug|Win32"> | ||
21 | <Configuration>Debug</Configuration> | ||
22 | <Platform>Win32</Platform> | ||
23 | </ProjectConfiguration> | ||
32 | <ProjectConfiguration Include="Release|Win32"> | 24 | <ProjectConfiguration Include="Release|Win32"> |
33 | <Configuration>Release</Configuration> | 25 | <Configuration>Release</Configuration> |
34 | <Platform>Win32</Platform> | 26 | <Platform>Win32</Platform> |
@@ -103,6 +95,6 @@ | |||
103 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> | 95 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> |
104 | <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 | <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'))" /> |
105 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props'))" /> | 97 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props'))" /> |
106 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props'))" /> | 98 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.51\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.51\build\WixToolset.DUtil.props'))" /> |
107 | </Target> | 99 | </Target> |
108 | </Project> \ No newline at end of file | 100 | </Project> \ No newline at end of file |
diff --git a/src/mbanative/packages.config b/src/mbanative/packages.config index c3c26daa..443e0094 100644 --- a/src/mbanative/packages.config +++ b/src/mbanative/packages.config | |||
@@ -5,5 +5,5 @@ | |||
5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | 5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> |
6 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> | 6 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> |
7 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.33" targetFramework="native" /> | 7 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.33" targetFramework="native" /> |
8 | <package id="WixToolset.DUtil" version="4.0.49" targetFramework="native" /> | 8 | <package id="WixToolset.DUtil" version="4.0.51" targetFramework="native" /> |
9 | </packages> \ No newline at end of file | 9 | </packages> \ No newline at end of file |