diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-03-02 17:26:47 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-03-02 17:37:00 -0600 |
| commit | 8ec8f5b0091fce08be88acee1f49dbf2edf040a9 (patch) | |
| tree | 323f3a08079f0d2136414583babd6b331be71685 | |
| parent | 2b0b668cf38f06bf1a577f218f217e8edf6494c1 (diff) | |
| download | wix-8ec8f5b0091fce08be88acee1f49dbf2edf040a9.tar.gz wix-8ec8f5b0091fce08be88acee1f49dbf2edf040a9.tar.bz2 wix-8ec8f5b0091fce08be88acee1f49dbf2edf040a9.zip | |
Update dependencies and integrate changes.
| -rw-r--r-- | global.json | 2 | ||||
| -rw-r--r-- | src/Samples/bafunctions/bafunctions.vcxproj | 12 | ||||
| -rw-r--r-- | src/Samples/bafunctions/packages.config | 6 | ||||
| -rw-r--r-- | src/dnchost/dnchost.cpp | 23 | ||||
| -rw-r--r-- | src/dnchost/dnchost.vcxproj | 12 | ||||
| -rw-r--r-- | src/dnchost/packages.config | 6 | ||||
| -rw-r--r-- | src/mbahost/mbahost.vcxproj | 12 | ||||
| -rw-r--r-- | src/mbahost/packages.config | 6 | ||||
| -rw-r--r-- | src/test/examples/TestEngine/Example.TestEngine.vcxproj | 12 | ||||
| -rw-r--r-- | src/test/examples/TestEngine/packages.config | 6 | ||||
| -rw-r--r-- | src/wixext/BalBurnBackendExtension.cs | 24 | ||||
| -rw-r--r-- | src/wixext/BalCompiler.cs | 38 | ||||
| -rw-r--r-- | src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs | 8 | ||||
| -rw-r--r-- | src/wixstdba/packages.config | 6 | ||||
| -rw-r--r-- | src/wixstdba/wixstdba.vcxproj | 12 |
15 files changed, 99 insertions, 86 deletions
diff --git a/global.json b/global.json index 34e8e7e6..137c0ebf 100644 --- a/global.json +++ b/global.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "msbuild-sdks": { | 2 | "msbuild-sdks": { |
| 3 | "WixToolset.Sdk": "4.0.0-build-0192" | 3 | "WixToolset.Sdk": "4.0.0-build-0193" |
| 4 | }, | 4 | }, |
| 5 | "sdk": { | 5 | "sdk": { |
| 6 | "allowPrerelease": false | 6 | "allowPrerelease": false |
diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 9e51292e..53a3ccb9 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj | |||
| @@ -2,9 +2,9 @@ | |||
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | 3 | ||
| 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.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.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.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.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.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')" /> |
| 8 | 8 | ||
| 9 | <ItemGroup Label="ProjectConfigurations"> | 9 | <ItemGroup Label="ProjectConfigurations"> |
| 10 | <ProjectConfiguration Include="Debug|ARM64"> | 10 | <ProjectConfiguration Include="Debug|ARM64"> |
| @@ -73,9 +73,9 @@ | |||
| 73 | <PropertyGroup> | 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> | 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> | 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'))" /> | 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.89\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.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.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.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'))" /> | 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> | 80 | </Target> |
| 81 | </Project> | 81 | </Project> |
diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 946209d8..8b492f22 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <packages> | 2 | <packages> |
| 3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | 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" /> | 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.94" targetFramework="native" /> |
| 5 | <package id="WixToolset.BalUtil" version="4.0.49" targetFramework="native" /> | 5 | <package id="WixToolset.BalUtil" version="4.0.50" targetFramework="native" /> |
| 6 | <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" /> | 6 | <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" /> |
| 7 | </packages> \ No newline at end of file | 7 | </packages> \ No newline at end of file |
diff --git a/src/dnchost/dnchost.cpp b/src/dnchost/dnchost.cpp index 503537c0..8ca326fc 100644 --- a/src/dnchost/dnchost.cpp +++ b/src/dnchost/dnchost.cpp | |||
| @@ -169,9 +169,6 @@ static HRESULT LoadDncConfiguration( | |||
| 169 | HRESULT hr = S_OK; | 169 | HRESULT hr = S_OK; |
| 170 | IXMLDOMDocument* pixdManifest = NULL; | 170 | IXMLDOMDocument* pixdManifest = NULL; |
| 171 | IXMLDOMNode* pixnHost = NULL; | 171 | IXMLDOMNode* pixnHost = NULL; |
| 172 | IXMLDOMNode* pixnPayload = NULL; | ||
| 173 | LPWSTR sczPayloadId = NULL; | ||
| 174 | LPWSTR sczPayloadXPath = NULL; | ||
| 175 | LPWSTR sczPayloadName = NULL; | 172 | LPWSTR sczPayloadName = NULL; |
| 176 | DWORD dwBool = 0; | 173 | DWORD dwBool = 0; |
| 177 | 174 | ||
| @@ -187,21 +184,8 @@ static HRESULT LoadDncConfiguration( | |||
| 187 | BalExitOnRootFailure(hr, "Failed to find WixBalBAFactoryAssembly element in bootstrapper application config."); | 184 | BalExitOnRootFailure(hr, "Failed to find WixBalBAFactoryAssembly element in bootstrapper application config."); |
| 188 | } | 185 | } |
| 189 | 186 | ||
| 190 | hr = XmlGetAttributeEx(pixnHost, L"PayloadId", &sczPayloadId); | 187 | hr = XmlGetAttributeEx(pixnHost, L"FilePath", &sczPayloadName); |
| 191 | BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@PayloadId."); | 188 | BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@FilePath."); |
| 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."); | ||
| 205 | 189 | ||
| 206 | hr = PathConcat(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath); | 190 | hr = PathConcat(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath); |
| 207 | BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath."); | 191 | BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath."); |
| @@ -250,9 +234,6 @@ static HRESULT LoadDncConfiguration( | |||
| 250 | 234 | ||
| 251 | LExit: | 235 | LExit: |
| 252 | ReleaseStr(sczPayloadName); | 236 | ReleaseStr(sczPayloadName); |
| 253 | ReleaseObject(pixnPayload); | ||
| 254 | ReleaseStr(sczPayloadXPath); | ||
| 255 | ReleaseStr(sczPayloadId); | ||
| 256 | ReleaseObject(pixnHost); | 237 | ReleaseObject(pixnHost); |
| 257 | ReleaseObject(pixdManifest); | 238 | ReleaseObject(pixdManifest); |
| 258 | 239 | ||
diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 9c04849c..c5b6b416 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj | |||
| @@ -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')" /> | 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')" /> | 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')" /> | 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')" /> | 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.89\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.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.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.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"> | 10 | <ItemGroup Label="ProjectConfigurations"> |
| 11 | <ProjectConfiguration Include="Debug|ARM64"> | 11 | <ProjectConfiguration Include="Debug|ARM64"> |
| 12 | <Configuration>Debug</Configuration> | 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'))" /> | 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'))" /> | 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'))" /> | 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'))" /> | 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.89\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.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.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.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> | 105 | </Target> |
| 106 | </Project> \ No newline at end of file | 106 | </Project> \ No newline at end of file |
diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index f60d813a..61787995 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> | 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" /> | 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" /> | 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" /> | 10 | <package id="WixToolset.BalUtil" version="4.0.50" targetFramework="native" /> |
| 11 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" /> | 11 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.94" targetFramework="native" /> |
| 12 | <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" /> | 12 | <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" /> |
| 13 | </packages> \ No newline at end of file | 13 | </packages> \ No newline at end of file |
diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 4677d32a..7df76c02 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj | |||
| @@ -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')" /> | 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')" /> | 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')" /> | 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')" /> | 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.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.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.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.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')" /> |
| 11 | 11 | ||
| 12 | <ItemGroup Label="ProjectConfigurations"> | 12 | <ItemGroup Label="ProjectConfigurations"> |
| 13 | <ProjectConfiguration Include="Debug|ARM64"> | 13 | <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'))" /> | 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'))" /> | 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'))" /> | 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'))" /> | 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.89\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.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.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.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> | 105 | </Target> |
| 106 | </Project> \ No newline at end of file | 106 | </Project> \ No newline at end of file |
diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 584038b6..71960076 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | 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" /> | 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" /> | 6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> |
| 7 | <package id="WixToolset.BalUtil" version="4.0.49" targetFramework="native" /> | 7 | <package id="WixToolset.BalUtil" version="4.0.50" targetFramework="native" /> |
| 8 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" /> | 8 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.94" targetFramework="native" /> |
| 9 | <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" /> | 9 | <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" /> |
| 10 | </packages> \ No newline at end of file | 10 | </packages> \ No newline at end of file |
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index 9f186450..0a669452 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.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.89\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.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.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.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"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
| 8 | <ProjectConfiguration Include="Debug|ARM64"> | 8 | <ProjectConfiguration Include="Debug|ARM64"> |
| 9 | <Configuration>Debug</Configuration> | 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> | 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> | 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'))" /> | 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'))" /> | 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.89\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.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.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.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> | 82 | </Target> |
| 83 | </Project> \ No newline at end of file | 83 | </Project> \ No newline at end of file |
diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index 946209d8..8b492f22 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <packages> | 2 | <packages> |
| 3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | 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" /> | 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.94" targetFramework="native" /> |
| 5 | <package id="WixToolset.BalUtil" version="4.0.49" targetFramework="native" /> | 5 | <package id="WixToolset.BalUtil" version="4.0.50" targetFramework="native" /> |
| 6 | <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" /> | 6 | <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" /> |
| 7 | </packages> \ No newline at end of file | 7 | </packages> \ No newline at end of file |
diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index 5e647b1c..6e639c1b 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs | |||
| @@ -43,6 +43,11 @@ namespace WixToolset.Bal | |||
| 43 | var isDNC = baId.StartsWith("WixDotNetCoreBootstrapperApplicationHost"); | 43 | var isDNC = baId.StartsWith("WixDotNetCoreBootstrapperApplicationHost"); |
| 44 | var isSCD = isDNC && this.VerifySCD(section); | 44 | var isSCD = isDNC && this.VerifySCD(section); |
| 45 | 45 | ||
| 46 | if (isDNC) | ||
| 47 | { | ||
| 48 | this.FinalizeBAFactorySymbol(section); | ||
| 49 | } | ||
| 50 | |||
| 46 | if (isStdBA || isMBA || isDNC) | 51 | if (isStdBA || isMBA || isDNC) |
| 47 | { | 52 | { |
| 48 | this.VerifyBAFunctions(section); | 53 | this.VerifyBAFunctions(section); |
| @@ -54,6 +59,25 @@ namespace WixToolset.Bal | |||
| 54 | } | 59 | } |
| 55 | } | 60 | } |
| 56 | 61 | ||
| 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 | |||
| 57 | private void VerifyBAFunctions(IntermediateSection section) | 81 | private void VerifyBAFunctions(IntermediateSection section) |
| 58 | { | 82 | { |
| 59 | WixBalBAFunctionsSymbol baFunctionsSymbol = null; | 83 | WixBalBAFunctionsSymbol baFunctionsSymbol = null; |
diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index 441ad004..267345e7 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs | |||
| @@ -136,7 +136,7 @@ namespace WixToolset.Bal | |||
| 136 | case "MsiPackage": | 136 | case "MsiPackage": |
| 137 | case "MspPackage": | 137 | case "MspPackage": |
| 138 | var displayInternalUICondition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); | 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 | { | 140 | { |
| 141 | PackageId = packageId, | 141 | PackageId = packageId, |
| 142 | DisplayInternalUICondition = displayInternalUICondition, | 142 | DisplayInternalUICondition = displayInternalUICondition, |
| @@ -247,7 +247,7 @@ namespace WixToolset.Bal | |||
| 247 | if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) | 247 | if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) |
| 248 | { | 248 | { |
| 249 | // There can only be one. | 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) | 251 | section.AddSymbol(new WixBalBAFactoryAssemblySymbol(sourceLineNumbers, id) |
| 252 | { | 252 | { |
| 253 | PayloadId = payloadId, | 253 | PayloadId = payloadId, |
| @@ -551,7 +551,7 @@ namespace WixToolset.Bal | |||
| 551 | { | 551 | { |
| 552 | if (!String.IsNullOrEmpty(launchTarget)) | 552 | if (!String.IsNullOrEmpty(launchTarget)) |
| 553 | { | 553 | { |
| 554 | section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) | 554 | section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchTarget")) |
| 555 | { | 555 | { |
| 556 | Value = launchTarget, | 556 | Value = launchTarget, |
| 557 | Type = WixBundleVariableType.Formatted, | 557 | Type = WixBundleVariableType.Formatted, |
| @@ -560,7 +560,7 @@ namespace WixToolset.Bal | |||
| 560 | 560 | ||
| 561 | if (!String.IsNullOrEmpty(launchTargetElevatedId)) | 561 | if (!String.IsNullOrEmpty(launchTargetElevatedId)) |
| 562 | { | 562 | { |
| 563 | section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTargetElevatedId")) | 563 | section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchTargetElevatedId")) |
| 564 | { | 564 | { |
| 565 | Value = launchTargetElevatedId, | 565 | Value = launchTargetElevatedId, |
| 566 | Type = WixBundleVariableType.Formatted, | 566 | Type = WixBundleVariableType.Formatted, |
| @@ -569,7 +569,7 @@ namespace WixToolset.Bal | |||
| 569 | 569 | ||
| 570 | if (!String.IsNullOrEmpty(launchArguments)) | 570 | if (!String.IsNullOrEmpty(launchArguments)) |
| 571 | { | 571 | { |
| 572 | section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchArguments")) | 572 | section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchArguments")) |
| 573 | { | 573 | { |
| 574 | Value = launchArguments, | 574 | Value = launchArguments, |
| 575 | Type = WixBundleVariableType.Formatted, | 575 | Type = WixBundleVariableType.Formatted, |
| @@ -578,7 +578,7 @@ namespace WixToolset.Bal | |||
| 578 | 578 | ||
| 579 | if (YesNoType.Yes == launchHidden) | 579 | if (YesNoType.Yes == launchHidden) |
| 580 | { | 580 | { |
| 581 | section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchHidden")) | 581 | section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchHidden")) |
| 582 | { | 582 | { |
| 583 | Value = "yes", | 583 | Value = "yes", |
| 584 | Type = WixBundleVariableType.Formatted, | 584 | Type = WixBundleVariableType.Formatted, |
| @@ -588,7 +588,7 @@ namespace WixToolset.Bal | |||
| 588 | 588 | ||
| 589 | if (!String.IsNullOrEmpty(launchWorkingDir)) | 589 | if (!String.IsNullOrEmpty(launchWorkingDir)) |
| 590 | { | 590 | { |
| 591 | section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchWorkingFolder")) | 591 | section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchWorkingFolder")) |
| 592 | { | 592 | { |
| 593 | Value = launchWorkingDir, | 593 | Value = launchWorkingDir, |
| 594 | Type = WixBundleVariableType.Formatted, | 594 | Type = WixBundleVariableType.Formatted, |
| @@ -597,7 +597,7 @@ namespace WixToolset.Bal | |||
| 597 | 597 | ||
| 598 | if (!String.IsNullOrEmpty(licenseFile)) | 598 | if (!String.IsNullOrEmpty(licenseFile)) |
| 599 | { | 599 | { |
| 600 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf")) | 600 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLicenseRtf")) |
| 601 | { | 601 | { |
| 602 | Value = licenseFile, | 602 | Value = licenseFile, |
| 603 | }); | 603 | }); |
| @@ -605,7 +605,7 @@ namespace WixToolset.Bal | |||
| 605 | 605 | ||
| 606 | if (null != licenseUrl) | 606 | if (null != licenseUrl) |
| 607 | { | 607 | { |
| 608 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl")) | 608 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLicenseUrl")) |
| 609 | { | 609 | { |
| 610 | Value = licenseUrl, | 610 | Value = licenseUrl, |
| 611 | }); | 611 | }); |
| @@ -613,7 +613,7 @@ namespace WixToolset.Bal | |||
| 613 | 613 | ||
| 614 | if (!String.IsNullOrEmpty(logoFile)) | 614 | if (!String.IsNullOrEmpty(logoFile)) |
| 615 | { | 615 | { |
| 616 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogo")) | 616 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLogo")) |
| 617 | { | 617 | { |
| 618 | Value = logoFile, | 618 | Value = logoFile, |
| 619 | }); | 619 | }); |
| @@ -621,7 +621,7 @@ namespace WixToolset.Bal | |||
| 621 | 621 | ||
| 622 | if (!String.IsNullOrEmpty(logoSideFile)) | 622 | if (!String.IsNullOrEmpty(logoSideFile)) |
| 623 | { | 623 | { |
| 624 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogoSide")) | 624 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLogoSide")) |
| 625 | { | 625 | { |
| 626 | Value = logoSideFile, | 626 | Value = logoSideFile, |
| 627 | }); | 627 | }); |
| @@ -629,7 +629,7 @@ namespace WixToolset.Bal | |||
| 629 | 629 | ||
| 630 | if (!String.IsNullOrEmpty(themeFile)) | 630 | if (!String.IsNullOrEmpty(themeFile)) |
| 631 | { | 631 | { |
| 632 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeXml")) | 632 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaThemeXml")) |
| 633 | { | 633 | { |
| 634 | Value = themeFile, | 634 | Value = themeFile, |
| 635 | }); | 635 | }); |
| @@ -637,7 +637,7 @@ namespace WixToolset.Bal | |||
| 637 | 637 | ||
| 638 | if (!String.IsNullOrEmpty(localizationFile)) | 638 | if (!String.IsNullOrEmpty(localizationFile)) |
| 639 | { | 639 | { |
| 640 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeWxl")) | 640 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaThemeWxl")) |
| 641 | { | 641 | { |
| 642 | Value = localizationFile, | 642 | Value = localizationFile, |
| 643 | }); | 643 | }); |
| @@ -761,7 +761,7 @@ namespace WixToolset.Bal | |||
| 761 | { | 761 | { |
| 762 | if (!String.IsNullOrEmpty(logoFile)) | 762 | if (!String.IsNullOrEmpty(logoFile)) |
| 763 | { | 763 | { |
| 764 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo")) | 764 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaLogo")) |
| 765 | { | 765 | { |
| 766 | Value = logoFile, | 766 | Value = logoFile, |
| 767 | }); | 767 | }); |
| @@ -769,7 +769,7 @@ namespace WixToolset.Bal | |||
| 769 | 769 | ||
| 770 | if (!String.IsNullOrEmpty(themeFile)) | 770 | if (!String.IsNullOrEmpty(themeFile)) |
| 771 | { | 771 | { |
| 772 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeXml")) | 772 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaThemeXml")) |
| 773 | { | 773 | { |
| 774 | Value = themeFile, | 774 | Value = themeFile, |
| 775 | }); | 775 | }); |
| @@ -777,7 +777,7 @@ namespace WixToolset.Bal | |||
| 777 | 777 | ||
| 778 | if (!String.IsNullOrEmpty(localizationFile)) | 778 | if (!String.IsNullOrEmpty(localizationFile)) |
| 779 | { | 779 | { |
| 780 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeWxl")) | 780 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaThemeWxl")) |
| 781 | { | 781 | { |
| 782 | Value = localizationFile, | 782 | Value = localizationFile, |
| 783 | }); | 783 | }); |
| @@ -864,7 +864,7 @@ namespace WixToolset.Bal | |||
| 864 | { | 864 | { |
| 865 | if (!String.IsNullOrEmpty(logoFile)) | 865 | if (!String.IsNullOrEmpty(logoFile)) |
| 866 | { | 866 | { |
| 867 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo")) | 867 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaLogo")) |
| 868 | { | 868 | { |
| 869 | Value = logoFile, | 869 | Value = logoFile, |
| 870 | }); | 870 | }); |
| @@ -872,7 +872,7 @@ namespace WixToolset.Bal | |||
| 872 | 872 | ||
| 873 | if (!String.IsNullOrEmpty(themeFile)) | 873 | if (!String.IsNullOrEmpty(themeFile)) |
| 874 | { | 874 | { |
| 875 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeXml")) | 875 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaThemeXml")) |
| 876 | { | 876 | { |
| 877 | Value = themeFile, | 877 | Value = themeFile, |
| 878 | }); | 878 | }); |
| @@ -880,7 +880,7 @@ namespace WixToolset.Bal | |||
| 880 | 880 | ||
| 881 | if (!String.IsNullOrEmpty(localizationFile)) | 881 | if (!String.IsNullOrEmpty(localizationFile)) |
| 882 | { | 882 | { |
| 883 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeWxl")) | 883 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaThemeWxl")) |
| 884 | { | 884 | { |
| 885 | Value = localizationFile, | 885 | Value = localizationFile, |
| 886 | }); | 886 | }); |
diff --git a/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs b/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs index 0423a52f..52042e4c 100644 --- a/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs +++ b/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs | |||
| @@ -12,6 +12,7 @@ namespace WixToolset.Bal | |||
| 12 | new[] | 12 | new[] |
| 13 | { | 13 | { |
| 14 | new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.PayloadId), IntermediateFieldType.String), | 14 | new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.PayloadId), IntermediateFieldType.String), |
| 15 | new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.FilePath), IntermediateFieldType.String), | ||
| 15 | }, | 16 | }, |
| 16 | typeof(WixBalBAFactoryAssemblySymbol)); | 17 | typeof(WixBalBAFactoryAssemblySymbol)); |
| 17 | } | 18 | } |
| @@ -24,6 +25,7 @@ namespace WixToolset.Bal.Symbols | |||
| 24 | public enum WixBalBAFactorySymbolFields | 25 | public enum WixBalBAFactorySymbolFields |
| 25 | { | 26 | { |
| 26 | PayloadId, | 27 | PayloadId, |
| 28 | FilePath, | ||
| 27 | } | 29 | } |
| 28 | 30 | ||
| 29 | public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol | 31 | public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol |
| @@ -43,5 +45,11 @@ namespace WixToolset.Bal.Symbols | |||
| 43 | get => this.Fields[(int)WixBalBAFactorySymbolFields.PayloadId].AsString(); | 45 | get => this.Fields[(int)WixBalBAFactorySymbolFields.PayloadId].AsString(); |
| 44 | set => this.Set((int)WixBalBAFactorySymbolFields.PayloadId, value); | 46 | set => this.Set((int)WixBalBAFactorySymbolFields.PayloadId, value); |
| 45 | } | 47 | } |
| 48 | |||
| 49 | public string FilePath | ||
| 50 | { | ||
| 51 | get => this.Fields[(int)WixBalBAFactorySymbolFields.FilePath].AsString(); | ||
| 52 | set => this.Set((int)WixBalBAFactorySymbolFields.FilePath, value); | ||
| 53 | } | ||
| 46 | } | 54 | } |
| 47 | } \ No newline at end of file | 55 | } \ No newline at end of file |
diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 584038b6..71960076 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | 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" /> | 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" /> | 6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> |
| 7 | <package id="WixToolset.BalUtil" version="4.0.49" targetFramework="native" /> | 7 | <package id="WixToolset.BalUtil" version="4.0.50" targetFramework="native" /> |
| 8 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" /> | 8 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.94" targetFramework="native" /> |
| 9 | <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" /> | 9 | <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" /> |
| 10 | </packages> \ No newline at end of file | 10 | </packages> \ No newline at end of file |
diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 7bd7d10f..e83d60f2 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj | |||
| @@ -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')" /> | 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')" /> | 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')" /> | 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')" /> | 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.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.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.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.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')" /> |
| 11 | 11 | ||
| 12 | <ItemGroup Label="ProjectConfigurations"> | 12 | <ItemGroup Label="ProjectConfigurations"> |
| 13 | <ProjectConfiguration Include="Debug|ARM64"> | 13 | <ProjectConfiguration Include="Debug|ARM64"> |
| @@ -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'))" /> | 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'))" /> | 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'))" /> | 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.49\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props'))" /> | 97 | <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'))" /> |
| 98 | <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'))" /> | 98 | <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'))" /> |
| 99 | <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'))" /> | 99 | <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'))" /> |
| 100 | </Target> | 100 | </Target> |
| 101 | </Project> \ No newline at end of file | 101 | </Project> \ No newline at end of file |
