wixtoolset
/
balutil
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Add v142, x64, ARM, and ARM64.

This commit is contained in:
Sean Hall 2020-06-18 21:58:51 +10:00
Родитель b7ee8f1eaa
Коммит 1571b2e9a0
14 изменённых файлов: 149 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
appveyor.cmd
Просмотреть файл

@ -5,8 +5,17 @@
nuget restore
msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140
msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140
msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141
msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141
msbuild -p:Configuration=%_C%;Platform=ARM;PlatformToolset=v141
msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141
msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142
msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142
msbuild -p:Configuration=%_C%;Platform=ARM;PlatformToolset=v142
msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142
@rem msbuild -t:VSTest -p:Configuration=%_C% src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj

47
balutil.sln
Просмотреть файл

@ -15,47 +15,92 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM.ActiveCfg = Debug|ARM
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM.Build.0 = Debug|ARM
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM64.ActiveCfg = Debug|ARM64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM64.Build.0 = Debug|ARM64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x64.ActiveCfg = Debug|x64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x64.Build.0 = Debug|x64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x86.ActiveCfg = Debug|Win32
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x86.Build.0 = Debug|Win32
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM.ActiveCfg = Release|ARM
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM.Build.0 = Release|ARM
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM64.ActiveCfg = Release|ARM64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM64.Build.0 = Release|ARM64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.ActiveCfg = Release|x64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.Build.0 = Release|x64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.ActiveCfg = Release|Win32
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.Build.0 = Release|Win32
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM.ActiveCfg = Debug|ARM
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM.Build.0 = Debug|ARM
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM64.ActiveCfg = Debug|ARM64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM64.Build.0 = Debug|ARM64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x64.ActiveCfg = Debug|x64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x64.Build.0 = Debug|x64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x86.ActiveCfg = Debug|Win32
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x86.Build.0 = Debug|Win32
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM.ActiveCfg = Release|ARM
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM.Build.0 = Release|ARM
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM64.ActiveCfg = Release|ARM64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM64.Build.0 = Release|ARM64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x64.ActiveCfg = Release|x64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x64.Build.0 = Release|x64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x86.ActiveCfg = Release|Win32
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x86.Build.0 = Release|Win32
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|ARM.ActiveCfg = Debug|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|ARM.Build.0 = Debug|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|ARM64.Build.0 = Debug|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x64.ActiveCfg = Debug|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x64.Build.0 = Debug|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x86.ActiveCfg = Debug|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x86.Build.0 = Debug|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|ARM.ActiveCfg = Release|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|ARM.Build.0 = Release|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|ARM64.ActiveCfg = Release|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|ARM64.Build.0 = Release|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x64.ActiveCfg = Release|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x64.Build.0 = Release|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x86.ActiveCfg = Release|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x86.Build.0 = Release|Any CPU
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM.ActiveCfg = Debug|ARM
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM.Build.0 = Debug|ARM
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM64.ActiveCfg = Debug|ARM64
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM64.Build.0 = Debug|ARM64
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x64.ActiveCfg = Debug|x64
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x64.Build.0 = Debug|x64
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x86.ActiveCfg = Debug|Win32
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x86.Build.0 = Debug|Win32
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.ActiveCfg = Release|Win32
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM.ActiveCfg = Release|ARM
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM.Build.0 = Release|ARM
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM64.ActiveCfg = Release|ARM64
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM64.Build.0 = Release|ARM64
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.ActiveCfg = Release|x64
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.Build.0 = Release|x64
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.ActiveCfg = Release|Win32
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.Build.0 = Release|Win32
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|ARM.Build.0 = Debug|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|ARM64.Build.0 = Debug|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x64.ActiveCfg = Debug|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x64.Build.0 = Debug|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x86.ActiveCfg = Debug|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x86.Build.0 = Debug|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|ARM.ActiveCfg = Release|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|ARM.Build.0 = Release|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|ARM64.ActiveCfg = Release|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|ARM64.Build.0 = Release|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|x64.ActiveCfg = Release|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|x64.Build.0 = Release|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|x86.ActiveCfg = Release|Any CPU

8
src/balutil/balutil.nuspec
Просмотреть файл

@ -21,6 +21,14 @@
<file src="build\$id$.props" target="build\" />
<file src="inc\*" target="build\native\include" />
<file src="..\..\build\$configuration$\v140\x86\balutil.lib" target="build\native\v140\x86" />
<file src="..\..\build\$configuration$\v140\x64\balutil.lib" target="build\native\v140\x64" />
<file src="..\..\build\$configuration$\v141\x86\balutil.lib" target="build\native\v141\x86" />
<file src="..\..\build\$configuration$\v141\x64\balutil.lib" target="build\native\v141\x64" />
<file src="..\..\build\$configuration$\v141\ARM\balutil.lib" target="build\native\v141\ARM" />
<file src="..\..\build\$configuration$\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" />
<file src="..\..\build\$configuration$\v142\x86\balutil.lib" target="build\native\v142\x86" />
<file src="..\..\build\$configuration$\v142\x64\balutil.lib" target="build\native\v142\x64" />
<file src="..\..\build\$configuration$\v142\ARM\balutil.lib" target="build\native\v142\ARM" />
<file src="..\..\build\$configuration$\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" />
</files>
</package>

22
src/balutil/balutil.vcxproj
Просмотреть файл

@ -3,13 +3,29 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<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')" />
<Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
<Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -28,7 +44,7 @@
<ProjectGuid>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</ProjectGuid>
<ConfigurationType>StaticLibrary</ConfigurationType>
<TargetName>balutil</TargetName>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<Description>WiX Toolset Bootstrapper Application Layer native utility library</Description>
</PropertyGroup>
@ -91,7 +107,7 @@
<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>
</PropertyGroup>
<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'))" />
<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'))" />
<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'))" />
<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'))" />
</Target>
</Project>

5
src/balutil/build/WixToolset.BalUtil.props
Просмотреть файл

@ -20,4 +20,9 @@
<AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
<Link>
<AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
</Project>

2
src/balutil/packages.config
Просмотреть файл

@ -2,5 +2,5 @@
<packages>
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
<package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
<package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
</packages>

8
src/bextutil/bextutil.nuspec
Просмотреть файл

@ -21,6 +21,14 @@
<file src="build\$id$.props" target="build\" />
<file src="inc\*" target="build\native\include" />
<file src="..\..\build\$configuration$\v140\x86\bextutil.lib" target="build\native\v140\x86" />
<file src="..\..\build\$configuration$\v140\x64\bextutil.lib" target="build\native\v140\x64" />
<file src="..\..\build\$configuration$\v141\x86\bextutil.lib" target="build\native\v141\x86" />
<file src="..\..\build\$configuration$\v141\x64\bextutil.lib" target="build\native\v141\x64" />
<file src="..\..\build\$configuration$\v141\ARM\bextutil.lib" target="build\native\v141\ARM" />
<file src="..\..\build\$configuration$\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" />
<file src="..\..\build\$configuration$\v142\x86\bextutil.lib" target="build\native\v142\x86" />
<file src="..\..\build\$configuration$\v142\x64\bextutil.lib" target="build\native\v142\x64" />
<file src="..\..\build\$configuration$\v142\ARM\bextutil.lib" target="build\native\v142\ARM" />
<file src="..\..\build\$configuration$\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" />
</files>
</package>

22
src/bextutil/bextutil.vcxproj
Просмотреть файл

@ -3,13 +3,29 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<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')" />
<Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
<Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -28,7 +44,7 @@
<ProjectGuid>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</ProjectGuid>
<ConfigurationType>StaticLibrary</ConfigurationType>
<TargetName>bextutil</TargetName>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<Description>WiX Toolset Bundle Extension native utility library</Description>
</PropertyGroup>
@ -80,7 +96,7 @@
<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>
</PropertyGroup>
<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'))" />
<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'))" />
<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'))" />
<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'))" />
</Target>
</Project>

5
src/bextutil/build/WixToolset.BextUtil.props
Просмотреть файл

@ -20,4 +20,9 @@
<AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
<Link>
<AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
</Project>

2
src/bextutil/packages.config
Просмотреть файл

@ -2,5 +2,5 @@
<packages>
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
<package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
<package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
</packages>

22
src/mbanative/mbanative.vcxproj
Просмотреть файл

@ -3,13 +3,29 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<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')" />
<Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
<Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -27,7 +43,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{665E0441-17F9-4105-B202-EDF274657F6E}</ProjectGuid>
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<TargetName>mbanative</TargetName>
<ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile>
@ -78,7 +94,7 @@
<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>
</PropertyGroup>
<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'))" />
<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'))" />
<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'))" />
<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'))" />
</Target>
</Project>

2
src/mbanative/packages.config
Просмотреть файл

@ -2,5 +2,5 @@
<packages>
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
<package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
<package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
</packages>

10
src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
Просмотреть файл

@ -13,7 +13,13 @@
</metadata>
<files>
<file src="v141\x86\mbanative.dll" target="runtimes\win-x86\native" />
<file src="v141\x86\mbanative.pdb" target="runtimes\win-x86\native" />
<file src="v142\x86\mbanative.dll" target="runtimes\win-x86\native" />
<file src="v142\x86\mbanative.pdb" target="runtimes\win-x86\native" />
<file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" />
<file src="v142\x64\mbanative.pdb" target="runtimes\win-x64\native" />
<file src="v142\ARM\mbanative.dll" target="runtimes\win-arm\native" />
<file src="v142\ARM\mbanative.pdb" target="runtimes\win-arm\native" />
<file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
<file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" />
</files>
</package>

4
src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
Просмотреть файл

@ -8,10 +8,6 @@
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup>
<NoWarn>NU1701</NoWarn>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\mbanative\mbanative.vcxproj">
<Project>{665E0441-17F9-4105-B202-EDF274657F6E}</Project>