@joebigelow / wix-1 / commits / 8ec8f5b0

Update dependencies and integrate changes.

Sean Hall committed Mar 2, 2021 at 17:26 UTC 8ec8f5b0091fce08be88acee1f49dbf2edf040a9

15 files changed +99 -86

global.json

+1 -1

@@ -1,6 +1,6 @@

1 {

2 "msbuild-sdks": {

3 - "WixToolset.Sdk": "4.0.0-build-0192"

3 + "WixToolset.Sdk": "4.0.0-build-0193"

4 },

5 "sdk": {

6 "allowPrerelease": false

src/Samples/bafunctions/bafunctions.vcxproj

+6 -6

@@ -2,9 +2,9 @@

4 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

5 - <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props')" />

6 - <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" />

7 - <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />

5 + <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props')" />

6 + <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" />

7 + <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" />

9 <ItemGroup Label="ProjectConfigurations">

10 <ProjectConfiguration Include="Debug|ARM64">

@@ -73,9 +73,9 @@

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.49\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props'))" />

77 - <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props'))" />

78 - <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props'))" />

76 + <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props'))" />

77 + <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props'))" />

78 + <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.64\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>

81 </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="3.3.37" targetFramework="native" developmentDependency="true" />

4 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" />

5 - <package id="WixToolset.BalUtil" version="4.0.49" targetFramework="native" />

6 - <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />

4 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.94" targetFramework="native" />

5 + <package id="WixToolset.BalUtil" version="4.0.50" targetFramework="native" />

6 + <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />

7 </packages>

\ No newline at end of file

src/dnchost/dnchost.cpp

+2 -21

@@ -169,9 +169,6 @@ static HRESULT LoadDncConfiguration(

169 HRESULT hr = S_OK;

170 IXMLDOMDocument* pixdManifest = NULL;

171 IXMLDOMNode* pixnHost = NULL;

172 - IXMLDOMNode* pixnPayload = NULL;

173 - LPWSTR sczPayloadId = NULL;

174 - LPWSTR sczPayloadXPath = NULL;

172 LPWSTR sczPayloadName = NULL;

173 DWORD dwBool = 0;

174

@@ -187,21 +184,8 @@ static HRESULT LoadDncConfiguration(

184 BalExitOnRootFailure(hr, "Failed to find WixBalBAFactoryAssembly element in bootstrapper application config.");

185 }

186

190 - hr = XmlGetAttributeEx(pixnHost, L"PayloadId", &sczPayloadId);

191 - BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@PayloadId.");

192 -

193 - hr = StrAllocFormatted(&sczPayloadXPath, L"/BootstrapperApplicationData/WixPayloadProperties[@Payload='%ls']", sczPayloadId);

194 - BalExitOnFailure(hr, "Failed to format BAFactoryAssembly payload XPath.");

195 -

196 - hr = XmlSelectSingleNode(pixdManifest, sczPayloadXPath, &pixnPayload);

197 - if (S_FALSE == hr)

198 - {

199 - hr = E_NOTFOUND;

200 - }

201 - BalExitOnFailure(hr, "Failed to find WixPayloadProperties node for BAFactoryAssembly PayloadId: %ls.", sczPayloadId);

202 -

203 - hr = XmlGetAttributeEx(pixnPayload, L"Name", &sczPayloadName);

204 - BalExitOnFailure(hr, "Failed to get BAFactoryAssembly payload Name.");

187 + hr = XmlGetAttributeEx(pixnHost, L"FilePath", &sczPayloadName);

188 + BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@FilePath.");

189

190 hr = PathConcat(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath);

191 BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath.");

@@ -250,9 +234,6 @@ static HRESULT LoadDncConfiguration(

234

235 LExit:

236 ReleaseStr(sczPayloadName);

253 - ReleaseObject(pixnPayload);

254 - ReleaseStr(sczPayloadXPath);

255 - ReleaseStr(sczPayloadId);

237 ReleaseObject(pixnHost);

238 ReleaseObject(pixdManifest);

239

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.49\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props')" />

8 - <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" />

9 - <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />

7 + <Import Project="..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props')" />

8 + <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" />

9 + <Import Project="..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" />

10 <ItemGroup Label="ProjectConfigurations">

11 <ProjectConfiguration Include="Debug|ARM64">

12 <Configuration>Debug</Configuration>

@@ -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.49\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props'))" />

103 - <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props'))" />

104 - <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props'))" />

102 + <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props'))" />

103 + <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props'))" />

104 + <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props'))" />

105 </Target>

106 </Project>

\ No newline at end of file

src/dnchost/packages.config

+3 -3

@@ -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.49" targetFramework="native" />

11 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" />

12 - <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />

10 + <package id="WixToolset.BalUtil" version="4.0.50" targetFramework="native" />

11 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.94" targetFramework="native" />

12 + <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />

13 </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.49\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props')" />

9 - <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" />

10 - <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />

8 + <Import Project="..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props')" />

9 + <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" />

10 + <Import Project="..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" />

12 <ItemGroup Label="ProjectConfigurations">

13 <ProjectConfiguration Include="Debug|ARM64">

@@ -99,8 +99,8 @@

105 </Target>

106 </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="3.3.37" targetFramework="native" developmentDependency="true" />

7 - <package id="WixToolset.BalUtil" version="4.0.49" targetFramework="native" />

8 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" />

9 - <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />

7 + <package id="WixToolset.BalUtil" version="4.0.50" targetFramework="native" />

8 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.94" targetFramework="native" />

9 + <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />

10 </packages>

\ 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"?>

3 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

4 - <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props')" />

5 - <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" />

6 - <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />

4 + <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props')" />

5 + <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" />

6 + <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" />

7 <ItemGroup Label="ProjectConfigurations">

8 <ProjectConfiguration Include="Debug|ARM64">

9 <Configuration>Debug</Configuration>

@@ -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.49\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props'))" />

80 - <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props'))" />

81 - <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props'))" />

79 + <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props'))" />

80 + <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props'))" />

81 + <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props'))" />

82 </Target>

83 </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="3.3.37" targetFramework="native" developmentDependency="true" />

4 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" />

5 - <package id="WixToolset.BalUtil" version="4.0.49" targetFramework="native" />

6 - <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />

4 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.94" targetFramework="native" />

5 + <package id="WixToolset.BalUtil" version="4.0.50" targetFramework="native" />

6 + <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />

7 </packages>

\ No newline at end of file

src/wixext/BalBurnBackendExtension.cs

+24

@@ -43,6 +43,11 @@ namespace WixToolset.Bal

43 var isDNC = baId.StartsWith("WixDotNetCoreBootstrapperApplicationHost");

44 var isSCD = isDNC && this.VerifySCD(section);

46 + if (isDNC)

47 + {

48 + this.FinalizeBAFactorySymbol(section);

49 + }

50 +

51 if (isStdBA || isMBA || isDNC)

52 {

53 this.VerifyBAFunctions(section);

@@ -54,6 +59,25 @@ namespace WixToolset.Bal

59 }

60 }

62 + private void FinalizeBAFactorySymbol(IntermediateSection section)

63 + {

64 + var factorySymbol = section.Symbols.OfType<WixBalBAFactoryAssemblySymbol>().SingleOrDefault();

65 + if (null == factorySymbol)

66 + {

67 + return;

68 + }

69 +

70 + var factoryPayloadSymbol = section.Symbols.OfType<WixBundlePayloadSymbol>()

71 + .Where(p => p.Id.Id == factorySymbol.PayloadId)

72 + .SingleOrDefault();

73 + if (null == factoryPayloadSymbol)

74 + {

75 + return;

76 + }

77 +

78 + factorySymbol.FilePath = factoryPayloadSymbol.Name;

79 + }

80 +

81 private void VerifyBAFunctions(IntermediateSection section)

82 {

83 WixBalBAFunctionsSymbol baFunctionsSymbol = null;

src/wixext/BalCompiler.cs

+19 -19

@@ -136,7 +136,7 @@ namespace WixToolset.Bal

136 case "MsiPackage":

137 case "MspPackage":

138 var displayInternalUICondition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute);

139 - section.AddSymbol(new WixBalPackageInfoSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, packageId))

139 + section.AddSymbol(new WixBalPackageInfoSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, packageId))

140 {

141 PackageId = packageId,

142 DisplayInternalUICondition = displayInternalUICondition,

@@ -247,7 +247,7 @@ namespace WixToolset.Bal

247 if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute))

248 {

249 // There can only be one.

250 - var id = new Identifier(AccessModifier.Public, "TheBAFactoryAssembly");

250 + var id = new Identifier(AccessModifier.Global, "TheBAFactoryAssembly");

251 section.AddSymbol(new WixBalBAFactoryAssemblySymbol(sourceLineNumbers, id)

252 {

253 PayloadId = payloadId,

@@ -551,7 +551,7 @@ namespace WixToolset.Bal

551 {

552 if (!String.IsNullOrEmpty(launchTarget))

553 {

554 - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget"))

554 + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchTarget"))

555 {

556 Value = launchTarget,

557 Type = WixBundleVariableType.Formatted,

@@ -560,7 +560,7 @@ namespace WixToolset.Bal

560

561 if (!String.IsNullOrEmpty(launchTargetElevatedId))

562 {

563 - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTargetElevatedId"))

563 + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchTargetElevatedId"))

564 {

565 Value = launchTargetElevatedId,

566 Type = WixBundleVariableType.Formatted,

@@ -569,7 +569,7 @@ namespace WixToolset.Bal

569

570 if (!String.IsNullOrEmpty(launchArguments))

571 {

572 - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchArguments"))

572 + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchArguments"))

573 {

574 Value = launchArguments,

575 Type = WixBundleVariableType.Formatted,

@@ -578,7 +578,7 @@ namespace WixToolset.Bal

578

579 if (YesNoType.Yes == launchHidden)

580 {

581 - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchHidden"))

581 + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchHidden"))

582 {

583 Value = "yes",

584 Type = WixBundleVariableType.Formatted,

@@ -588,7 +588,7 @@ namespace WixToolset.Bal

588

589 if (!String.IsNullOrEmpty(launchWorkingDir))

590 {

591 - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchWorkingFolder"))

591 + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchWorkingFolder"))

592 {

593 Value = launchWorkingDir,

594 Type = WixBundleVariableType.Formatted,

@@ -597,7 +597,7 @@ namespace WixToolset.Bal

597

598 if (!String.IsNullOrEmpty(licenseFile))

599 {

600 - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf"))

600 + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLicenseRtf"))

601 {

602 Value = licenseFile,

603 });

@@ -605,7 +605,7 @@ namespace WixToolset.Bal

605

606 if (null != licenseUrl)

607 {

608 - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl"))

608 + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLicenseUrl"))

609 {

610 Value = licenseUrl,

611 });

@@ -613,7 +613,7 @@ namespace WixToolset.Bal

613

614 if (!String.IsNullOrEmpty(logoFile))

615 {

616 - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogo"))

616 + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLogo"))

617 {

618 Value = logoFile,

619 });

@@ -621,7 +621,7 @@ namespace WixToolset.Bal

621

622 if (!String.IsNullOrEmpty(logoSideFile))

623 {

624 - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogoSide"))

624 + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLogoSide"))

625 {

626 Value = logoSideFile,

627 });

@@ -629,7 +629,7 @@ namespace WixToolset.Bal

629

630 if (!String.IsNullOrEmpty(themeFile))

631 {

632 - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeXml"))

632 + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaThemeXml"))

633 {

634 Value = themeFile,

635 });

@@ -637,7 +637,7 @@ namespace WixToolset.Bal

637

638 if (!String.IsNullOrEmpty(localizationFile))

639 {

640 - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeWxl"))

640 + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaThemeWxl"))

641 {

642 Value = localizationFile,

643 });

@@ -761,7 +761,7 @@ namespace WixToolset.Bal

761 {

762 if (!String.IsNullOrEmpty(logoFile))

763 {

764 - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo"))

764 + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaLogo"))

765 {

766 Value = logoFile,

767 });

@@ -769,7 +769,7 @@ namespace WixToolset.Bal

769

770 if (!String.IsNullOrEmpty(themeFile))

771 {

772 - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeXml"))

772 + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaThemeXml"))

773 {

774 Value = themeFile,

775 });

@@ -777,7 +777,7 @@ namespace WixToolset.Bal

777

778 if (!String.IsNullOrEmpty(localizationFile))

779 {

780 - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeWxl"))

780 + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaThemeWxl"))

781 {

782 Value = localizationFile,

783 });

@@ -864,7 +864,7 @@ namespace WixToolset.Bal

864 {

865 if (!String.IsNullOrEmpty(logoFile))

866 {

867 - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo"))

867 + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaLogo"))

868 {

869 Value = logoFile,

870 });

@@ -872,7 +872,7 @@ namespace WixToolset.Bal

872

873 if (!String.IsNullOrEmpty(themeFile))

874 {

875 - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeXml"))

875 + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaThemeXml"))

876 {

877 Value = themeFile,

878 });

@@ -880,7 +880,7 @@ namespace WixToolset.Bal

880

881 if (!String.IsNullOrEmpty(localizationFile))

882 {

883 - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeWxl"))

883 + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaThemeWxl"))

884 {

885 Value = localizationFile,

886 });

src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs

@@ -12,6 +12,7 @@ namespace WixToolset.Bal

12 new[]

13 {

14 new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.PayloadId), IntermediateFieldType.String),

15 + new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.FilePath), IntermediateFieldType.String),

16 },

17 typeof(WixBalBAFactoryAssemblySymbol));

18 }

@@ -24,6 +25,7 @@ namespace WixToolset.Bal.Symbols

25 public enum WixBalBAFactorySymbolFields

26 {

27 PayloadId,

28 + FilePath,

29 }

31 public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol

@@ -43,5 +45,11 @@ namespace WixToolset.Bal.Symbols

45 get => this.Fields[(int)WixBalBAFactorySymbolFields.PayloadId].AsString();

46 set => this.Set((int)WixBalBAFactorySymbolFields.PayloadId, value);

47 }

48 +

49 + public string FilePath

50 + {

51 + get => this.Fields[(int)WixBalBAFactorySymbolFields.FilePath].AsString();

52 + set => this.Set((int)WixBalBAFactorySymbolFields.FilePath, value);

53 + }

54 }

55 }

\ No newline at end of file

src/wixstdba/packages.config