Build with dotnet sdk 6.0.x, VS 2019

Set SelfContained=true for .net projects
nirbar · Nov 22, 2023 · ca3f1ee · ca3f1ee
1 parent 0610efe
commit ca3f1ee
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ env:
 jobs:
   build:
     name: Build
-    runs-on: windows-2022
+    runs-on: windows-2019
     permissions:
       packages: write
       id-token: write
@@ -114,7 +114,7 @@ jobs:
           path: build/logs/
 
       - name: Publish nuget packages to github
-        if: ${{ github.event.inputs.publish_nuget == 'true' }}
+        if: ${{ github.event.inputs.publish_nuget == 'true' }} && ${{ github.ref == 'refs/heads/develop-psw-wix' }}
         env:
           GITHUB_TOKEN: ${{ secrets.MY_GITHUB_PAT }}
         run: |

diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -4,6 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>

diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
@@ -7,6 +7,7 @@
     <AssemblyName>Example.FullFramework2MBA</AssemblyName>
     <RootNamespace>Example.FullFramework2MBA</RootNamespace>
     <DebugType>embedded</DebugType>
+    <SelfContained>false</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
 

diff --git a/src/internal/SetBuildNumber/global.json.pp b/src/internal/SetBuildNumber/global.json.pp
@@ -5,6 +5,8 @@
     "PanelSwWix4.Sdk": "{packageversion}"
   },
   "sdk": {
+    "version": "6.0.0",
+    "rollForward": "latestMinor",
     "allowPrerelease": false
   }
 }
diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj
@@ -7,6 +7,7 @@
     <AssemblyName>TestBA</AssemblyName>
     <RootNamespace>WixToolset.Test.BA</RootNamespace>
     <DebugType>embedded</DebugType>
+    <SelfContained Condition=" '$(TargetFrameworkIdentifier)'!='.NETFramework' ">true</SelfContained>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <UseWindowsForms>true</UseWindowsForms>

diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj
@@ -7,6 +7,7 @@
     <AssemblyName>TestBA</AssemblyName>
     <RootNamespace>WixToolset.Test.BA</RootNamespace>
     <DebugType>embedded</DebugType>
+    <SelfContained Condition=" '$(TargetFrameworkIdentifier)'!='.NETFramework' ">true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <UseWindowsForms>true</UseWindowsForms>

diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
@@ -6,6 +6,7 @@
     <AssemblyName>WixToolset.WixBA</AssemblyName>
     <RootNamespace>WixToolset.WixBA</RootNamespace>
     <DebugType>embedded</DebugType>
+    <SelfContained Condition=" '$(TargetFrameworkIdentifier)'!='.NETFramework' ">true</SelfContained>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <AssemblyTitle>WixToolset.WixBA</AssemblyTitle>
     <Description>WiX Bootstrapper Application</Description>

diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
@@ -6,6 +6,7 @@
     <AssemblyName>WixToolset.WixBA</AssemblyName>
     <RootNamespace>WixToolset.WixBA</RootNamespace>
     <DebugType>embedded</DebugType>
+    <SelfContained Condition=" '$(TargetFrameworkIdentifier)'!='.NETFramework' ">true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AssemblyTitle>WixToolset.WixBA</AssemblyTitle>
     <Description>WiX Bootstrapper Application</Description>

diff --git a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
@@ -5,6 +5,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
     <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
     <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>

diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -688,6 +688,7 @@ public void CanBuildMultiTargetingWixlibUsingRids(BuildSystem buildSystem)
 
                 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] {
                     "-Restore",
+                    "-p:SelfContained=true",
                     MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath)
                     });
                 result.AssertSuccess();
@@ -726,6 +727,7 @@ public void CanBuildMultiTargetingWixlibUsingRidsWithReleaseAndDebug(BuildSystem
 
                 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] {
                     "-Restore",
+                    "-p:SelfContained=true",
                     MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath)
                     });
                 result.AssertSuccess();