Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating community toolkit to prevent layout cycle. #2524

Merged
merged 19 commits into from
Apr 5, 2024
Merged

Updating community toolkit to prevent layout cycle. #2524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
fb4a194
Still breaks
dhoehna Apr 3, 2024
fb7164d
Works
dhoehna Apr 3, 2024
e4a6055
Restoring nuget config
dhoehna Apr 3, 2024
a2bcae8
Upgrading SDK version
dhoehna Apr 4, 2024
efa7ac6
Making more changes to accomodate SDK changing
dhoehna Apr 4, 2024
9957ba2
Changing more things to work with the new SDK version
dhoehna Apr 4, 2024
b713ebc
Updaing more SDK versions
dhoehna Apr 4, 2024
89e94e8
Updaing more versions
dhoehna Apr 4, 2024
cbd8e6b
Removing all the file line ending changes
dhoehna Apr 4, 2024
b091669
Writing host
dhoehna Apr 4, 2024
4121f9b
Writing the output didn't help
dhoehna Apr 4, 2024
68776a6
Found it!
dhoehna Apr 4, 2024
ad05a14
More SDk changes
dhoehna Apr 4, 2024
66eee0a
Adding more notes
dhoehna Apr 4, 2024
a6ad2b0
Merge branch 'main' into user/dhoehna/SegmentedBluePillLayoutCycleFix2
dhoehna Apr 4, 2024
0111af4
Merge branch 'main' into user/dhoehna/SegmentedBluePillLayoutCycleFix2
dhoehna Apr 4, 2024
9ef23e9
Update HyperVExtension/test/DevSetupEngine.Test/DevSetupEngine.Test.c…
dhoehna Apr 4, 2024
03fa39b
Update src/Package.appxmanifest
dhoehna Apr 4, 2024
121a122
comments (#2536)
krschau Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/DevHome-CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand All @@ -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
Expand All @@ -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
}
3 changes: 2 additions & 1 deletion HyperVExtension/BuildDevSetupAgentHelper.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion HyperVExtension/ToolingVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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>net8.0-windows10.0.22000.0</TargetFramework>
<!-- SDK version and .NEt version needs to stay in sync with BuildDevSetupAgentHelper.ps1.props, DevSetupEngineIdl.vcxproj, and DevHome-CL.yaml-->
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion HyperVExtension/src/DevSetupEngineIdl/DevSetupEngineIdl.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22000.0</WindowsTargetPlatformVersion>
<!-- SDK version needs to stay in sync with ToolingVersion.props, and BuildDevSetupAgentHelper.ps1 -->
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down
2 changes: 1 addition & 1 deletion .../src/HyperVExtension.HostGuestCommunication/HyperVExtension.HostGuestCommunication.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.2.206-beta" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.2" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
Expand Down
8 changes: 4 additions & 4 deletions Test.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ToolingVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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>net8.0-windows10.0.22000.0</TargetFramework>
<!-- Please keep the .NET version and SDK version is sync with HyperVExtension/ToolingVersion.props.-->
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
dhoehna marked this conversation as resolved.
Show resolved Hide resolved
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Create-AppxBundle.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/UnbundleStubPackage.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions common/DevHome.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@
<PackageReference Include="CommunityToolkit.Common" Version="8.2.2" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.230830" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.1.240328-rc" />
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.1.240328-rc" />
<PackageReference Include="CommunityToolkit.WinUI.Collections" Version="8.1.240328-rc" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
<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="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Internal.Windows.DevHome.Helpers" Version="1.0.20240311-x1907" />
Expand Down
1 change: 0 additions & 1 deletion tools/Environments/DevHome.Environments/DevHome.Environments.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.WinUI.Collections" Version="8.0.240109" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
dhoehna marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion ...s/DevHome.QuietBackgroundProcesses.Common/DevHome.QuietBackgroundProcesses.Common.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22000.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
<WindowsAppContainer>false</WindowsAppContainer>
<MdmergeMergedDir>AnyCPU\$(Configuration)\Merged\</MdmergeMergedDir>
Expand Down
2 changes: 1 addition & 1 deletion ...ackgroundProcesses.ElevatedServer/DevHome.QuietBackgroundProcesses.ElevatedServer.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22000.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
<WindowsAppContainer>false</WindowsAppContainer>
<DesktopCompatible>true</DesktopCompatible>
Expand Down
2 changes: 1 addition & 1 deletion ...s/DevHome.QuietBackgroundProcesses.Server/DevHome.QuietBackgroundProcesses.Server.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22000.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
<WindowsAppContainer>false</WindowsAppContainer>
<OutDir>$(CppOutDir)</OutDir>
Expand Down
3 changes: 0 additions & 3 deletions tools/SetupFlow/DevHome.SetupFlow/DevHome.SetupFlow.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.WinUI.Collections" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
dhoehna marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0182" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
Expand Down
Loading