Update dependencies.
Sean Hall committed
Jul 19, 2020 at 18:27 UTC
ab7e604a7d7b53f288b81a603c0dce1fc5c8e048
21 files changed
+55
-54
global.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0144"
3
+ "WixToolset.Sdk": "4.0.0-build-0149"
4
},
5
"sdk": {
6
"allowPrerelease": false
nuget.config
-1
@@ -8,7 +8,6 @@
8
<add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" />
9
<add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" />
10
<add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" />
11
- <add key="wixtoolset-bootstrappercore" value="https://ci.appveyor.com/nuget/wixtoolset-bootstrappercore" />
11
<add key="wixtoolset-balutil" value="https://ci.appveyor.com/nuget/wixtoolset-balutil" />
12
<add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" />
13
<add key="wixtoolset-netfx-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-netfx-wixext" />
src/Samples/bafunctions/bafunctions.vcxproj
+6
-6
@@ -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. -->
3
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.32\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')" />
7
- <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
5
+ <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" />
6
+ <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
7
+ <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
8
9
<ItemGroup Label="ProjectConfigurations">
10
<ProjectConfiguration Include="Debug|Win32">
@@ -57,9 +57,9 @@
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>
59
</PropertyGroup>
60
- <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.32\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'))" />
62
- <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
60
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props'))" />
61
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
62
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.45\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'))" />
64
</Target>
65
</Project>
src/Samples/bafunctions/packages.config
+3
-3
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
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" />
5
- <package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
6
- <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.33" targetFramework="native" />
6
+ <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+1
-1
@@ -48,7 +48,7 @@
48
<Reference Include="System.Data" />
49
<Reference Include="System.Xml" />
50
<Reference Include="WixToolset.Mba.Core">
51
- <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.32\lib\net20\WixToolset.Mba.Core.dll</HintPath>
51
+ <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.33\lib\net20\WixToolset.Mba.Core.dll</HintPath>
52
</Reference>
53
</ItemGroup>
54
<ItemGroup>
src/WixToolset.Mba.Host/packages.config
+1
-1
@@ -4,5 +4,5 @@
4
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="net20" developmentDependency="true" />
5
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="net20" developmentDependency="true" />
6
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net20" developmentDependency="true" />
7
- <package id="WixToolset.Mba.Core" version="4.0.32" targetFramework="net20" />
7
+ <package id="WixToolset.Mba.Core" version="4.0.33" targetFramework="net20" />
8
</packages>
\ No newline at end of file
src/dnchost/dnchost.vcxproj
+6
-6
@@ -4,9 +4,9 @@
4
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
5
<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
6
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
7
- <Import Project="..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
8
- <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')" />
9
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
7
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" />
8
+ <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
9
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
10
<ItemGroup Label="ProjectConfigurations">
11
<ProjectConfiguration Include="Debug|Win32">
12
<Configuration>Debug</Configuration>
@@ -83,8 +83,8 @@
83
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
84
<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'))" />
85
<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'))" />
86
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
87
- <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'))" />
88
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
86
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props'))" />
87
+ <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
88
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" />
89
</Target>
90
</Project>
\ No newline at end of file
src/dnchost/packages.config
+3
-3
@@ -5,7 +5,7 @@
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="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="3.1.3" targetFramework="native" />
8
- <package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
9
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
10
- <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
8
+ <package id="WixToolset.BalUtil" version="4.0.33" targetFramework="native" />
9
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
10
+ <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
11
</packages>
\ No newline at end of file
src/mbahost/mbahost.vcxproj
+6
-6
@@ -5,9 +5,9 @@
5
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
6
<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
7
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
8
- <Import Project="..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
9
- <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')" />
10
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
8
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" />
9
+ <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
10
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
11
12
<ItemGroup Label="ProjectConfigurations">
13
<ProjectConfiguration Include="Debug|Win32">
@@ -83,8 +83,8 @@
83
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
84
<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'))" />
85
<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'))" />
86
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
87
- <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'))" />
88
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
86
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props'))" />
87
+ <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
88
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" />
89
</Target>
90
</Project>
\ No newline at end of file
src/mbahost/packages.config
+3
-3
@@ -4,7 +4,7 @@
4
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
5
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
6
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
7
- <package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
8
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
9
- <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
7
+ <package id="WixToolset.BalUtil" version="4.0.33" targetFramework="native" />
8
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
9
+ <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
10
</packages>
\ No newline at end of file
src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
+1
@@ -31,6 +31,7 @@
31
<PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
32
<PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
33
<PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
34
+ <PackageReference Include="WixToolset.Data" Version="4.0.*" />
35
<!-- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.*" /> -->
36
</ItemGroup>
37
src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
+1
-1
@@ -13,6 +13,6 @@
13
14
<ItemGroup>
15
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
16
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.32" />
16
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.33" />
17
</ItemGroup>
18
</Project>
\ No newline at end of file
src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+1
-1
@@ -15,6 +15,6 @@
15
</ItemGroup>
16
17
<ItemGroup>
18
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.32" />
18
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.33" />
19
</ItemGroup>
20
</Project>
\ No newline at end of file
src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+1
-1
@@ -10,7 +10,7 @@
10
11
<ItemGroup>
12
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
13
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.32" PrivateAssets="All" />
13
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.33" PrivateAssets="All" />
14
</ItemGroup>
15
16
<ItemGroup>
src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
+1
-1
@@ -18,6 +18,6 @@
18
19
<ItemGroup>
20
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
21
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.32" />
21
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.33" />
22
</ItemGroup>
23
</Project>
\ No newline at end of file
src/test/examples/TestEngine/Example.TestEngine.vcxproj
+6
-6
@@ -1,9 +1,9 @@
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. -->
3
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
- <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.32\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')" />
6
- <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
4
+ <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" />
5
+ <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
6
+ <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
7
<ItemGroup Label="ProjectConfigurations">
8
<ProjectConfiguration Include="Debug|Win32">
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>
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'))" />
71
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.32\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'))" />
73
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
71
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props'))" />
72
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
73
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" />
74
</Target>
75
</Project>
\ No newline at end of file
src/test/examples/TestEngine/packages.config
+3
-3
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
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" />
5
- <package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
6
- <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.33" targetFramework="native" />
6
+ <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
+1
-1
@@ -11,6 +11,6 @@
11
12
<ItemGroup>
13
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
14
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.32" />
14
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.33" />
15
</ItemGroup>
16
</Project>
\ No newline at end of file
src/wixlib/bal.wixproj
+1
@@ -11,6 +11,7 @@
11
<BindInputPaths Include="..\wixstdba\Resources\" />
12
<BindInputPaths Include="$(OutputPath)netcoreapp3.0" />
13
<BindInputPaths Include="$(OutputPath)" />
14
+ <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
15
</ItemGroup>
16
17
<ItemGroup>
src/wixstdba/packages.config
+3
-3
@@ -4,7 +4,7 @@
4
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
5
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
6
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
7
- <package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
8
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
9
- <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
7
+ <package id="WixToolset.BalUtil" version="4.0.33" targetFramework="native" />
8
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
9
+ <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
10
</packages>
\ No newline at end of file
src/wixstdba/wixstdba.vcxproj
+6
-6
@@ -5,9 +5,9 @@
5
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
6
<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
7
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
8
- <Import Project="..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
9
- <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')" />
10
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
8
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" />
9
+ <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
10
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
11
12
<ItemGroup Label="ProjectConfigurations">
13
<ProjectConfiguration Include="Debug|Win32">
@@ -78,8 +78,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
78
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
79
<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'))" />
80
<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'))" />
81
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
82
- <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'))" />
83
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
81
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props'))" />
82
+ <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
83
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" />
84
</Target>
85
</Project>
\ No newline at end of file