aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-06-24 18:47:38 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-06-24 21:08:31 +1000
commitdea3a630b6ae10663dd6f7d855541f7f631a2b55 (patch)
tree47664cb2e475a4f4128b97f49463a28ee7d5c26e
parente4f1a4310f09e3777d035f35f4b4ca69d69f5083 (diff)
downloadwix-dea3a630b6ae10663dd6f7d855541f7f631a2b55.tar.gz
wix-dea3a630b6ae10663dd6f7d855541f7f631a2b55.tar.bz2
wix-dea3a630b6ae10663dd6f7d855541f7f631a2b55.zip
Update dependencies.
Run tests before packing and don't build twice.
Diffstat
-rw-r--r--appveyor.cmd4
-rw-r--r--src/Samples/bafunctions/bafunctions.vcxproj10
-rw-r--r--src/Samples/bafunctions/packages.config4
-rw-r--r--src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj1
-rw-r--r--src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj3
-rw-r--r--src/WixToolset.Mba.Host/packages.config2
-rw-r--r--src/dnchost/dnchost.vcxproj10
-rw-r--r--src/dnchost/packages.config4
-rw-r--r--src/mbahost/mbahost.vcxproj10
-rw-r--r--src/mbahost/packages.config4
-rw-r--r--src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj2
-rw-r--r--src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj2
-rw-r--r--src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj2
-rw-r--r--src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj2
-rw-r--r--src/test/examples/TestEngine/Example.TestEngine.vcxproj8
-rw-r--r--src/test/examples/TestEngine/packages.config4
-rw-r--r--src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj2
-rw-r--r--src/wixext/WixToolset.Bal.wixext.csproj1
-rw-r--r--src/wixlib/bal.wixproj10
-rw-r--r--src/wixlib/packages.config2
-rw-r--r--src/wixstdba/packages.config4
-rw-r--r--src/wixstdba/wixstdba.vcxproj10
22 files changed, 49 insertions, 52 deletions
diff --git a/appveyor.cmd b/appveyor.cmd
index 295607cb..95b09f81 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -7,12 +7,10 @@ nuget restore || exit /b
7msbuild -p:Configuration=%_C% -t:Restore || exit /b 7msbuild -p:Configuration=%_C% -t:Restore || exit /b
8 8
9msbuild -p:Configuration=%_C% || exit /b 9msbuild -p:Configuration=%_C% || exit /b
10dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b
10 11
11msbuild -p:Configuration=%_C% -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b 12msbuild -p:Configuration=%_C% -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b
12msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b 13msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b
13 14
14msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj || exit /b
15dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b
16
17@popd 15@popd
18@endlocal \ No newline at end of file 16@endlocal \ No newline at end of file
diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj
index 92637507..d35c85c0 100644
--- a/src/Samples/bafunctions/bafunctions.vcxproj
+++ b/src/Samples/bafunctions/bafunctions.vcxproj
@@ -2,9 +2,9 @@
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
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.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" /> 5 <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" />
6 <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.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
7 <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 <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
8 8
9 <ItemGroup Label="ProjectConfigurations"> 9 <ItemGroup Label="ProjectConfigurations">
10 <ProjectConfiguration Include="Debug|Win32"> 10 <ProjectConfiguration Include="Debug|Win32">
@@ -20,7 +20,7 @@
20 <PropertyGroup Label="Globals"> 20 <PropertyGroup Label="Globals">
21 <ProjectGuid>{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}</ProjectGuid> 21 <ProjectGuid>{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}</ProjectGuid>
22 <ConfigurationType>DynamicLibrary</ConfigurationType> 22 <ConfigurationType>DynamicLibrary</ConfigurationType>
23 <PlatformToolset>v141</PlatformToolset> 23 <PlatformToolset>v142</PlatformToolset>
24 <CharacterSet>Unicode</CharacterSet> 24 <CharacterSet>Unicode</CharacterSet>
25 <TargetName>BAFunctions</TargetName> 25 <TargetName>BAFunctions</TargetName>
26 <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile> 26 <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile>
@@ -57,9 +57,9 @@
57 <PropertyGroup> 57 <PropertyGroup>
58 <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> 58 <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>
59 </PropertyGroup> 59 </PropertyGroup>
60 <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" /> 60 <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props'))" />
61 <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'))" /> 61 <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'))" />
62 <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'))" /> 62 <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
63 <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'))" /> 63 <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'))" />
64 </Target> 64 </Target>
65</Project> 65</Project>
diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config
index 7cbb7bbe..65e7225a 100644
--- a/src/Samples/bafunctions/packages.config
+++ b/src/Samples/bafunctions/packages.config
@@ -2,6 +2,6 @@
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.BalUtil" version="4.0.26" targetFramework="native" /> 5 <package id="WixToolset.BalUtil" version="4.0.31" targetFramework="native" />
6 <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" /> 6 <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
7</packages> \ No newline at end of file 7</packages> \ No newline at end of file
diff --git a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj
index 09580c2d..627ea67a 100644
--- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj
+++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj
@@ -7,6 +7,7 @@
7 <RootNamespace>WixToolset.Dnc.Host</RootNamespace> 7 <RootNamespace>WixToolset.Dnc.Host</RootNamespace>
8 <Description>WiX Toolset .NET Core BA Host</Description> 8 <Description>WiX Toolset .NET Core BA Host</Description>
9 <Title>WiX Toolset .NET Core BA Host</Title> 9 <Title>WiX Toolset .NET Core BA Host</Title>
10 <DebugType>embedded</DebugType>
10 </PropertyGroup> 11 </PropertyGroup>
11 12
12 <ItemGroup> 13 <ItemGroup>
diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
index 2c912f3d..0fedd9dc 100644
--- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
@@ -11,6 +11,7 @@
11 <NoWarn>0693;1591</NoWarn> 11 <NoWarn>0693;1591</NoWarn>
12 <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> 12 <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13 <Description>Managed Bootstrapper Application entry point</Description> 13 <Description>Managed Bootstrapper Application entry point</Description>
14 <DebugType>embedded</DebugType>
14 </PropertyGroup> 15 </PropertyGroup>
15 <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> 16 <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
16 <DebugSymbols>true</DebugSymbols> 17 <DebugSymbols>true</DebugSymbols>
@@ -44,7 +45,7 @@
44 <Reference Include="System.Data" /> 45 <Reference Include="System.Data" />
45 <Reference Include="System.Xml" /> 46 <Reference Include="System.Xml" />
46 <Reference Include="WixToolset.Mba.Core"> 47 <Reference Include="WixToolset.Mba.Core">
47 <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.26\lib\net20\WixToolset.Mba.Core.dll</HintPath> 48 <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.31\lib\net20\WixToolset.Mba.Core.dll</HintPath>
48 </Reference> 49 </Reference>
49 </ItemGroup> 50 </ItemGroup>
50 <ItemGroup> 51 <ItemGroup>
diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config
index 73365d26..d1b22e73 100644
--- a/src/WixToolset.Mba.Host/packages.config
+++ b/src/WixToolset.Mba.Host/packages.config
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<packages> 2<packages>
3 <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net20" developmentDependency="true" /> 3 <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net20" developmentDependency="true" />
4 <package id="WixToolset.Mba.Core" version="4.0.26" targetFramework="net20" /> 4 <package id="WixToolset.Mba.Core" version="4.0.31" targetFramework="net20" />
5</packages> \ No newline at end of file 5</packages> \ No newline at end of file
diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj
index 0fd7d9e5..6bab8063 100644
--- a/src/dnchost/dnchost.vcxproj
+++ b/src/dnchost/dnchost.vcxproj
@@ -1,9 +1,9 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4 <Import Project="..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" /> 4 <Import Project="..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.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')" /> 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.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" /> 6 <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
7 <ItemGroup Label="ProjectConfigurations"> 7 <ItemGroup Label="ProjectConfigurations">
8 <ProjectConfiguration Include="Debug|Win32"> 8 <ProjectConfiguration Include="Debug|Win32">
9 <Configuration>Debug</Configuration> 9 <Configuration>Debug</Configuration>
@@ -17,7 +17,7 @@
17 <PropertyGroup Label="Globals"> 17 <PropertyGroup Label="Globals">
18 <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid> 18 <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid>
19 <ConfigurationType>DynamicLibrary</ConfigurationType> 19 <ConfigurationType>DynamicLibrary</ConfigurationType>
20 <PlatformToolset>v141</PlatformToolset> 20 <PlatformToolset>v142</PlatformToolset>
21 <CharacterSet>Unicode</CharacterSet> 21 <CharacterSet>Unicode</CharacterSet>
22 <TargetName>dnchost</TargetName> 22 <TargetName>dnchost</TargetName>
23 <ProjectModuleDefinitionFile>dnchost.def</ProjectModuleDefinitionFile> 23 <ProjectModuleDefinitionFile>dnchost.def</ProjectModuleDefinitionFile>
@@ -69,9 +69,9 @@
69 <PropertyGroup> 69 <PropertyGroup>
70 <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> 70 <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>
71 </PropertyGroup> 71 </PropertyGroup>
72 <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" /> 72 <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props'))" />
73 <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'))" /> 73 <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'))" />
74 <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'))" /> 74 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
75 <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'))" /> 75 <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'))" />
76 </Target> 76 </Target>
77</Project> \ No newline at end of file 77</Project> \ No newline at end of file
diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config
index e52c0a7a..f1e2c54b 100644
--- a/src/dnchost/packages.config
+++ b/src/dnchost/packages.config
@@ -3,6 +3,6 @@
3 <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="3.1.3" targetFramework="native" /> 3 <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="3.1.3" targetFramework="native" />
4 <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> 4 <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
5 <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" /> 5 <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
6 <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" /> 6 <package id="WixToolset.BalUtil" version="4.0.31" targetFramework="native" />
7 <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" /> 7 <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
8</packages> \ No newline at end of file 8</packages> \ No newline at end of file
diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj
index 4071942c..45fef1a1 100644
--- a/src/mbahost/mbahost.vcxproj
+++ b/src/mbahost/mbahost.vcxproj
@@ -2,9 +2,9 @@
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
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.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" /> 5 <Import Project="..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" />
6 <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.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
7 <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 <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
8 8
9 <ItemGroup Label="ProjectConfigurations"> 9 <ItemGroup Label="ProjectConfigurations">
10 <ProjectConfiguration Include="Debug|Win32"> 10 <ProjectConfiguration Include="Debug|Win32">
@@ -20,7 +20,7 @@
20 <PropertyGroup Label="Globals"> 20 <PropertyGroup Label="Globals">
21 <ProjectGuid>{12C87C77-3547-44F8-8134-29BC915CB19D}</ProjectGuid> 21 <ProjectGuid>{12C87C77-3547-44F8-8134-29BC915CB19D}</ProjectGuid>
22 <ConfigurationType>DynamicLibrary</ConfigurationType> 22 <ConfigurationType>DynamicLibrary</ConfigurationType>
23 <PlatformToolset>v141</PlatformToolset> 23 <PlatformToolset>v142</PlatformToolset>
24 <CharacterSet>Unicode</CharacterSet> 24 <CharacterSet>Unicode</CharacterSet>
25 <TargetName>mbahost</TargetName> 25 <TargetName>mbahost</TargetName>
26 <ProjectModuleDefinitionFile>mbahost.def</ProjectModuleDefinitionFile> 26 <ProjectModuleDefinitionFile>mbahost.def</ProjectModuleDefinitionFile>
@@ -68,9 +68,9 @@
68 <PropertyGroup> 68 <PropertyGroup>
69 <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> 69 <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>
70 </PropertyGroup> 70 </PropertyGroup>
71 <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" /> 71 <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props'))" />
72 <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'))" /> 72 <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'))" />
73 <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'))" /> 73 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
74 <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'))" /> 74 <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'))" />
75 </Target> 75 </Target>
76</Project> \ No newline at end of file 76</Project> \ No newline at end of file
diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config
index 7cbb7bbe..65e7225a 100644
--- a/src/mbahost/packages.config
+++ b/src/mbahost/packages.config
@@ -2,6 +2,6 @@
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.BalUtil" version="4.0.26" targetFramework="native" /> 5 <package id="WixToolset.BalUtil" version="4.0.31" targetFramework="native" />
6 <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" /> 6 <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
7</packages> \ No newline at end of file 7</packages> \ No newline at end of file
diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
index 7fc831d1..b2c7dd29 100644
--- a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
+++ b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
@@ -13,6 +13,6 @@
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> 15 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
16 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" /> 16 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.31" />
17 </ItemGroup> 17 </ItemGroup>
18</Project> \ No newline at end of file 18</Project> \ No newline at end of file
diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
index 04f4f9d1..958047b0 100644
--- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
@@ -15,6 +15,6 @@
15 </ItemGroup> 15 </ItemGroup>
16 16
17 <ItemGroup> 17 <ItemGroup>
18 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" /> 18 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.31" />
19 </ItemGroup> 19 </ItemGroup>
20</Project> \ No newline at end of file 20</Project> \ No newline at end of file
diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
index 2c702a3b..1f61d9d1 100644
--- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
@@ -10,7 +10,7 @@
10 10
11 <ItemGroup> 11 <ItemGroup>
12 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> 12 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
13 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" PrivateAssets="All" /> 13 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.31" PrivateAssets="All" />
14 </ItemGroup> 14 </ItemGroup>
15 15
16 <ItemGroup> 16 <ItemGroup>
diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
index ad599e23..dc2b8a5f 100644
--- a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
+++ b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
@@ -18,6 +18,6 @@
18 18
19 <ItemGroup> 19 <ItemGroup>
20 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> 20 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
21 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" /> 21 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.31" />
22 </ItemGroup> 22 </ItemGroup>
23</Project> \ No newline at end of file 23</Project> \ No newline at end of file
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
index b863618a..7fb3b3aa 100644
--- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj
+++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
@@ -1,9 +1,9 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4 <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" /> 4 <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.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')" /> 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.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" /> 6 <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
7 <ItemGroup Label="ProjectConfigurations"> 7 <ItemGroup Label="ProjectConfigurations">
8 <ProjectConfiguration Include="Debug|Win32"> 8 <ProjectConfiguration Include="Debug|Win32">
9 <Configuration>Debug</Configuration> 9 <Configuration>Debug</Configuration>
@@ -68,8 +68,8 @@
68 <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> 68 <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>
69 </PropertyGroup> 69 </PropertyGroup>
70 <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'))" /> 70 <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'))" />
71 <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" /> 71 <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props'))" />
72 <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'))" /> 72 <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'))" />
73 <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'))" /> 73 <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
74 </Target> 74 </Target>
75</Project> \ No newline at end of file 75</Project> \ No newline at end of file
diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config
index 7cbb7bbe..65e7225a 100644
--- a/src/test/examples/TestEngine/packages.config
+++ b/src/test/examples/TestEngine/packages.config
@@ -2,6 +2,6 @@
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.BalUtil" version="4.0.26" targetFramework="native" /> 5 <package id="WixToolset.BalUtil" version="4.0.31" targetFramework="native" />
6 <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" /> 6 <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
7</packages> \ No newline at end of file 7</packages> \ No newline at end of file
diff --git a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
index fd03209f..393b403e 100644
--- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
+++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
@@ -11,6 +11,6 @@
11 11
12 <ItemGroup> 12 <ItemGroup>
13 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> 13 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
14 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" /> 14 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.31" />
15 </ItemGroup> 15 </ItemGroup>
16</Project> \ No newline at end of file 16</Project> \ No newline at end of file
diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj
index aef4c4d9..aa3c4033 100644
--- a/src/wixext/WixToolset.Bal.wixext.csproj
+++ b/src/wixext/WixToolset.Bal.wixext.csproj
@@ -9,6 +9,7 @@
9 <Title>WiX Toolset Bal Extension</Title> 9 <Title>WiX Toolset Bal Extension</Title>
10 <IsTool>true</IsTool> 10 <IsTool>true</IsTool>
11 <ContentTargetFolders>build</ContentTargetFolders> 11 <ContentTargetFolders>build</ContentTargetFolders>
12 <DebugType>embedded</DebugType>
12 </PropertyGroup> 13 </PropertyGroup>
13 <ItemGroup> 14 <ItemGroup>
14 <Content Include="$(MSBuildThisFileName).targets" /> 15 <Content Include="$(MSBuildThisFileName).targets" />
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index ae8559d5..c23af015 100644
--- a/src/wixlib/bal.wixproj
+++ b/src/wixlib/bal.wixproj
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="utf-8" ?> 1<?xml version="1.0" encoding="utf-8" ?>
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3<Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0"> 3<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
4 <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props')" /> 4 <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props')" />
5 <Import Project="..\FindLocalWix.props" /> 5 <Import Project="..\FindLocalWix.props" />
6 <PropertyGroup> 6 <PropertyGroup>
7 <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid> 7 <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
@@ -48,16 +48,12 @@
48 </ProjectReference> 48 </ProjectReference>
49 </ItemGroup> 49 </ItemGroup>
50 <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " /> 50 <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
51 <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
52 <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
53 <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
54 </Target>
55 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 51 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
56 <PropertyGroup> 52 <PropertyGroup>
57 <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> 53 <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>
58 </PropertyGroup> 54 </PropertyGroup>
59 <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'))" /> 55 <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'))" />
60 <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props'))" /> 56 <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props'))" />
61 </Target> 57 </Target>
62 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> 58 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
63</Project> 59</Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index 8ffe0d58..f37af421 100644
--- a/src/wixlib/packages.config
+++ b/src/wixlib/packages.config
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<packages> 2<packages>
3 <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> 3 <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4 <package id="WixToolset.MSBuild" version="4.0.0-build-0137" developmentDependency="true" targetFramework="net40" /> 4 <package id="WixToolset.MSBuild" version="4.0.0-build-0139" developmentDependency="true" targetFramework="net40" />
5</packages> \ No newline at end of file 5</packages> \ No newline at end of file
diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config
index 7cbb7bbe..65e7225a 100644
--- a/src/wixstdba/packages.config
+++ b/src/wixstdba/packages.config
@@ -2,6 +2,6 @@
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.BalUtil" version="4.0.26" targetFramework="native" /> 5 <package id="WixToolset.BalUtil" version="4.0.31" targetFramework="native" />
6 <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" /> 6 <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
7</packages> \ No newline at end of file 7</packages> \ No newline at end of file
diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj
index 6698c192..7d116490 100644
--- a/src/wixstdba/wixstdba.vcxproj
+++ b/src/wixstdba/wixstdba.vcxproj
@@ -2,9 +2,9 @@
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
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.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" /> 5 <Import Project="..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" />
6 <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.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
7 <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 <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
8 8
9 <ItemGroup Label="ProjectConfigurations"> 9 <ItemGroup Label="ProjectConfigurations">
10 <ProjectConfiguration Include="Debug|Win32"> 10 <ProjectConfiguration Include="Debug|Win32">
@@ -20,7 +20,7 @@
20 <PropertyGroup Label="Globals"> 20 <PropertyGroup Label="Globals">
21 <ProjectGuid>{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}</ProjectGuid> 21 <ProjectGuid>{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}</ProjectGuid>
22 <ConfigurationType>DynamicLibrary</ConfigurationType> 22 <ConfigurationType>DynamicLibrary</ConfigurationType>
23 <PlatformToolset>v141</PlatformToolset> 23 <PlatformToolset>v142</PlatformToolset>
24 <CharacterSet>Unicode</CharacterSet> 24 <CharacterSet>Unicode</CharacterSet>
25 <TargetName>WixStdBA</TargetName> 25 <TargetName>WixStdBA</TargetName>
26 <ProjectModuleDefinitionFile>wixstdba.def</ProjectModuleDefinitionFile> 26 <ProjectModuleDefinitionFile>wixstdba.def</ProjectModuleDefinitionFile>
@@ -107,9 +107,9 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
107 <PropertyGroup> 107 <PropertyGroup>
108 <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 <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>
109 </PropertyGroup> 109 </PropertyGroup>
110 <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" /> 110 <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props'))" />
111 <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'))" /> 111 <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'))" />
112 <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'))" /> 112 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
113 <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'))" /> 113 <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'))" />
114 </Target> 114 </Target>
115</Project> \ No newline at end of file 115</Project> \ No newline at end of file
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-01 16:25:10 +0000