Merge pull request #2036 from microsoft/staging

Release - 12/12/23

.github/workflows/DevHome-CI.yml

@@ -62,10 +62,10 @@ jobs:
         cmd /c "$env:VSDevCmd" "&" msbuild -t:restore /m /p:Configuration=Release,Platform=${{ matrix.platform }} DevHome.sln
 
     - name: Build_SDK
-      run: cmd /c "$env:VSDevCmd" "&" msbuild /m /p:Configuration=Release,Platform=${{ matrix.platform }} extensionsdk\\DevHomeSDK.sln
+      run: cmd /c "$env:VSDevCmd" "&" msbuild /p:Configuration=Release,Platform=${{ matrix.platform }} extensionsdk\\DevHomeSDK.sln
 
     - name: Build_DevHome
-      run: cmd /c "$env:VSDevCmd" "&" msbuild /m /p:Configuration=${{ matrix.configuration }},Platform=${{ matrix.platform }} DevHome.sln
+      run: cmd /c "$env:VSDevCmd" "&" msbuild /p:Configuration=${{ matrix.configuration }},Platform=${{ matrix.platform }} DevHome.sln
 
     - name: Find vstest.console.exe
       if: ${{ matrix.platform != 'arm64' }}

CoreWidgetProvider/CoreWidgetProvider.csproj

@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)ToolingVersions.props"/>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <OutputType>Exe</OutputType>
   </PropertyGroup>
@@ -7,10 +8,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
     <CsWinRTEnabled>false</CsWinRTEnabled>
     <Platforms>x86;x64;arm64</Platforms>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>

Directory.Build.props

@@ -13,6 +13,7 @@
     <AnalysisMode>Recommended</AnalysisMode>
     <PlatformTarget>$(Platform)</PlatformTarget>
   </PropertyGroup>
+
 <!--
   <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
     <RepositoryUrl>https://github.com/microsoft/PowerToys</RepositoryUrl>

ToolingVersions.props

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE-CODE in the project root for license information. -->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+  </PropertyGroup>
+</Project>

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.701'
+  MSIXVersion: '0.801'
   VersionOfSDK: '0.100'
   solution: '**/DevHome.sln'
   appxPackageDir: 'AppxPackages'
@@ -172,6 +172,7 @@ extends:
                 authKey: $(TouchdownAppKey)
                 resourceFilePath: |
                   **\en-US\*.resw
+                  **\en-US\PDP.xml
                 localizationTarget: false
                 appendRelativeDir: true
                 pseudoSetting: Included
@@ -185,6 +186,10 @@ extends:
                   $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'
+
+                  $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
                 pwsh: true
 
             - task: PowerShell@2
@@ -483,6 +488,31 @@ extends:
             artifactName: MsixBundle_Release
             targetPath: StorePublish
 
+        - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1
+          displayName: Download and Use Localization Files
+          condition: eq(variables['EnableLocalization'], 'true')
+          retryCountOnTaskFailure: 2
+          inputs:
+            teamId: 71220
+            authId: $(TouchdownAppId)
+            authKey: $(TouchdownAppKey)
+            resourceFilePath: |
+              **\en-US\PDP.xml
+            localizationTarget: false
+            appendRelativeDir: true
+            pseudoSetting: Included
+
+        - task: PowerShell@2
+          displayName: Move Loc files one level up
+          condition: eq(variables['EnableLocalization'], 'true')
+          inputs:
+            targetType: inline
+            script: >-
+              $Files = Get-ChildItem . -R -Filter 'PDP.xml' | ? FullName -Like '*en-US\*\PDP.xml'
+
+              $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
+            pwsh: true
+
         - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@2
           displayName: 'Create Staging StoreBroker Package'
           condition: eq(variables['BuildingBranch'], 'staging')

build/scripts/CreateBuildInfo.ps1

@@ -6,7 +6,7 @@ Param(
 )
 
 $Major = "0"
-$Minor = "7"
+$Minor = "8"
 $Patch = "99" # default to 99 for local builds
 
 $versionSplit = $Version.Split(".");