diff --git a/.github/workflows/DevHome-CI.yml b/.github/workflows/DevHome-CI.yml index e808d2a70d..8290067b59 100644 --- a/.github/workflows/DevHome-CI.yml +++ b/.github/workflows/DevHome-CI.yml @@ -72,7 +72,7 @@ jobs: - name: Compress_DevSetupAgent_x86 if: ${{ matrix.platform != 'arm64' }} shell: pwsh - run: Compress-Archive -Force -Path HyperVExtension\src\DevSetupAgent\bin\x86\${{ matrix.configuration }}\net8.0-windows10.0.22000.0\win10-x86\* -DestinationPath "HyperVExtension\src\DevSetupAgent\bin\x86\${{ matrix.configuration }}\DevSetupAgent_x86.zip" + run: Compress-Archive -Force -Path HyperVExtension\src\DevSetupAgent\bin\x86\${{ matrix.configuration }}\net8.0-windows10.0.22621.0\win10-x86\* -DestinationPath "HyperVExtension\src\DevSetupAgent\bin\x86\${{ matrix.configuration }}\DevSetupAgent_x86.zip" - name: Build_DevSetupAgent_arm64 if: ${{ matrix.platform == 'arm64' }} @@ -81,7 +81,7 @@ jobs: - name: Compress_DevSetupAgent_arm64 if: ${{ matrix.platform == 'arm64' }} shell: pwsh - run: Compress-Archive -Force -Path HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\net8.0-windows10.0.22000.0\win10-arm64\* -DestinationPath "HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\DevSetupAgent_arm64.zip" + run: Compress-Archive -Force -Path HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\net8.0-windows10.0.22621.0\win10-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 @@ -96,11 +96,11 @@ jobs: - name: DevHome UnitTests if: ${{ matrix.platform != 'arm64' }} - run: cmd /c "$env:VSDevTestCmd" /Platform:${{ matrix.platform }} test\\bin\\${{ matrix.platform }}\\${{ matrix.configuration }}\\net8.0-windows10.0.22000.0\\DevHome.Test.dll + run: cmd /c "$env:VSDevTestCmd" /Platform:${{ matrix.platform }} test\\bin\\${{ matrix.platform }}\\${{ matrix.configuration }}\\net8.0-windows10.0.22621.0\\DevHome.Test.dll - name: Tools UnitTests if: ${{ matrix.platform != 'arm64' }} run: | - foreach ($UnitTestPath in (Get-ChildItem "tools\\*\\*UnitTest\\bin\\${{ matrix.platform }}\\${{ matrix.configuration }}\\net8.0-windows10.0.22000.0\\*.UnitTest.dll")) { + foreach ($UnitTestPath in (Get-ChildItem "tools\\*\\*UnitTest\\bin\\${{ matrix.platform }}\\${{ matrix.configuration }}\\net8.0-windows10.0.22621.0\\*.UnitTest.dll")) { cmd /c "$env:VSDevTestCmd" /Platform:${{ matrix.platform }} $UnitTestPath.FullName } diff --git a/HyperVExtension/BuildDevSetupAgentHelper.ps1 b/HyperVExtension/BuildDevSetupAgentHelper.ps1 index 3af8871493..4d64e35c69 100644 --- a/HyperVExtension/BuildDevSetupAgentHelper.ps1 +++ b/HyperVExtension/BuildDevSetupAgentHelper.ps1 @@ -92,7 +92,8 @@ Try { & $msbuildPath $msbuildArgs - $binariesOutputPath = (Join-Path $env:Build_RootDirectory "HyperVExtension\src\DevSetupAgent\bin\$Platform\$Configuration\net8.0-windows10.0.22000.0\win10-$Platform\*") +# SDK version and .NEt version needs to stay in sync with ToolingVersion.props, DevSetupEngineIdl.vcxproj, and DevHome-CL.yaml + $binariesOutputPath = (Join-Path $env:Build_RootDirectory "HyperVExtension\src\DevSetupAgent\bin\$Platform\$Configuration\net8.0-windows10.0.22621.0\win10-$Platform\*") $zipOutputPath = (Join-Path $env:Build_RootDirectory "HyperVExtension\src\DevSetupAgent\bin\$Platform\$Configuration\DevSetupAgent_$Platform.zip") Compress-Archive -Force -Path $binariesOutputPath $zipOutputPath diff --git a/HyperVExtension/ToolingVersions.props b/HyperVExtension/ToolingVersions.props index 955145dbd2..a7d64c4b61 100644 --- a/HyperVExtension/ToolingVersions.props +++ b/HyperVExtension/ToolingVersions.props @@ -2,7 +2,8 @@ - net8.0-windows10.0.22000.0 + + net8.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 diff --git a/HyperVExtension/src/DevSetupEngineIdl/DevSetupEngineIdl.vcxproj b/HyperVExtension/src/DevSetupEngineIdl/DevSetupEngineIdl.vcxproj index 2463f6251e..b021d874f9 100644 --- a/HyperVExtension/src/DevSetupEngineIdl/DevSetupEngineIdl.vcxproj +++ b/HyperVExtension/src/DevSetupEngineIdl/DevSetupEngineIdl.vcxproj @@ -15,7 +15,8 @@ true Windows Store 10.0 - 10.0.22000.0 + + 10.0.22621.0 10.0.17763.0 diff --git a/HyperVExtension/src/HyperVExtension.HostGuestCommunication/HyperVExtension.HostGuestCommunication.csproj b/HyperVExtension/src/HyperVExtension.HostGuestCommunication/HyperVExtension.HostGuestCommunication.csproj index 4c9e50622e..c557df9525 100644 --- a/HyperVExtension/src/HyperVExtension.HostGuestCommunication/HyperVExtension.HostGuestCommunication.csproj +++ b/HyperVExtension/src/HyperVExtension.HostGuestCommunication/HyperVExtension.HostGuestCommunication.csproj @@ -11,7 +11,7 @@ - + diff --git a/Test.ps1 b/Test.ps1 index ad9bd162eb..0eedef88c7 100644 --- a/Test.ps1 +++ b/Test.ps1 @@ -103,12 +103,12 @@ try { $vstestArgs = @( "/Platform:$platform", "/Logger:trx;LogFileName=DevHome.Test-$platform-$configuration.trx", - "test\bin\$platform\$configuration\net8.0-windows10.0.22000.0\DevHome.Test.dll" + "test\bin\$platform\$configuration\net8.0-windows10.0.22621.0\DevHome.Test.dll" ) $winAppTestArgs = @( "/Platform:$platform", "/Logger:trx;LogFileName=DevHome.UITest-$platform-$configuration.trx", - "uitest\bin\$platform\$configuration\net8.0-windows10.0.22000.0\DevHome.UITest.dll" + "uitest\bin\$platform\$configuration\net8.0-windows10.0.22621.0\DevHome.UITest.dll" ) & $vstestPath $vstestArgs @@ -122,13 +122,13 @@ try { $vstestArgs = @( "/Platform:$platform", "/Logger:trx;LogFileName=$tool.Test-$platform-$configuration.trx", - "tools\$tool\*UnitTest\bin\$platform\$configuration\net8.0-windows10.0.22000.0\*.UnitTest.dll" + "tools\$tool\*UnitTest\bin\$platform\$configuration\net8.0-windows10.0.22621.0\*.UnitTest.dll" ) $winAppTestArgs = @( "/Platform:$platform", "/Logger:trx;LogFileName=$tool.UITest-$platform-$configuration.trx", - "tools\$tool\*UITest\bin\$platform\$configuration\net8.0-windows10.0.22000.0\*.UITest.dll" + "tools\$tool\*UITest\bin\$platform\$configuration\net8.0-windows10.0.22621.0\*.UITest.dll" ) & $vstestPath $vstestArgs diff --git a/ToolingVersions.props b/ToolingVersions.props index 955145dbd2..c00c42af11 100644 --- a/ToolingVersions.props +++ b/ToolingVersions.props @@ -2,7 +2,8 @@ - net8.0-windows10.0.22000.0 + + net8.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 diff --git a/build/scripts/Create-AppxBundle.ps1 b/build/scripts/Create-AppxBundle.ps1 index 9800fde645..7a77caa83b 100644 --- a/build/scripts/Create-AppxBundle.ps1 +++ b/build/scripts/Create-AppxBundle.ps1 @@ -22,7 +22,7 @@ Param( [Parameter(HelpMessage="Path to makeappx.exe")] [ValidateScript({Test-Path $_ -Type Leaf})] [string] - $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x86\MakeAppx.exe" + $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe" ) If ($null -Eq (Get-Item $MakeAppxPath -EA:SilentlyContinue)) { diff --git a/build/scripts/UnbundleStubPackage.ps1 b/build/scripts/UnbundleStubPackage.ps1 index e3b2e42be2..e217584eb0 100644 --- a/build/scripts/UnbundleStubPackage.ps1 +++ b/build/scripts/UnbundleStubPackage.ps1 @@ -10,7 +10,7 @@ param( [Parameter(HelpMessage="Path to makeappx.exe")] [ValidateScript({Test-Path $_ -Type Leaf})] [string] - $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x86\MakeAppx.exe" + $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe" ) function Unbundle-AppxBundle diff --git a/common/DevHome.Common.csproj b/common/DevHome.Common.csproj index 288165130f..f9b8d6bf65 100644 --- a/common/DevHome.Common.csproj +++ b/common/DevHome.Common.csproj @@ -28,11 +28,12 @@ - - + + + - - + + diff --git a/tools/Environments/DevHome.Environments/DevHome.Environments.csproj b/tools/Environments/DevHome.Environments/DevHome.Environments.csproj index 6cb1a03af3..3bfdf0d8a1 100644 --- a/tools/Environments/DevHome.Environments/DevHome.Environments.csproj +++ b/tools/Environments/DevHome.Environments/DevHome.Environments.csproj @@ -9,7 +9,6 @@ - diff --git a/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.Common/DevHome.QuietBackgroundProcesses.Common.vcxproj b/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.Common/DevHome.QuietBackgroundProcesses.Common.vcxproj index 9e1e35bf1c..54ea440e67 100644 --- a/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.Common/DevHome.QuietBackgroundProcesses.Common.vcxproj +++ b/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.Common/DevHome.QuietBackgroundProcesses.Common.vcxproj @@ -18,7 +18,7 @@ true Windows Store 10.0 - 10.0.22000.0 + 10.0.22621.0 10.0.17134.0 false AnyCPU\$(Configuration)\Merged\ diff --git a/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.ElevatedServer/DevHome.QuietBackgroundProcesses.ElevatedServer.vcxproj b/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.ElevatedServer/DevHome.QuietBackgroundProcesses.ElevatedServer.vcxproj index 20a59ef064..001ddcadaa 100644 --- a/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.ElevatedServer/DevHome.QuietBackgroundProcesses.ElevatedServer.vcxproj +++ b/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.ElevatedServer/DevHome.QuietBackgroundProcesses.ElevatedServer.vcxproj @@ -19,7 +19,7 @@ true Windows Store 10.0 - 10.0.22000.0 + 10.0.22621.0 10.0.17134.0 false true diff --git a/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.Server/DevHome.QuietBackgroundProcesses.Server.vcxproj b/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.Server/DevHome.QuietBackgroundProcesses.Server.vcxproj index 3ac52689ff..18921b5ff6 100644 --- a/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.Server/DevHome.QuietBackgroundProcesses.Server.vcxproj +++ b/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.Server/DevHome.QuietBackgroundProcesses.Server.vcxproj @@ -19,7 +19,7 @@ true Windows Store 10.0 - 10.0.22000.0 + 10.0.22621.0 10.0.17134.0 false $(CppOutDir) diff --git a/tools/SetupFlow/DevHome.SetupFlow/DevHome.SetupFlow.csproj b/tools/SetupFlow/DevHome.SetupFlow/DevHome.SetupFlow.csproj index ceb04bc39e..29cc40326e 100644 --- a/tools/SetupFlow/DevHome.SetupFlow/DevHome.SetupFlow.csproj +++ b/tools/SetupFlow/DevHome.SetupFlow/DevHome.SetupFlow.csproj @@ -8,9 +8,6 @@ - - -