@joebigelow / wix / commits / dcf13e60

Remove ARM32

Bob Arnson committed Sep 22, 2020 at 21:58 UTC dcf13e60f0b165a8942e7e7d98f5f0702f7d1e84

10 files changed +21 -53

appveyor.cmd

-2

@@ -9,12 +9,10 @@ msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 || exit /b

10 msbuild -p:Configuration=%_C%;Platform=x86;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

12 msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 || exit /b

14 msbuild -p:Configuration=%_C%;Platform=x86;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

16 msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b

18 dotnet test -c %_C% --no-build src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b

src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec

-2

@@ -21,8 +21,6 @@

21 <file src="net20\$id$.dll" target="lib\net20" />

22 <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />

24 - <file src="v142\ARM\mbanative.dll" target="runtimes\win-arm\native" />

25 - <file src="v142\ARM\mbanative.pdb" target="runtimes\win-arm\native" />

24 <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />

25 <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" />

26 <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" />

src/balutil/balutil.nuspec

-2

@@ -23,11 +23,9 @@

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" />

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" />

26 <file src="..\..\build\$configuration$\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" />

27 <file src="..\..\build\$configuration$\v142\x86\balutil.lib" target="build\native\v142\x86" />

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" />

29 <file src="..\..\build\$configuration$\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" />

30 </files>

31 </package>

src/balutil/balutil.vcxproj

+6 -14

@@ -3,29 +3,21 @@

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')" />

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')" />

8 <ItemGroup Label="ProjectConfigurations">

9 - <ProjectConfiguration Include="Debug|ARM">

10 - <Configuration>Debug</Configuration>

11 - <Platform>ARM</Platform>

12 - </ProjectConfiguration>

9 <ProjectConfiguration Include="Debug|ARM64">

10 <Configuration>Debug</Configuration>

11 <Platform>ARM64</Platform>

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>

13 <ProjectConfiguration Include="Release|ARM64">

14 <Configuration>Release</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|Win32">

22 <Configuration>Release</Configuration>

23 <Platform>Win32</Platform>

@@ -107,7 +99,7 @@

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>

100 </PropertyGroup>

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'))" />

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'))" />

104 </Target>

105 </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.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

src/bextutil/bextutil.nuspec

-2

@@ -23,11 +23,9 @@

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" />

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" />

26 <file src="..\..\build\$configuration$\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" />

27 <file src="..\..\build\$configuration$\v142\x86\bextutil.lib" target="build\native\v142\x86" />

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" />

29 <file src="..\..\build\$configuration$\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" />

30 </files>

31 </package>

src/bextutil/bextutil.vcxproj

+6 -14

@@ -3,29 +3,21 @@

4 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

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')" />

8 <ItemGroup Label="ProjectConfigurations">

9 - <ProjectConfiguration Include="Debug|ARM">

10 - <Configuration>Debug</Configuration>

11 - <Platform>ARM</Platform>

12 - </ProjectConfiguration>

9 <ProjectConfiguration Include="Debug|ARM64">

10 <Configuration>Debug</Configuration>

11 <Platform>ARM64</Platform>

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>

13 <ProjectConfiguration Include="Release|ARM64">

14 <Configuration>Release</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|Win32">

22 <Configuration>Release</Configuration>

23 <Platform>Win32</Platform>

@@ -96,7 +88,7 @@

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>

89 </PropertyGroup>

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'))" />

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'))" />

93 </Target>

94 </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.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

src/mbanative/mbanative.vcxproj

+6 -14

@@ -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')" />

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')" />

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')" />

11 <ItemGroup Label="ProjectConfigurations">

12 - <ProjectConfiguration Include="Debug|ARM">

13 - <Configuration>Debug</Configuration>

14 - <Platform>ARM</Platform>

15 - </ProjectConfiguration>

12 <ProjectConfiguration Include="Debug|ARM64">

13 <Configuration>Debug</Configuration>

14 <Platform>ARM64</Platform>

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>

16 <ProjectConfiguration Include="Release|ARM64">

17 <Configuration>Release</Configuration>

18 <Platform>ARM64</Platform>

19 </ProjectConfiguration>

20 + <ProjectConfiguration Include="Debug|Win32">

21 + <Configuration>Debug</Configuration>

22 + <Platform>Win32</Platform>

23 + </ProjectConfiguration>

24 <ProjectConfiguration Include="Release|Win32">

25 <Configuration>Release</Configuration>

26 <Platform>Win32</Platform>

@@ -103,6 +95,6 @@

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'))" />

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'))" />

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'))" />

99 </Target>

100 </Project>

\ No newline at end of file

src/mbanative/packages.config

+1 -1

@@ -5,5 +5,5 @@

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" />

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