Update dependencies.
Sean Hall committed
Feb 4, 2021 at 21:38 UTC
c01cfd807219d3ea96ad171cdbe5dd9d4a4aced0
25 files changed
+45
-86
global.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0179"
3
+ "WixToolset.Sdk": "4.0.0-build-0186"
4
},
5
"sdk": {
6
"allowPrerelease": false
src/Samples/bafunctions/bafunctions.vcxproj
+4
-4
@@ -2,8 +2,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
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" />
6
- <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" />
5
+ <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" />
6
+ <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" />
7
<Import Project="..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" />
8
9
<ItemGroup Label="ProjectConfigurations">
@@ -73,8 +73,8 @@
73
<PropertyGroup>
74
<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>
75
</PropertyGroup>
76
- <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props'))" />
77
- <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props'))" />
76
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props'))" />
77
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props'))" />
78
<Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props'))" />
79
<Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
80
</Target>
src/Samples/bafunctions/packages.config
+2
-2
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
4
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.64" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.46" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.75" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.48" targetFramework="native" />
6
<package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/dnchost/dnchost.vcxproj
+4
-4
@@ -4,8 +4,8 @@
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.46\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" />
8
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" />
7
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" />
8
+ <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" />
9
<Import Project="..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" />
10
<ItemGroup Label="ProjectConfigurations">
11
<ProjectConfiguration Include="Debug|ARM64">
@@ -99,8 +99,8 @@
99
<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'))" />
100
<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'))" />
101
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
102
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props'))" />
103
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props'))" />
102
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props'))" />
103
+ <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props'))" />
104
<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props'))" />
105
</Target>
106
</Project>
\ No newline at end of file
src/dnchost/packages.config
+2
-2
@@ -7,7 +7,7 @@
7
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
8
<package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
9
<package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
10
- <package id="WixToolset.BalUtil" version="4.0.46" targetFramework="native" />
11
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.64" targetFramework="native" />
10
+ <package id="WixToolset.BalUtil" version="4.0.48" targetFramework="native" />
11
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.75" targetFramework="native" />
12
<package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" />
13
</packages>
\ No newline at end of file
src/mbahost/mbahost.vcxproj
+4
-4
@@ -5,8 +5,8 @@
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.46\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" />
9
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" />
8
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" />
9
+ <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" />
10
<Import Project="..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" />
11
12
<ItemGroup Label="ProjectConfigurations">
@@ -99,8 +99,8 @@
99
<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'))" />
100
<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'))" />
101
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
102
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props'))" />
103
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props'))" />
102
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props'))" />
103
+ <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props'))" />
104
<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props'))" />
105
</Target>
106
</Project>
\ No newline at end of file
src/mbahost/packages.config
+2
-2
@@ -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="3.3.37" targetFramework="native" developmentDependency="true" />
7
- <package id="WixToolset.BalUtil" version="4.0.46" targetFramework="native" />
8
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.64" targetFramework="native" />
7
+ <package id="WixToolset.BalUtil" version="4.0.48" targetFramework="native" />
8
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.75" targetFramework="native" />
9
<package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" />
10
</packages>
\ No newline at end of file
src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
+1
-1
@@ -6,7 +6,7 @@
6
<bal:WixManagedBootstrapperApplicationHost />
7
</BootstrapperApplication>
8
<Chain>
9
- <ExePackage Permanent="yes" DetectCondition="no" SourceFile="runtimes\win-x86\native\wixnative.exe" />
9
+ <ExePackage Permanent="yes" DetectCondition="none" SourceFile="runtimes\win-x86\native\wixnative.exe" />
10
</Chain>
11
</Bundle>
12
</Wix>
src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs
+1
-1
@@ -7,7 +7,7 @@
7
</BootstrapperApplication>
8
<Variable Name="Test1" bal:Overridable="yes" />
9
<Chain>
10
- <ExePackage Permanent="yes" DetectCondition="no" SourceFile="runtimes\win-x86\native\wixnative.exe" />
10
+ <ExePackage Permanent="yes" DetectCondition="none" SourceFile="runtimes\win-x86\native\wixnative.exe" />
11
</Chain>
12
</Bundle>
13
</Wix>
src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
+1
-1
@@ -6,7 +6,7 @@
6
<bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
7
</BootstrapperApplication>
8
<Chain>
9
- <ExePackage Permanent="yes" DetectCondition="no" SourceFile="runtimes\win-x86\native\wixnative.exe" />
9
+ <ExePackage Permanent="yes" DetectCondition="none" SourceFile="runtimes\win-x86\native\wixnative.exe" />
10
</Chain>
11
</Bundle>
12
</Wix>
src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
+1
-1
@@ -10,7 +10,7 @@
10
<bal:WixDotNetCoreBootstrapperApplicationHost />
11
</BootstrapperApplication>
12
<Chain>
13
- <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
13
+ <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
14
</Chain>
15
</Bundle>
16
</Wix>
src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
+1
-1
@@ -5,7 +5,7 @@
5
<PayloadGroupRef Id="publish.Example.EarliestCoreMBA.scd" />
6
</BootstrapperApplication>
7
<Chain>
8
- <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
8
+ <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
9
</Chain>
10
</Bundle>
11
</Wix>
src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
+1
-1
@@ -5,7 +5,7 @@
5
<PayloadGroupRef Id="publish.Example.EarliestCoreMBA.trimmedscd" />
6
</BootstrapperApplication>
7
<Chain>
8
- <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
8
+ <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
9
</Chain>
10
</Bundle>
11
</Wix>
src/test/examples/FullFramework2Bundle/Bundle.wxs
+1
-1
@@ -8,7 +8,7 @@
8
<bal:WixManagedBootstrapperApplicationHost />
9
</BootstrapperApplication>
10
<Chain>
11
- <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
11
+ <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
12
</Chain>
13
</Bundle>
14
</Wix>
src/test/examples/FullFramework4Bundle/Bundle.wxs
+1
-1
@@ -8,7 +8,7 @@
8
<bal:WixManagedBootstrapperApplicationHost />
9
</BootstrapperApplication>
10
<Chain>
11
- <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
11
+ <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
12
</Chain>
13
</Bundle>
14
</Wix>
src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
+1
-1
@@ -10,7 +10,7 @@
10
<bal:WixDotNetCoreBootstrapperApplicationHost />
11
</BootstrapperApplication>
12
<Chain>
13
- <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
13
+ <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
14
</Chain>
15
</Bundle>
16
</Wix>
src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
+1
-1
@@ -5,7 +5,7 @@
5
<PayloadGroupRef Id="publish.Example.LatestCoreMBA.scd" />
6
</BootstrapperApplication>
7
<Chain>
8
- <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
8
+ <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
9
</Chain>
10
</Bundle>
11
</Wix>
src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
+1
-1
@@ -5,7 +5,7 @@
5
<PayloadGroupRef Id="publish.Example.LatestCoreMBA.trimmedscd" />
6
</BootstrapperApplication>
7
<Chain>
8
- <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
8
+ <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
9
</Chain>
10
</Bundle>
11
</Wix>
src/test/examples/TestEngine/Example.TestEngine.vcxproj
+4
-4
@@ -1,8 +1,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. -->
3
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
- <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" />
5
- <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" />
4
+ <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" />
5
+ <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" />
6
<Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" />
7
<ItemGroup Label="ProjectConfigurations">
8
<ProjectConfiguration Include="Debug|ARM64">
@@ -76,8 +76,8 @@
76
<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>
77
</PropertyGroup>
78
<Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
79
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props'))" />
80
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props'))" />
79
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props'))" />
80
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props'))" />
81
<Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props'))" />
82
</Target>
83
</Project>
\ No newline at end of file
src/test/examples/TestEngine/packages.config
+2
-2
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
4
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.64" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.46" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.75" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.48" targetFramework="native" />
6
<package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
+1
-1
@@ -10,7 +10,7 @@
10
<bal:WixDotNetCoreBootstrapperApplicationHost />
11
</BootstrapperApplication>
12
<Chain>
13
- <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
13
+ <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
14
</Chain>
15
</Bundle>
16
</Wix>
src/wixstdba/WixStandardBootstrapperApplication.cpp
+2
-36
@@ -307,7 +307,8 @@ public: // IBootstrapperApplication
307
308
309
virtual STDMETHODIMP OnDetectComplete(
310
- __in HRESULT hrStatus
310
+ __in HRESULT hrStatus,
311
+ __in BOOL /*fEligibleForCleanup*/
312
)
313
{
314
HRESULT hr = S_OK;
@@ -1142,9 +1143,6 @@ public: // IBootstrapperApplication
1143
case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN:
1144
OnDetectPackageBeginFallback(reinterpret_cast<BA_ONDETECTPACKAGEBEGIN_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTPACKAGEBEGIN_RESULTS*>(pvResults));
1145
break;
1145
- case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE:
1146
- OnDetectCompatibleMsiPackageFallback(reinterpret_cast<BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS*>(pvResults));
1147
- break;
1146
case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE:
1147
OnDetectRelatedMsiPackageFallback(reinterpret_cast<BA_ONDETECTRELATEDMSIPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTRELATEDMSIPACKAGE_RESULTS*>(pvResults));
1148
break;
@@ -1163,12 +1161,6 @@ public: // IBootstrapperApplication
1161
case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN:
1162
OnPlanPackageBeginFallback(reinterpret_cast<BA_ONPLANPACKAGEBEGIN_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANPACKAGEBEGIN_RESULTS*>(pvResults));
1163
break;
1166
- case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN:
1167
- OnPlanCompatibleMsiPackageBeginFallback(reinterpret_cast<BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_RESULTS*>(pvResults));
1168
- break;
1169
- case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE:
1170
- OnPlanCompatibleMsiPackageCompleteFallback(reinterpret_cast<BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_RESULTS*>(pvResults));
1171
- break;
1164
case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE:
1165
OnPlanTargetMsiPackageFallback(reinterpret_cast<BA_ONPLANTARGETMSIPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANTARGETMSIPACKAGE_RESULTS*>(pvResults));
1166
break;
@@ -1408,14 +1400,6 @@ private: // privates
1400
m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext);
1401
}
1402
1411
- void OnDetectCompatibleMsiPackageFallback(
1412
- __in BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS* pArgs,
1413
- __inout BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS* pResults
1414
- )
1415
- {
1416
- m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext);
1417
- }
1418
-
1403
void OnDetectRelatedMsiPackageFallback(
1404
__in BA_ONDETECTRELATEDMSIPACKAGE_ARGS* pArgs,
1405
__inout BA_ONDETECTRELATEDMSIPACKAGE_RESULTS* pResults
@@ -1468,24 +1452,6 @@ private: // privates
1452
BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_PACKAGE, m_hModule, pArgs->wzPackageId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState));
1453
}
1454
1471
- void OnPlanCompatibleMsiPackageBeginFallback(
1472
- __in BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_ARGS* pArgs,
1473
- __inout BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_RESULTS* pResults
1474
- )
1475
- {
1476
- BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState;
1477
- m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext);
1478
- BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_COMPATIBLE_MSI_PACKAGE, m_hModule, pArgs->wzPackageId, pArgs->wzCompatiblePackageId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState));
1479
- }
1480
-
1481
- void OnPlanCompatibleMsiPackageCompleteFallback(
1482
- __in BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_ARGS* pArgs,
1483
- __inout BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_RESULTS* pResults
1484
- )
1485
- {
1486
- m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext);
1487
- }
1488
-
1455
void OnPlanTargetMsiPackageFallback(
1456
__in BA_ONPLANTARGETMSIPACKAGE_ARGS* pArgs,
1457
__inout BA_ONPLANTARGETMSIPACKAGE_RESULTS* pResults
src/wixstdba/packages.config
+2
-2
@@ -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="3.3.37" targetFramework="native" developmentDependency="true" />
7
- <package id="WixToolset.BalUtil" version="4.0.46" targetFramework="native" />
8
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.64" targetFramework="native" />
7
+ <package id="WixToolset.BalUtil" version="4.0.48" targetFramework="native" />
8
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.75" targetFramework="native" />
9
<package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" />
10
</packages>
\ No newline at end of file
src/wixstdba/wixstdba.mc
-7
@@ -50,13 +50,6 @@ Language=English
50
WIXSTDBA: Planned related bundle: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs!
51
.
52
53
-MessageId=4
54
-Severity=Success
55
-SymbolicName=MSG_WIXSTDBA_PLANNED_COMPATIBLE_MSI_PACKAGE
56
-Language=English
57
-WIXSTDBA: Planned compatible package: %2!ls! for %1!ls!, wixstdba requested: %3!hs!, bafunctions requested: %4!hs!
58
-.
59
-
53
MessageId=5
54
Severity=Success
55
SymbolicName=MSG_WIXSTDBA_PLANNED_TARGET_MSI_PACKAGE
src/wixstdba/wixstdba.vcxproj
+4
-4
@@ -5,8 +5,8 @@
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.46\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" />
9
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" />
8
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" />
9
+ <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" />
10
<Import Project="..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" />
11
12
<ItemGroup Label="ProjectConfigurations">
@@ -94,8 +94,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
94
<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'))" />
95
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
96
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
97
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props'))" />
98
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props'))" />
97
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props'))" />
98
+ <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props'))" />
99
<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props'))" />
100
</Target>
101
</Project>
\ No newline at end of file