Update SDK version for pipeline builds

AndrewKeepCoding · Sep 12, 2023 · f3b2269 · f3b2269
1 parent eb920b5
commit f3b2269
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -145,14 +145,16 @@ Try {
             ("DevHome.sln"),
             ("/p:Platform="+$platform),
             ("/p:Configuration="+$configuration),
-            # ("/p:DevHomeSDKVersion="+$env:sdk_version),
             ("/restore"),
             ("/binaryLogger:DevHome.$platform.$configuration.binlog"),
             ("/p:AppxPackageOutput=$appxPackageDir\DevHome-$platform.msix"),
             ("/p:AppxPackageSigningEnabled=false"),
             ("/p:GenerateAppxPackageOnBuild=true"),
             ("/p:BuildRing=$buildRing")
         )
+        if (-not([string]::IsNullOrWhiteSpace($VersionOfSDK))) {
+          $msbuildArgs += ("/p:DevHomeSDKVersion="+$env:sdk_version)
+        }
 
         & $msbuildPath $msbuildArgs
         if (-not($IsAzurePipelineBuild) -And $isAdmin) {

diff --git a/common/DevHome.Common.csproj b/common/DevHome.Common.csproj
@@ -7,7 +7,7 @@
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <Nullable>enable</Nullable>
     <UseWinUI>true</UseWinUI>
-    <DevHomeSDKVersion Condition="$(DevHomeSDKVersion) == ''">0.100.249</DevHomeSDKVersion>
+    <DevHomeSDKVersion Condition="$(DevHomeSDKVersion) == ''">$(DevHomeSDKVersion)</DevHomeSDKVersion>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Views\Banner.xaml" />
@@ -24,7 +24,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.DevHome.SDK" Version="0.100.253" />
+    <PackageReference Include="Microsoft.Windows.DevHome.SDK" Version="0.100.254" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230724000" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
     <PackageReference Include="Microsoft.Internal.Windows.DevHome.Helpers" Version="1.0.20230706-x2201" />