Merge pull request #3647 from microsoft/staging

Release - 8/20/24
microsoft · Aug 20, 2024 · add3319 · add3319
2 parents bfc595e + b8d6537
commit add3319
Show file tree

Hide file tree

Showing 299 changed files with 12,267 additions and 2,943 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -10,4 +10,3 @@
 - [ ] Closes #xxx
 - [ ] Tests added/passed
 - [ ] Documentation updated
-- [ ] Telemetry [compliance tasks](https://aka.ms/devhome-telemetry) completed for added/updated events
diff --git a/Build.ps1 b/Build.ps1
@@ -113,66 +113,29 @@ if (-not([string]::IsNullOrWhiteSpace($SDKNugetSource))) {
 
 Try {
   if (($BuildStep -ieq "all") -Or ($BuildStep -ieq "msix") -Or ($BuildStep -ieq "fullMsix")) {
+    # Update C++ version resources and header
+    $cppHeader = (Join-Path $env:Build_RootDirectory "build\cppversion\version.h")
+    $updatebinverpath = (Join-Path $env:Build_RootDirectory "build\scripts\update-binver.ps1")
+    & $updatebinverpath -TargetFile $cppHeader -BuildVersion $env:msix_version
+
     $buildRing = "Dev"
-    $newPackageName = $null
-    $newPackageDisplayName = $null
-    $newAppDisplayNameResource = $null
-    $newWidgetProviderDisplayName = $null
+    $appxmanifestPath = (Join-Path $env:Build_RootDirectory "src\Package-Dev.appxmanifest")
 
     if ($AzureBuildingBranch -ieq "release") {
       $buildRing = "Stable"
-      $newPackageName = "Microsoft.Windows.DevHome"
-      $newPackageDisplayName = "Dev Home (Preview)"
-      $newAppDisplayNameResource = "ms-resource:AppDisplayNameStable"
-      $newWidgetProviderDisplayName = "ms-resource:WidgetProviderDisplayNameStable"
+      $appxmanifestPath = (Join-Path $env:Build_RootDirectory "src\Package.appxmanifest")
     } elseif ($AzureBuildingBranch -ieq "staging") {
       $buildRing = "Canary"
-      $newPackageName = "Microsoft.Windows.DevHome.Canary"
-      $newPackageDisplayName = "Dev Home (Canary)"
-      $newAppDisplayNameResource = "ms-resource:AppDisplayNameCanary"
-      $newWidgetProviderDisplayName = "ms-resource:WidgetProviderDisplayNameCanary"
+      $appxmanifestPath = (Join-Path $env:Build_RootDirectory "src\Package-Can.appxmanifest")
     }
 
     [Reflection.Assembly]::LoadWithPartialName("System.Xml.Linq")
     $xIdentity = [System.Xml.Linq.XName]::Get("{http://schemas.microsoft.com/appx/manifest/foundation/windows10}Identity");
-    $xProperties = [System.Xml.Linq.XName]::Get("{http://schemas.microsoft.com/appx/manifest/foundation/windows10}Properties");
-    $xDisplayName = [System.Xml.Linq.XName]::Get("{http://schemas.microsoft.com/appx/manifest/foundation/windows10}DisplayName");
-    $xApplications = [System.Xml.Linq.XName]::Get("{http://schemas.microsoft.com/appx/manifest/foundation/windows10}Applications");
-    $xApplication = [System.Xml.Linq.XName]::Get("{http://schemas.microsoft.com/appx/manifest/foundation/windows10}Application");
-    $uapVisualElements = [System.Xml.Linq.XName]::Get("{http://schemas.microsoft.com/appx/manifest/uap/windows10}VisualElements");
-    $xExtensions = [System.Xml.Linq.XName]::Get("{http://schemas.microsoft.com/appx/manifest/foundation/windows10}Extensions");
-    $uapExtension = [System.Xml.Linq.XName]::Get("{http://schemas.microsoft.com/appx/manifest/uap/windows10/3}Extension");
-    $uapAppExtension = [System.Xml.Linq.XName]::Get("{http://schemas.microsoft.com/appx/manifest/uap/windows10/3}AppExtension");
-
-    # Update C++ version resources and header
-    $cppHeader = (Join-Path $env:Build_RootDirectory "build\cppversion\version.h")
-    $updatebinverpath = (Join-Path $env:Build_RootDirectory "build\scripts\update-binver.ps1")
-    & $updatebinverpath -TargetFile $cppHeader -BuildVersion $env:msix_version
 
     # Update the appxmanifest
-    $appxmanifestPath = (Join-Path $env:Build_RootDirectory "src\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
-    }
-    if (-not ([string]::IsNullOrEmpty($newAppDisplayNameResource))) {
-      $appxmanifest.Root.Element($xApplications).Element($xApplication).Element($uapVisualElements).Attribute("DisplayName").Value = $newAppDisplayNameResource
-      $extensions = $appxmanifest.Root.Element($xApplications).Element($xApplication).Element($xExtensions).Elements($uapExtension)
-      foreach ($extension in $extensions) {
-        if ($extension.Attribute("Category").Value -eq "windows.appExtension") {
-          $appExtension = $extension.Element($uapAppExtension)
-          switch ($appExtension.Attribute("Name").Value) {
-            "com.microsoft.windows.widgets" {
-              $appExtension.Attribute("DisplayName").Value = $newWidgetProviderDisplayName
-            }
-          }
-        }
-      }
-    }
+
     Write-XmlDocumentToFile -xmlDocument $appxmanifest -filePath $appxmanifestPath
 
     # This is needed for vcxproj
@@ -217,20 +180,6 @@ Try {
     # Reset the appxmanifest to prevent unnecessary code changes
     $appxmanifest = [System.Xml.Linq.XDocument]::Load($appxmanifestPath)
     $appxmanifest.Root.Element($xIdentity).Attribute("Version").Value = "0.0.0.0"
-    $appxmanifest.Root.Element($xIdentity).Attribute("Name").Value = "Microsoft.Windows.DevHome.Dev"
-    $appxmanifest.Root.Element($xProperties).Element($xDisplayName).Value = "Dev Home (Dev)"
-    $appxmanifest.Root.Element($xApplications).Element($xApplication).Element($uapVisualElements).Attribute("DisplayName").Value = "ms-resource:AppDisplayNameDev"
-    $extensions = $appxmanifest.Root.Element($xApplications).Element($xApplication).Element($xExtensions).Elements($uapExtension)
-    foreach ($extension in $extensions) {
-      if ($extension.Attribute("Category").Value -eq "windows.appExtension") {
-        $appExtension = $extension.Element($uapAppExtension)
-        switch ($appExtension.Attribute("Name").Value) {
-          "com.microsoft.windows.widgets" {
-            $appExtension.Attribute("DisplayName").Value = "ms-resource:WidgetProviderDisplayNameDev"
-          }
-        }
-      }
-    }
     Write-XmlDocumentToFile -xmlDocument $appxmanifest -filePath $appxmanifestPath
   }
 

diff --git a/DevHome.sln b/DevHome.sln
@@ -163,6 +163,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WSLExtension", "WSLExtensio
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WSLExtension", "extensions\WSLExtension\WSLExtension.csproj", "{B6153EEA-EADE-4BAA-B47D-6B48205C6696}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileExplorerGitIntegration", "extensions\GitExtension\FileExplorerGitIntegration\FileExplorerGitIntegration.csproj", "{5366F178-AD59-475C-B78D-2E6483313F9E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitExtension", "GitExtension", "{01AB3100-A939-41DD-A67F-1F8C275A307D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileExplorerGitIntegration.UnitTest", "extensions\GitExtension\FileExplorerGitIntegration.UnitTest\FileExplorerGitIntegration.UnitTest.csproj", "{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.FileExplorerSourceControlIntegration", "tools\Customization\DevHome.FileExplorerSourceControlIntegration\DevHome.FileExplorerSourceControlIntegration.csproj", "{83D12033-364A-45F2-8FCA-9BD8E8322D91}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.FileExplorerSourceControlIntegrationUnitTest", "tools\Customization\DevHome.FileExplorerSourceControlIntegrationUnitTest\DevHome.FileExplorerSourceControlIntegrationUnitTest.csproj", "{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_FailFast|arm64 = Debug_FailFast|arm64
@@ -1079,6 +1089,78 @@ Global
 		{B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Release|x64.Build.0 = Release|x64
 		{B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Release|x86.ActiveCfg = Release|x86
 		{B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Release|x86.Build.0 = Release|x86
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Debug_FailFast|arm64.ActiveCfg = Debug|arm64
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Debug_FailFast|arm64.Build.0 = Debug|arm64
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Debug_FailFast|x64.ActiveCfg = Debug|x64
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Debug_FailFast|x64.Build.0 = Debug|x64
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Debug_FailFast|x86.ActiveCfg = Debug|x86
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Debug_FailFast|x86.Build.0 = Debug|x86
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Debug|arm64.ActiveCfg = Debug|arm64
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Debug|arm64.Build.0 = Debug|arm64
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Debug|x64.ActiveCfg = Debug|x64
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Debug|x64.Build.0 = Debug|x64
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Debug|x86.ActiveCfg = Debug|x86
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Debug|x86.Build.0 = Debug|x86
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Release|arm64.ActiveCfg = Release|arm64
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Release|arm64.Build.0 = Release|arm64
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Release|x64.ActiveCfg = Release|x64
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Release|x64.Build.0 = Release|x64
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Release|x86.ActiveCfg = Release|x86
+		{5366F178-AD59-475C-B78D-2E6483313F9E}.Release|x86.Build.0 = Release|x86
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Debug_FailFast|arm64.ActiveCfg = Debug|arm64
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Debug_FailFast|arm64.Build.0 = Debug|arm64
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Debug_FailFast|x64.ActiveCfg = Debug|x64
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Debug_FailFast|x64.Build.0 = Debug|x64
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Debug_FailFast|x86.ActiveCfg = Debug|x86
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Debug_FailFast|x86.Build.0 = Debug|x86
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Debug|arm64.ActiveCfg = Debug|arm64
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Debug|arm64.Build.0 = Debug|arm64
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Debug|x64.ActiveCfg = Debug|x64
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Debug|x64.Build.0 = Debug|x64
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Debug|x86.ActiveCfg = Debug|x86
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Debug|x86.Build.0 = Debug|x86
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Release|arm64.ActiveCfg = Release|arm64
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Release|arm64.Build.0 = Release|arm64
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Release|x64.ActiveCfg = Release|x64
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Release|x64.Build.0 = Release|x64
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Release|x86.ActiveCfg = Release|x86
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E}.Release|x86.Build.0 = Release|x86
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Debug_FailFast|arm64.ActiveCfg = Debug|arm64
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Debug_FailFast|arm64.Build.0 = Debug|arm64
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Debug_FailFast|x64.ActiveCfg = Debug|x64
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Debug_FailFast|x64.Build.0 = Debug|x64
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Debug_FailFast|x86.ActiveCfg = Debug|x86
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Debug_FailFast|x86.Build.0 = Debug|x86
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Debug|arm64.ActiveCfg = Debug|arm64
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Debug|arm64.Build.0 = Debug|arm64
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Debug|x64.ActiveCfg = Debug|x64
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Debug|x64.Build.0 = Debug|x64
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Debug|x86.ActiveCfg = Debug|x86
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Debug|x86.Build.0 = Debug|x86
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Release|arm64.ActiveCfg = Release|arm64
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Release|arm64.Build.0 = Release|arm64
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Release|x64.ActiveCfg = Release|x64
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Release|x64.Build.0 = Release|x64
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Release|x86.ActiveCfg = Release|x86
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91}.Release|x86.Build.0 = Release|x86
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Debug_FailFast|arm64.ActiveCfg = Debug|arm64
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Debug_FailFast|arm64.Build.0 = Debug|arm64
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Debug_FailFast|x64.ActiveCfg = Debug|x64
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Debug_FailFast|x64.Build.0 = Debug|x64
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Debug_FailFast|x86.ActiveCfg = Debug|x86
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Debug_FailFast|x86.Build.0 = Debug|x86
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Debug|arm64.ActiveCfg = Debug|arm64
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Debug|arm64.Build.0 = Debug|arm64
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Debug|x64.ActiveCfg = Debug|x64
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Debug|x64.Build.0 = Debug|x64
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Debug|x86.ActiveCfg = Debug|x86
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Debug|x86.Build.0 = Debug|x86
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Release|arm64.ActiveCfg = Release|arm64
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Release|arm64.Build.0 = Release|arm64
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Release|x64.ActiveCfg = Release|x64
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Release|x64.Build.0 = Release|x64
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Release|x86.ActiveCfg = Release|x86
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1141,6 +1223,11 @@ Global
 		{D7A1C2CE-36B1-43A8-9BA6-1EE2CF24479F} = {E0A15760-487A-4CCB-8093-DE6FF3C4BC23}
 		{73D1E84F-56CC-412B-BF2B-FA692BF6B396} = {DCAF188B-60C3-4EDB-8049-BAA927FBCD7D}
 		{B6153EEA-EADE-4BAA-B47D-6B48205C6696} = {73D1E84F-56CC-412B-BF2B-FA692BF6B396}
+		{5366F178-AD59-475C-B78D-2E6483313F9E} = {01AB3100-A939-41DD-A67F-1F8C275A307D}
+		{01AB3100-A939-41DD-A67F-1F8C275A307D} = {DCAF188B-60C3-4EDB-8049-BAA927FBCD7D}
+		{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E} = {01AB3100-A939-41DD-A67F-1F8C275A307D}
+		{83D12033-364A-45F2-8FCA-9BD8E8322D91} = {623998FD-B0A6-4980-95D5-A5072301CA10}
+		{A1FAE679-39D4-4278-A8E8-EA351F21A3E7} = {623998FD-B0A6-4980-95D5-A5072301CA10}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {030B5641-B206-46BB-BF71-36FF009088FA}

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -28,6 +28,9 @@
   <PropertyGroup>
     <_PropertySheetDisplayName>DevHome.Root.Props</_PropertySheetDisplayName>
     <ForceImportBeforeCppProps>$(MsbuildThisFileDirectory)\Cpp.Build.props</ForceImportBeforeCppProps>
+    <BuildRing Condition="'$(BuildRing)'==''">Dev</BuildRing>
+    <DefineConstants Condition="'$(BuildRing)'=='Canary'">$(DefineConstants);CANARY_BUILD</DefineConstants>
+    <DefineConstants Condition="'$(BuildRing)'=='Stable'">$(DefineConstants);STABLE_BUILD</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
@@ -21,7 +21,7 @@ parameters:
 
 variables:
  # MSIXVersion's second part should always be odd to account for stub app's version
-  MSIXVersion: '0.1601'
+  MSIXVersion: '0.1701'
   VersionOfSDK: '0.700'
   solution: '**/DevHome.sln'
   appxPackageDir: 'AppxPackages'
@@ -233,7 +233,9 @@ extends:
 
                   $(Build.SourcesDirectory)\**\bin\**\*.dll
 
-                  $(Build.SourcesDirectory)\**\obj\**\*.r2r.ni.pdb
+                  $(Build.SourcesDirectory)\**\obj\**\*.pdb
+
+                  $(Build.SourcesDirectory)\**\obj\**\devhome.r2r.dll
 
             - template: ./build/templates/EsrpSigning-Steps.yml@self
               parameters:
@@ -593,4 +595,4 @@ extends:
             displayName: 'Publish StoreBroker Artifacts'
             condition: or(eq(variables['BuildingBranch'], 'staging'), eq(variables['BuildingBranch'], 'release'))
             artifactName: StoreBrokerPackage
-            targetPath: '$(System.DefaultWorkingDirectory)\SBOutDir'
+            targetPath: '$(System.DefaultWorkingDirectory)\SBOutDir'
diff --git a/build/scripts/CreateBuildInfo.ps1 b/build/scripts/CreateBuildInfo.ps1
@@ -6,7 +6,7 @@ Param(
 )
 
 $Major = "0"
-$Minor = "16"
+$Minor = "17"
 $Patch = "99" # default to 99 for local builds
 
 $versionSplit = $Version.Split(".");

diff --git a/common/Behaviors/AutoFocusBehavior.cs b/common/Behaviors/AutoFocusBehavior.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using CommunityToolkit.WinUI.Behaviors;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace DevHome.Common.Behaviors;
+
+/// <summary>
+/// This behavior automatically sets the focus on the associated <see cref="Control"/> when it is loaded.
+/// </summary>
+/// <remarks>
+/// This implementation is based on the code from the Windows Community Toolkit.
+/// Reference: https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/winui/CommunityToolkit.WinUI.UI.Behaviors/Focus/AutoFocusBehavior.cs
+/// Issue: https://github.com/CommunityToolkit/Windows/issues/443
+/// </remarks>
+public sealed class AutoFocusBehavior : BehaviorBase<Control>
+{
+    protected override void OnAssociatedObjectLoaded() => AssociatedObject.Focus(FocusState.Programmatic);
+}
diff --git a/common/DevHome.Common.csproj b/common/DevHome.Common.csproj
@@ -38,14 +38,15 @@
     <PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.1.240328-rc" />
     <PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.1.240328-rc" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
+    <PackageReference Include="LibGit2Sharp" Version="0.30.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Internal.Windows.DevHome.Helpers" Version="1.0.20240709-x2135" />
+    <PackageReference Include="Microsoft.Internal.Windows.DevHome.Helpers" Version="1.0.20240805-x2200" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
-    <PackageReference Include="Microsoft.Windows.DevHome.SDK" Version="0.600.494" />
+    <PackageReference Include="Microsoft.Windows.DevHome.SDK" Version="0.700.544" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
@@ -55,7 +56,7 @@
     <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="System.Management.Automation" Version="7.4.0" />
+    <PackageReference Include="System.Management.Automation" Version="7.4.3" />
     <PackageReference Include="WinUIEx" Version="2.3.4" />
   </ItemGroup>
 
@@ -112,9 +113,4 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-
-  <PropertyGroup>
-    <DefineConstants Condition="'$(BuildRing)'=='Canary'">$(DefineConstants);CANARY_BUILD</DefineConstants>
-    <DefineConstants Condition="'$(BuildRing)'=='Stable'">$(DefineConstants);STABLE_BUILD</DefineConstants>
-  </PropertyGroup>
 </Project>