Move Dev Home to WAP Project to support upcoming features (microsoft#…

…2729) * Move Dev Home to WAP Project to support upcoming features --------- Co-authored-by: Jason Holmes <[email protected]>
WhitewaterFoundry · Apr 26, 2024 · a21a3d0 · a21a3d0
1 parent d29d107
commit a21a3d0
Show file tree

Hide file tree

Showing 12 changed files with 200 additions and 24 deletions.
diff --git a/.github/workflows/DevHome-CI.yml b/.github/workflows/DevHome-CI.yml
@@ -84,7 +84,7 @@ jobs:
       run: Compress-Archive -Force -Path HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\net8.0-windows10.0.22621.0\win-arm64\* -DestinationPath "HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\DevSetupAgent_arm64.zip"
 
     - name: Build_DevHome
-      run: cmd /c "$env:VSDevCmd" "&" msbuild /p:Configuration=${{ matrix.configuration }},Platform=${{ matrix.platform }} DevHome.sln
+      run: cmd /c "$env:VSDevCmd" "&" msbuild /p:Configuration=${{ matrix.configuration }},Platform=${{ matrix.platform }} /m:1 DevHome.sln
 
     - name: Find vstest.console.exe
       if: ${{ matrix.platform != 'arm64' }}

diff --git a/Build.ps1 b/Build.ps1
@@ -63,10 +63,10 @@ if (($BuildStep -ieq "all") -Or ($BuildStep -ieq "sdk")) {
 
 if (($BuildStep -ieq "all") -Or ($BuildStep -ieq "DevSetupAgent") -Or ($BuildStep -ieq "fullMsix")) {
   foreach ($configuration in $env:Build_Configuration.Split(",")) {
-    # We use x86 DevSetupAgent for x64 and x86 Dev Home build. Only need to build it once if we are building multiple platforms. 
+    # We use x86 DevSetupAgent for x64 and x86 Dev Home build. Only need to build it once if we are building multiple platforms.
     $builtX86 = $false
     foreach ($platform in $env:Build_Platform.Split(",")) {
-      if ($Platform -ieq "arm64") {
+      if ($platform -ieq "arm64") {
         HyperVExtension\BuildDevSetupAgentHelper.ps1 -Platform $Platform -Configuration $configuration -VersionOfSDK $env:sdk_version -SDKNugetSource $SDKNugetSource -AzureBuildingBranch $AzureBuildingBranch -IsAzurePipelineBuild $IsAzurePipelineBuild -BypassWarning
       }
       elseif (-not $builtX86) {
@@ -128,12 +128,12 @@ Try {
     $uapAppExtension = [System.Xml.Linq.XName]::Get("{http://schemas.microsoft.com/appx/manifest/uap/windows10/3}AppExtension");
 
     # Update the appxmanifest
-    $appxmanifestPath = (Join-Path $env:Build_RootDirectory "src\Package.appxmanifest")
+    $appxmanifestPath = (Join-Path $env:Build_RootDirectory "Packaging\Package.appxmanifest")
     $appxmanifest = [System.Xml.Linq.XDocument]::Load($appxmanifestPath)
     $appxmanifest.Root.Element($xIdentity).Attribute("Version").Value = $env:msix_version
     if (-not ([string]::IsNullOrEmpty($newPackageName))) {
       $appxmanifest.Root.Element($xIdentity).Attribute("Name").Value = $newPackageName
-    } 
+    }
     if (-not ([string]::IsNullOrEmpty($newPackageDisplayName))) {
       $appxmanifest.Root.Element($xProperties).Element($xDisplayName).Value = $newPackageDisplayName
     }
@@ -162,13 +162,18 @@ Try {
     foreach ($platform in $env:Build_Platform.Split(",")) {
       foreach ($configuration in $env:Build_Configuration.Split(",")) {
         $appxPackageDir = (Join-Path $env:Build_RootDirectory "AppxPackages\$configuration")
+        Write-Host "Building DevHome for EnvPlatform: $env:Build_Platform Platform: $platform Configuration: $configuration BundlePlatforms: $appxBundlePlatform Dir: $appxPackageDir Ring: $buildRing"
         $msbuildArgs = @(
             ("DevHome.sln"),
             ("/p:Platform="+$platform),
             ("/p:Configuration="+$configuration),
             ("/restore"),
             ("/binaryLogger:DevHome.$platform.$configuration.binlog"),
-            ("/p:AppxPackageOutput=$appxPackageDir\DevHome-$platform.msix"),
+            ("/p:AppxBundle=Never"),
+            ("/p:AppxPackageName=DevHome-$platform"),
+            ("/p:AppxBundlePlatforms="+$platform),
+            ("/p:AppxPackageDir=" + $appxPackageDir),
+            ("/p:AppxPackageTestDir=" + (Join-Path $appxPackageDir "DevHome\")),
             ("/p:AppxPackageSigningEnabled=false"),
             ("/p:GenerateAppxPackageOnBuild=true"),
             ("/p:BuildRing=$buildRing")
@@ -181,6 +186,7 @@ Try {
         }
 
         & $msbuildPath $msbuildArgs
+
         if (-not($IsAzurePipelineBuild) -And $isAdmin) {
           Invoke-SignPackage "$appxPackageDir\DevHome-$platform.msix"
         }
@@ -235,7 +241,7 @@ Try {
 
   if (($BuildStep -ieq "all") -Or ($BuildStep -ieq "msixbundle")) {
     foreach ($configuration in $env:Build_Configuration.Split(",")) {
-      .\build\scripts\Create-AppxBundle.ps1 -InputPath (Join-Path $env:Build_RootDirectory "AppxPackages\$configuration") -ProjectName DevHome -BundleVersion ([version]$env:msix_version) -OutputPath (Join-Path $env:Build_RootDirectory ("AppxBundles\$configuration\DevHome_" + $env:msix_version + "_8wekyb3d8bbwe.msixbundle"))
+      .\build\scripts\Create-AppxBundle.ps1 -InputPath (Join-Path $env:Build_RootDirectory "AppxPackages\$configuration\DevHome") -ProjectName DevHome -BundleVersion ([version]$env:msix_version) -OutputPath (Join-Path $env:Build_RootDirectory ("AppxBundles\$configuration\DevHome_" + $env:msix_version + "_8wekyb3d8bbwe.msixbundle"))
       if (-not($IsAzurePipelineBuild) -And $isAdmin) {
         Invoke-SignPackage ("AppxBundles\$configuration\DevHome_" + $env:msix_version + "_8wekyb3d8bbwe.msixbundle")
       }
@@ -259,7 +265,7 @@ WARNING: Cert signing requires admin privileges.  To sign, run the following in
 "@ -ForegroundColor GREEN
   foreach ($platform in $env:Build_Platform.Split(",")) {
     foreach ($configuration in $env:Build_Configuration.Split(",")) {
-      $appxPackageFile = (Join-Path $env:Build_RootDirectory "AppxPackages\$configuration\DevHome-$platform.msix")
+      $appxPackageFile = (Join-Path $env:Build_RootDirectory ("AppxPackages\$configuration\DevHome\DevHome-$platform.msix"))
         Write-Host @"
 powershell -command "& { . build\scripts\CertSignAndInstall.ps1; Invoke-SignPackage $appxPackageFile }"
 "@ -ForegroundColor GREEN

diff --git a/DevHome.sln b/DevHome.sln
@@ -11,6 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Solution.props = Solution.props
 	EndProjectSection
 EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Packaging", "Packaging\Packaging.wapproj", "{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome", "src\DevHome.csproj", "{60E0FD98-5396-436D-BAB7-187A853A5DC6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0689521A-1686-46DB-81E1-3B84AA0EF1AC} = {0689521A-1686-46DB-81E1-3B84AA0EF1AC}
@@ -144,6 +146,30 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Debug|Any CPU.Build.0 = Debug|x64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Debug|Any CPU.Deploy.0 = Debug|x64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Debug|arm64.ActiveCfg = Debug|ARM64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Debug|arm64.Build.0 = Debug|ARM64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Debug|arm64.Deploy.0 = Debug|ARM64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Debug|x64.ActiveCfg = Debug|x64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Debug|x64.Build.0 = Debug|x64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Debug|x64.Deploy.0 = Debug|x64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Debug|x86.ActiveCfg = Debug|x86
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Debug|x86.Build.0 = Debug|x86
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Debug|x86.Deploy.0 = Debug|x86
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Release|Any CPU.ActiveCfg = Release|x64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Release|Any CPU.Build.0 = Release|x64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Release|Any CPU.Deploy.0 = Release|x64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Release|arm64.ActiveCfg = Release|ARM64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Release|arm64.Build.0 = Release|ARM64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Release|arm64.Deploy.0 = Release|ARM64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Release|x64.ActiveCfg = Release|x64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Release|x64.Build.0 = Release|x64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Release|x64.Deploy.0 = Release|x64
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Release|x86.ActiveCfg = Release|x86
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Release|x86.Build.0 = Release|x86
+		{05D4C6E5-D33D-4C15-91FE-3DD2B6A5D61C}.Release|x86.Deploy.0 = Release|x86
 		{60E0FD98-5396-436D-BAB7-187A853A5DC6}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{60E0FD98-5396-436D-BAB7-187A853A5DC6}.Debug|Any CPU.Build.0 = Debug|x64
 		{60E0FD98-5396-436D-BAB7-187A853A5DC6}.Debug|Any CPU.Deploy.0 = Debug|x64

diff --git a/HyperVExtension/BuildDevSetupAgentHelper.ps1 b/HyperVExtension/BuildDevSetupAgentHelper.ps1
@@ -80,6 +80,7 @@ Try {
 
   $msbuildArgs = @(
       ("HyperVExtension\DevSetupAgent.sln"),
+      ("/m"),
       ("/p:Platform="+$platform),
       ("/p:Configuration="+$configuration),
       ("/restore"),

diff --git a/src/Package.appinstaller → Packaging/Package.appinstaller b/src/Package.appinstaller → Packaging/Package.appinstaller
diff --git a/src/Package.appxmanifest → Packaging/Package.appxmanifest b/src/Package.appxmanifest → Packaging/Package.appxmanifest
@@ -37,12 +37,27 @@
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22000.0" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.UWPDesktop" MinVersion="14.0.24217.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
+    <PackageDependency Name="Microsoft.WindowsAppRuntime.1.5" MinVersion="5001.58.448.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>
   <Resources>
-    <Resource Language="x-generate" />
+    <!-- Manually list the resources available in the package since WAP Project when combined with WinUI 3.0 does not generate them with x-generate -->
+    <Resource Language="EN-US" />
+    <Resource Language="DE-DE" />
+    <Resource Language="ES-ES" />
+    <Resource Language="FR-FR" />
+    <Resource Language="IT-IT" />
+    <Resource Language="JA-JP" />
+    <Resource Language="KO-KR" />
+    <Resource Language="PT-BR" />
+    <Resource Language="QPS-PLOC" />
+    <Resource Language="QPS-PLOCA" />
+    <Resource Language="QPS-PLOCM" />
+    <Resource Language="RU-RU" />
+    <Resource Language="ZH-CN" />
+    <Resource Language="ZH-TW" />
   </Resources>
   <Applications>
-    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$">
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements DisplayName="ms-resource:AppDisplayNameDev" Description="ms-resource:AppDescription" BackgroundColor="transparent" Square150x150Logo="Assets\Logos\MedTile.png" Square44x44Logo="Assets\Logos\AppList.png">
         <uap:DefaultTile Wide310x150Logo="Assets\Logos\WideTile.png" />
         <uap:SplashScreen Image="Assets\Logos\SplashScreen.png" />

diff --git a/Packaging/Packaging.wapproj b/Packaging/Packaging.wapproj
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(SolutionDir)ToolingVersions.props" />
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|AnyCPU">
+      <Configuration>Debug</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|AnyCPU">
+      <Configuration>Release</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <PropertyGroup>
+    <ProjectGuid>05d4c6e5-d33d-4c15-91fe-3dd2b6a5d61c</ProjectGuid>
+    <!-- ToolingVersions.props included above does not seem to affect WAPProj, so repeat them here -->
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <NoWarn>$(NoWarn);NU1702</NoWarn>
+    <EntryPointProjectUniqueName>..\src\DevHome.csproj</EntryPointProjectUniqueName>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <BuildRing Condition="'$(BuildRing)'==''">Dev</BuildRing>
+    <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
+  </PropertyGroup>
+  <!-- Default asset scale is 200% but DEV only has 100% scaling images available-->
+  <PropertyGroup Condition="'$(BuildRing)' == 'Dev'">
+    <UapDefaultAssetScale>100</UapDefaultAssetScale>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+
+    <!-- To build with the correct logo assets, only include the ones for the current build ring.
+       Place them in a common location, so references to them don't need to adjust for build ring. -->
+  <ItemGroup>
+    <Content Include ="..\src\Assets\*" />
+    <Content Remove="..\src\Assets\Preview\*" />
+    <Content Remove="..\src\Assets\Canary\*" />
+    <Content Remove="..\src\Assets\Dev\*" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BuildRing)' == 'Dev'">
+    <Content Include="..\src\Assets\Dev\**" Link="Assets\Logos\%(Filename)%(Extension)" CopyToOutputDirectory="Always" />
+    <Content Include="..\src\Assets\Dev\DevHome_Dev.ico" Link="Assets\DevHome.ico" CopyToOutputDirectory="Always" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BuildRing)' == 'Canary'">
+    <Content Include="..\src\Assets\Canary\**" Link="Assets\Logos\%(Filename)%(Extension)" CopyToOutputDirectory="Always" />
+    <Content Include="..\src\Assets\Canary\DevHome_Canary.ico" Link="Assets\DevHome.ico" CopyToOutputDirectory="Always" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BuildRing)' == 'Stable'">
+    <Content Include="..\src\Assets\Preview\**" Link="Assets\Logos\%(Filename)%(Extension)" CopyToOutputDirectory="Always" />
+    <Content Include="..\src\Assets\Preview\DevHome_Preview.ico" Link="Assets\DevHome.ico" CopyToOutputDirectory="Always" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="..\src\Assets\WhatsNewPage\DarkTheme\Extensions.png" />
+    <None Remove="..\src\Assets\WhatsNewPage\DarkTheme\ExtensionsBig.png" />
+    <None Remove="..\src\Assets\WhatsNewPage\LightTheme\Extensions.png" />
+    <None Remove="..\src\Assets\WhatsNewPage\LightTheme\ExtensionsBig.png" />
+    <None Remove="..\src\Styles\WindowTitleBar_ThemeResources.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PRIResource Include="..\src\Strings\en-us\Resources.resw" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Packaging_TemporaryKey.pfx" />
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\src\DevHome.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
@@ -185,7 +185,7 @@ extends:
                 targetType: inline
                 script: >-
                   $Files = Get-ChildItem . -R -Filter 'Resources.resw' | ? FullName -Like '*en-US\*\Resources.resw'
-                  
+
                   $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
 
                   $Files = Get-ChildItem . -R -Filter 'PDP.xml' | ? FullName -Like '*en-US\*\PDP.xml'
@@ -200,7 +200,7 @@ extends:
                 targetType: inline
                 script: >-
                   New-Item -Path 'locArchive' -ItemType Directory
-                  
+
                   tar czf locArchive\LocOutput.tar.gz LocOutput
                 pwsh: true
 
@@ -211,10 +211,18 @@ extends:
                 filePath: 'Build.ps1'
                 arguments: -Platform "${{ platform }}" -Configuration "${{ configuration }}" -Version $(MSIXVersion) -BuildStep "fullMsix" -AzureBuildingBranch "$(BuildingBranch)" -IsAzurePipelineBuild
 
+            - task: PowerShell@2
+              displayName: Move BinLog to output directory
+              inputs:
+                targetType: inline
+                script: >-
+                  Move-Item -Path $(Build.SourcesDirectory)\DevHome.${{ platform }}.${{ configuration }}.binlog -Destination $(Build.SourcesDirectory)\src\bin -Force
+                pwsh: true
+
             - task: EsrpCodeSigning@2
               inputs:
                 ConnectedServiceName: 'Xlang Code Signing'
-                FolderPath: '$(appxPackageDir)\${{ configuration }}'
+                FolderPath: '$(appxPackageDir)\${{ configuration }}\DevHome'
                 Pattern: '*.msix'
                 signConfigType: 'inlineSignParams'
                 inlineOperation: |
@@ -336,7 +344,7 @@ extends:
               - output: pipelineArtifact
                 displayName: Publish MSIX Artifact
                 artifactName: msix_${{ platform }}_${{ configuration }}
-                targetPath: $(appxPackageDir)\${{ configuration }}
+                targetPath: $(appxPackageDir)\${{ configuration }}\DevHome
                 sbomPackageName: devhome.msixpackage
                 sbomPackageVersion: $(MSIXVersion)
 
@@ -352,7 +360,7 @@ extends:
               inputs:
                 buildType: 'current'
                 artifactName: msix_${{ platform }}_${{ configuration }}
-                targetPath: $(appxPackageDir)\${{ configuration }}
+                targetPath: $(appxPackageDir)\${{ configuration }}\DevHome
 
           - task: PowerShell@2
             displayName: Create Stub Directory

diff --git a/extensionsdk/BuildSDKHelper.ps1 b/extensionsdk/BuildSDKHelper.ps1
@@ -59,6 +59,7 @@ Try {
     foreach ($config in $Configuration.Split(",")) {
       $msbuildArgs = @(
         ("$PSScriptRoot\DevHomeSDK.sln"),
+        ("/m"),
         ("/p:Platform="+$platform),
         ("/p:Configuration="+$config),
         ("/binaryLogger:DevHome.SDK.$platform.$config.binlog"),

diff --git a/src/DevHome.csproj b/src/DevHome.csproj
@@ -19,7 +19,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UseWinUI>true</UseWinUI>
-    <EnableMsixTooling>true</EnableMsixTooling>
+    <EnableMsixTooling>false</EnableMsixTooling>
     <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
     <DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_MAIN</DefineConstants>
   </PropertyGroup>