diff options
Diffstat (limited to 'src/balutil')
| -rw-r--r-- | src/balutil/balutil.nuspec | 2 | ||||
| -rw-r--r-- | src/balutil/balutil.vcxproj | 20 | ||||
| -rw-r--r-- | src/balutil/packages.config | 2 |
3 files changed, 7 insertions, 17 deletions
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 |
