Upgrade dnchost's nethost dependency to .NET 6.0.4.

5 files changed, 45 insertions, 0 deletions

diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/EarliestCoreBundleFDDx86.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/EarliestCoreBundleFDDx86.wixproj
new file mode 100644
index 00000000..470ee042
--- /dev/null
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/EarliestCoreBundleFDDx86.wixproj
@@ -0,0 +1,6 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <InstallerPlatform>x86</InstallerPlatform>
+  </PropertyGroup>
+</Project>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs
new file mode 100644
index 00000000..3672fc1d
--- /dev/null
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs
@@ -0,0 +1,15 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="FDDx86EarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="{3D4A29A0-8AAE-4831-A9CF-E34AC298097D}">
+        <BootstrapperApplication>
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.deps.json" Name="Example.EarliestCoreMBA.deps.json" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
+            <bal:WixDotNetCoreBootstrapperApplicationHost />
+        </BootstrapperApplication>
+        <Chain>
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe"  bal:PrereqPackage="yes" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs
new file mode 100644
index 00000000..15dd290a
--- /dev/null
+++ b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs
@@ -0,0 +1,15 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="FDDx86LatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="{E547C546-5E0E-4BF9-A675-BBEF4C77FF0D}">
+        <BootstrapperApplication>
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.deps.json" Name="Example.LatestCoreMBA.deps.json" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
+            <bal:WixDotNetCoreBootstrapperApplicationHost />
+        </BootstrapperApplication>
+        <Chain>
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/LatestCoreBundleFDDx86.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/LatestCoreBundleFDDx86.wixproj
new file mode 100644
index 00000000..470ee042
--- /dev/null
+++ b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/LatestCoreBundleFDDx86.wixproj
@@ -0,0 +1,6 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <InstallerPlatform>x86</InstallerPlatform>
+  </PropertyGroup>
+</Project>
diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj
index 20d4ecd5..82a5e3c1 100644
--- a/src/ext/Bal/test/examples/examples.proj
+++ b/src/ext/Bal/test/examples/examples.proj
@@ -25,6 +25,7 @@
     </CoreMBAProject>
     <CoreMBAProject Include="$(WPFCoreMBAProjectPath)">
       <PublishPath>$(MBAPublishPath)Example.WPFCoreMBA</PublishPath>
+      <SkipFDDx86>true</SkipFDDx86>
       <SkipSCD>true</SkipSCD>
     </CoreMBAProject>
     
@@ -35,6 +36,8 @@
   </ItemGroup>
 
   <Target Name="PublishCoreExamples">
+    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd-x86" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
+          Condition="'%(CoreMBAProject.SkipFDDx86)'==''" />
     <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x64 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
           Condition="'%(CoreMBAProject.SkipFDD)'==''" />
     <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x64 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"'