diff options
| author | Bob Arnson <bob@firegiant.com> | 2025-04-27 11:21:34 -0400 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2025-06-11 23:34:42 -0400 |
| commit | 7051e6a5fdc8965289fbc34d0de2a78dae14e62e (patch) | |
| tree | 4a6ba3d354089b0abdf1c295a9b79b5e56ea39f1 /src/ext | |
| parent | fddc154029b838c2fd83a2eee09d53468dd4cf08 (diff) | |
| download | wix-7051e6a5fdc8965289fbc34d0de2a78dae14e62e.tar.gz wix-7051e6a5fdc8965289fbc34d0de2a78dae14e62e.tar.bz2 wix-7051e6a5fdc8965289fbc34d0de2a78dae14e62e.zip | |
Add `Payloads` element to harvest bundle payloads.
Implements https://github.com/wixtoolset/issues/issues/9049
Diffstat (limited to 'src/ext')
13 files changed, 25 insertions, 113 deletions
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj index 1179bea7..aea77d1b 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj +++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj | |||
| @@ -1,14 +1,6 @@ | |||
| 1 | <!-- 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. --> | 1 | <!-- 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 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <ItemGroup> | 3 | <ItemGroup> |
| 4 | <BindPath Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd" /> | 4 | <BindPath Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd" BindName="ba.payloads" /> |
| 5 | <HarvestDirectory Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd"> | ||
| 6 | <DirectoryRefId>publish.Example.EarliestCoreMBA.scd</DirectoryRefId> | ||
| 7 | <Transforms>ba.xslt</Transforms> | ||
| 8 | </HarvestDirectory> | ||
| 9 | </ItemGroup> | ||
| 10 | |||
| 11 | <ItemGroup> | ||
| 12 | <PackageReference Include="WixToolset.Heat" /> | ||
| 13 | </ItemGroup> | 5 | </ItemGroup> |
| 14 | </Project> | 6 | </Project> |
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs index 38a167f1..68b697e7 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs +++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs | |||
| @@ -1,9 +1,11 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 2 | <Bundle Name="SCDEarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533"> | 2 | <Bundle Name="SCDEarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533"> |
| 3 | <BootstrapperApplication SourceFile="Example.EarliestCoreMBA.exe"> | 3 | <BootstrapperApplication SourceFile="!(bindpath.ba.payloads)\Example.EarliestCoreMBA.exe"> |
| 4 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> --> | 4 | <Payloads Include="!(bindpath.ba.payloads)\**"> |
| 5 | <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.scd" /> | 5 | <Exclude Files="!(bindpath.ba.payloads)\Example.EarliestCoreMBA.exe" /> |
| 6 | </Payloads> | ||
| 6 | </BootstrapperApplication> | 7 | </BootstrapperApplication> |
| 8 | |||
| 7 | <Chain> | 9 | <Chain> |
| 8 | <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" /> | 10 | <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" /> |
| 9 | </Chain> | 11 | </Chain> |
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt deleted file mode 100644 index d30b2564..00000000 --- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" | ||
| 3 | xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl" | ||
| 4 | xmlns:wix="http://wixtoolset.org/schemas/v4/wxs" | ||
| 5 | > | ||
| 6 | <xsl:output method="xml" indent="yes"/> | ||
| 7 | |||
| 8 | <xsl:template match="@* | node()"> | ||
| 9 | <xsl:copy> | ||
| 10 | <xsl:apply-templates select="@* | node()"/> | ||
| 11 | </xsl:copy> | ||
| 12 | </xsl:template> | ||
| 13 | |||
| 14 | <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.EarliestCoreMBA.exe']" /> | ||
| 15 | </xsl:stylesheet> | ||
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj index f9926550..5475022c 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj +++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj | |||
| @@ -1,14 +1,6 @@ | |||
| 1 | <!-- 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. --> | 1 | <!-- 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 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <ItemGroup> | 3 | <ItemGroup> |
| 4 | <BindInputPaths Include="$(OutputPath)publish\Example.EarliestCoreMBA\trimmedscd" /> | 4 | <BindInputPaths Include="$(OutputPath)publish\Example.EarliestCoreMBA\trimmedscd" BindName="ba.payloads" /> |
| 5 | <HarvestDirectory Include="$(OutputPath)publish\Example.EarliestCoreMBA\trimmedscd"> | ||
| 6 | <DirectoryRefId>publish.Example.EarliestCoreMBA.trimmedscd</DirectoryRefId> | ||
| 7 | <Transforms>ba.xslt</Transforms> | ||
| 8 | </HarvestDirectory> | ||
| 9 | </ItemGroup> | ||
| 10 | |||
| 11 | <ItemGroup> | ||
| 12 | <PackageReference Include="WixToolset.Heat" /> | ||
| 13 | </ItemGroup> | 5 | </ItemGroup> |
| 14 | </Project> | 6 | </Project> |
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs index bf4ad6e3..8895b279 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs +++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs | |||
| @@ -1,9 +1,11 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 2 | <Bundle Name="TrimmedSCDEarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533"> | 2 | <Bundle Name="TrimmedSCDEarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533"> |
| 3 | <BootstrapperApplication SourceFile="SourceDir\Example.EarliestCoreMBA.exe" > | 3 | <BootstrapperApplication SourceFile="!(bindpath.ba.payloads)\Example.EarliestCoreMBA.exe" > |
| 4 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> --> | 4 | <Payloads Include="!(bindpath.ba.payloads)\**"> |
| 5 | <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.trimmedscd" /> | 5 | <Exclude Files="!(bindpath.ba.payloads)\Example.EarliestCoreMBA.exe" /> |
| 6 | </Payloads> | ||
| 6 | </BootstrapperApplication> | 7 | </BootstrapperApplication> |
| 8 | |||
| 7 | <Chain> | 9 | <Chain> |
| 8 | <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" /> | 10 | <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" /> |
| 9 | </Chain> | 11 | </Chain> |
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt deleted file mode 100644 index d30b2564..00000000 --- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" | ||
| 3 | xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl" | ||
| 4 | xmlns:wix="http://wixtoolset.org/schemas/v4/wxs" | ||
| 5 | > | ||
| 6 | <xsl:output method="xml" indent="yes"/> | ||
| 7 | |||
| 8 | <xsl:template match="@* | node()"> | ||
| 9 | <xsl:copy> | ||
| 10 | <xsl:apply-templates select="@* | node()"/> | ||
| 11 | </xsl:copy> | ||
| 12 | </xsl:template> | ||
| 13 | |||
| 14 | <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.EarliestCoreMBA.exe']" /> | ||
| 15 | </xsl:stylesheet> | ||
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj index 048e3c97..73582984 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj +++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj | |||
| @@ -1,14 +1,6 @@ | |||
| 1 | <!-- 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. --> | 1 | <!-- 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 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <ItemGroup> | 3 | <ItemGroup> |
| 4 | <BindInputPaths Include="$(OutputPath)publish\Example.LatestCoreMBA\scd" /> | 4 | <BindInputPaths Include="$(OutputPath)publish\Example.LatestCoreMBA\scd" BindName="ba.payloads" /> |
| 5 | <HarvestDirectory Include="$(OutputPath)publish\Example.LatestCoreMBA\scd"> | ||
| 6 | <DirectoryRefId>publish.Example.LatestCoreMBA.scd</DirectoryRefId> | ||
| 7 | <Transforms>ba.xslt</Transforms> | ||
| 8 | </HarvestDirectory> | ||
| 9 | </ItemGroup> | ||
| 10 | |||
| 11 | <ItemGroup> | ||
| 12 | <PackageReference Include="WixToolset.Heat" /> | ||
| 13 | </ItemGroup> | 5 | </ItemGroup> |
| 14 | </Project> | 6 | </Project> |
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs index 0022b690..1f379b59 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs +++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs | |||
| @@ -1,9 +1,11 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 2 | <Bundle Name="SCDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533"> | 2 | <Bundle Name="SCDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533"> |
| 3 | <BootstrapperApplication SourceFile="Example.LatestCoreMBA.exe"> | 3 | <BootstrapperApplication SourceFile="!(bindpath.ba.payloads)\Example.LatestCoreMBA.exe"> |
| 4 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> --> | 4 | <Payloads Include="!(bindpath.ba.payloads)\**"> |
| 5 | <PayloadGroupRef Id="publish.Example.LatestCoreMBA.scd" /> | 5 | <Exclude Files="!(bindpath.ba.payloads)\Example.LatestCoreMBA.exe" /> |
| 6 | </Payloads> | ||
| 6 | </BootstrapperApplication> | 7 | </BootstrapperApplication> |
| 8 | |||
| 7 | <Chain> | 9 | <Chain> |
| 8 | <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" /> | 10 | <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" /> |
| 9 | </Chain> | 11 | </Chain> |
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt b/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt deleted file mode 100644 index f606296e..00000000 --- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" | ||
| 3 | xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl" | ||
| 4 | xmlns:wix="http://wixtoolset.org/schemas/v4/wxs" | ||
| 5 | > | ||
| 6 | <xsl:output method="xml" indent="yes"/> | ||
| 7 | |||
| 8 | <xsl:template match="@* | node()"> | ||
| 9 | <xsl:copy> | ||
| 10 | <xsl:apply-templates select="@* | node()"/> | ||
| 11 | </xsl:copy> | ||
| 12 | </xsl:template> | ||
| 13 | |||
| 14 | <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.LatestCoreMBA.exe']" /> | ||
| 15 | </xsl:stylesheet> | ||
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj index 056bf2bb..532f09b4 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj +++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj | |||
| @@ -1,14 +1,6 @@ | |||
| 1 | <!-- 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. --> | 1 | <!-- 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 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <ItemGroup> | 3 | <ItemGroup> |
| 4 | <BindInputPaths Include="$(OutputPath)publish\Example.LatestCoreMBA\trimmedscd" /> | 4 | <BindInputPaths Include="$(OutputPath)publish\Example.LatestCoreMBA\trimmedscd" BindName="ba.payloads" /> |
| 5 | <HarvestDirectory Include="$(OutputPath)publish\Example.LatestCoreMBA\trimmedscd"> | ||
| 6 | <DirectoryRefId>publish.Example.LatestCoreMBA.trimmedscd</DirectoryRefId> | ||
| 7 | <Transforms>ba.xslt</Transforms> | ||
| 8 | </HarvestDirectory> | ||
| 9 | </ItemGroup> | ||
| 10 | |||
| 11 | <ItemGroup> | ||
| 12 | <PackageReference Include="WixToolset.Heat" /> | ||
| 13 | </ItemGroup> | 5 | </ItemGroup> |
| 14 | </Project> | 6 | </Project> |
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs index 322a27a3..cd32628a 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs +++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs | |||
| @@ -1,9 +1,11 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 2 | <Bundle Name="TrimmedSCDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533"> | 2 | <Bundle Name="TrimmedSCDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533"> |
| 3 | <BootstrapperApplication SourceFile="Example.LatestCoreMBA.exe"> | 3 | <BootstrapperApplication SourceFile="!(bindpath.ba.payloads)\Example.LatestCoreMBA.exe"> |
| 4 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> --> | 4 | <Payloads Include="!(bindpath.ba.payloads)\**"> |
| 5 | <PayloadGroupRef Id="publish.Example.LatestCoreMBA.trimmedscd" /> | 5 | <Exclude Files="!(bindpath.ba.payloads)\Example.LatestCoreMBA.exe" /> |
| 6 | </Payloads> | ||
| 6 | </BootstrapperApplication> | 7 | </BootstrapperApplication> |
| 8 | |||
| 7 | <Chain> | 9 | <Chain> |
| 8 | <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" /> | 10 | <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" /> |
| 9 | </Chain> | 11 | </Chain> |
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt deleted file mode 100644 index f606296e..00000000 --- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" | ||
| 3 | xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl" | ||
| 4 | xmlns:wix="http://wixtoolset.org/schemas/v4/wxs" | ||
| 5 | > | ||
| 6 | <xsl:output method="xml" indent="yes"/> | ||
| 7 | |||
| 8 | <xsl:template match="@* | node()"> | ||
| 9 | <xsl:copy> | ||
| 10 | <xsl:apply-templates select="@* | node()"/> | ||
| 11 | </xsl:copy> | ||
| 12 | </xsl:template> | ||
| 13 | |||
| 14 | <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.LatestCoreMBA.exe']" /> | ||
| 15 | </xsl:stylesheet> | ||
diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj index c1544766..e439c288 100644 --- a/src/ext/Bal/test/examples/examples.proj +++ b/src/ext/Bal/test/examples/examples.proj | |||
| @@ -34,16 +34,12 @@ | |||
| 34 | Condition="'%(CoreMBAProject.SkipFDD)'==''" /> | 34 | Condition="'%(CoreMBAProject.SkipFDD)'==''" /> |
| 35 | <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x64 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"' | 35 | <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x64 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"' |
| 36 | Condition="'%(CoreMBAProject.SkipSCD)'==''" /> | 36 | Condition="'%(CoreMBAProject.SkipSCD)'==''" /> |
| 37 | <!-- | ||
| 38 | Publishing a library is "undefined" (per https://github.com/dotnet/runtime/issues/91535) | ||
| 39 | and is now a build error. This will go away when BAs go out of proc, so not spending a | ||
| 40 | lot of time to keep building trimmed in VS 17.8. | ||
| 41 | --> | ||
| 42 | <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x64 -c $(Configuration) --self-contained true -p:PublishTrimmed=false -p:TrimMode=%(CoreMBAProject.TrimMode) "%(CoreMBAProject.Identity)"' | 37 | <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x64 -c $(Configuration) --self-contained true -p:PublishTrimmed=false -p:TrimMode=%(CoreMBAProject.TrimMode) "%(CoreMBAProject.Identity)"' |
| 43 | Condition="'%(CoreMBAProject.TrimMode)'!=''" /> | 38 | Condition="'%(CoreMBAProject.TrimMode)'!=''" /> |
| 44 | </Target> | 39 | </Target> |
| 45 | 40 | ||
| 46 | <ItemGroup> | 41 | <ItemGroup> |
| 42 | <ProjectReference Include="..\..\wixext\WixToolset.BootstrapperApplications.wixext.csproj" /> | ||
| 47 | <ProjectReference Include="**\*.wixproj" /> | 43 | <ProjectReference Include="**\*.wixproj" /> |
| 48 | </ItemGroup> | 44 | </ItemGroup> |
| 49 | </Project> | 45 | </Project> |
