From 488353e9b6b80b7732083cc9b2624abeb3638e8d Mon Sep 17 00:00:00 2001
From: Nir Bar <nir.bar@panel-sw.co.il>
Date: Tue, 21 Nov 2023 10:04:53 +0200
Subject: [PATCH] Fix github-build failure

---
 .github/workflows/build.yml                                 | 1 +
 src/Directory.csproj.targets                                | 1 +
 .../WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj  | 1 +
 .../FullFramework2MBA/Example.FullFramework2MBA.csproj      | 1 +
 src/internal/SetBuildNumber/Directory.Packages.props.pp     | 6 +++---
 src/test/burn/TestBA/TestBA.csproj                          | 1 +
 src/test/burn/TestBA/TestBA_x64.csproj                      | 1 +
 src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj      | 3 ++-
 src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj  | 3 ++-
 .../WixToolsetTest.Core.Native.csproj                       | 1 +
 10 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 90049bdcf..b6206b745 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -68,6 +68,7 @@ jobs:
           RuntimeTestsEnabled: true
           SigningVaultUri:  ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_VAULTURI || '' }}
           SigningCertName:  ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_CERTNAME || '' }}
+          BuildRunNumber:  ${{ github.run_number }}
 
       - name: Resolve build version
         if: always()
diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets
index ba7185e89..a6a0be9f0 100644
--- a/src/Directory.csproj.targets
+++ b/src/Directory.csproj.targets
@@ -5,6 +5,7 @@
     <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
     <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
     <DefineConstants Condition=" '$(Configuration)'=='Debug' ">$(DefineConstants);DEBUG</DefineConstants>
+    <SelfContained Condition=" '$(SelfContained)'=='' And '$(RuntimeIdentifier)' != '' ">true</SelfContained>
 
     <WixVersionThisAssemblyFile>$(RootBuildFolder)ThisAssembly.WixVer.cs</WixVersionThisAssemblyFile>
   </PropertyGroup>
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
index 7c21734fa..f47741206 100644
--- 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
index b9688d0d6..103a47ce5 100644
--- 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>true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
 
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 54d0627f0..fa78e92c6 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -70,9 +70,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageVersion Include="NuGet.Credentials" Version="6.3.1" />
-    <PackageVersion Include="NuGet.Protocol" Version="6.3.1" />
-    <PackageVersion Include="NuGet.Versioning" Version="6.3.1" />
+    <PackageVersion Include="NuGet.Credentials" Version="6.7.0" />
+    <PackageVersion Include="NuGet.Protocol" Version="6.7.0" />
+    <PackageVersion Include="NuGet.Versioning" Version="6.7.0" />
   </ItemGroup>
 
   <!--
diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj
index 609ac361c..d3f3edc88 100644
--- 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>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
index e1d5c00b3..e79182f17 100644
--- 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>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
index f31cf019c..d7f74215a 100644
--- 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>true</SelfContained>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <AssemblyTitle>WixToolset.WixBA</AssemblyTitle>
     <Description>WiX Bootstrapper Application</Description>
@@ -41,4 +42,4 @@
   <ItemGroup Condition=" '$(TargetFrameworkIdentifier)'!='.NETFramework' ">
     <PackageReference Include="PanelSwWix4.Dnc.HostGenerator" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
index 815bbfac5..8c5185d81 100644
--- 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>true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AssemblyTitle>WixToolset.WixBA</AssemblyTitle>
     <Description>WiX Bootstrapper Application</Description>
@@ -41,4 +42,4 @@
   <ItemGroup Condition=" '$(TargetFrameworkIdentifier)'!='.NETFramework' ">
     <PackageReference Include="PanelSwWix4.Dnc.HostGenerator" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
index 335c26ba2..2ea6afbc2 100644
--- 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>