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>