Skip to content

Upgrade WASDK from 1.6 to 1.8 #293

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

Open
0x5bfa wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Upgrade WASDK from 1.6 to 1.8 #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dab6509
Bump bump bump
0x5bfa Sep 13, 2025
d839259
Update
0x5bfa Sep 13, 2025
5d02250
Merge branch 'main' into wasdk1.8
Arlodotexe Sep 25, 2025
8be12ad
Merge branch 'main' into wasdk1.8
Arlodotexe Feb 19, 2026
8751cc2
Bump Microsoft.Xaml.Behaviors.WinUI.Managed to 3.0.1
Arlodotexe Feb 19, 2026
06aed5c
Update WASDK version to 1.8.260204000 to match Win2d dependency and f…
Arlodotexe Mar 24, 2026
246c51b
Remove duplicate Microsoft.Web.WebView2 package reference, now refere…
Arlodotexe Mar 27, 2026
cd1e677
Enable diagnostics in CI for binlog output to investigate MSIX build …
Arlodotexe Mar 27, 2026
5fd3712
Fix quoting issue for component path preventing -UseDiagnostics flag …
Arlodotexe Mar 30, 2026
1d6f7d9
Use quotes around componentPath in GenerateSingleSampleHeads.ps1 to w…
Arlodotexe Mar 30, 2026
7cce0a6
Name artifacts uniquely based on job matrix
Arlodotexe Mar 30, 2026
341a9dd
Disable consolelogger due to CI issues
Arlodotexe Mar 30, 2026
eccf488
Align slngen command formatting with GenerateAllSolution.ps1
Arlodotexe Mar 30, 2026
5979164
Add PSNativeCommandArgumentPassing, further align with GenerateAllSol…
Arlodotexe Mar 30, 2026
d92908e
Align $sdkoptions to GenerateAllSolution.ps1
Arlodotexe Mar 30, 2026
4a10a43
Add matrix multitarget to artifact name to fix conflicts
Arlodotexe Mar 30, 2026
eb04155
Add msbuild binlog and diagnostic params, realign artifact name with …
Arlodotexe Mar 30, 2026
acbfbd5
Set MSBUILD_VERBOSITY to diagnostic
Arlodotexe Mar 30, 2026
ffe7fc9
Bumped Microsoft.Xaml.Behaviors.Uwp.Managed to latest 3.0.1
Arlodotexe Mar 31, 2026
c3ca9e4
Updated WCT Extensions reference to 8.3.260331-pull-837.1767
Arlodotexe Mar 31, 2026
e2bccf6
Update gallery app package references to 8.3.260331-pull-837.1767
Arlodotexe Mar 31, 2026
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
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ on:
workflow_dispatch:

env:
ENABLE_DIAGNOSTICS: false
ENABLE_DIAGNOSTICS: true
MSBUILD_VERBOSITY: diagnostic
#COREHOST_TRACE: 1
COREHOST_TRACEFILE: corehosttrace.log

Expand Down Expand Up @@ -209,11 +210,11 @@ jobs:

- name: Add project heads to ${{ env.TEST_PROJECT_NAME }}
working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -MultiTargets ${{ matrix.multitarget }} -winui ${{ matrix.winui }} -componentPath "${{ github.workspace }}/${{ env.TEST_PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}"
run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -MultiTargets ${{ matrix.multitarget }} -winui ${{ matrix.winui }} -componentPath "${{ github.workspace }}/${{ env.TEST_PROJECT_DIRECTORY }}"${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}

- name: MSBuild
working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
run: msbuild.exe ${{ env.TEST_PROJECT_NAME }}.sln /restore /nowarn:MSB4011 -p:Configuration=Release
run: msbuild.exe ${{ env.TEST_PROJECT_NAME }}.sln /restore /nowarn:MSB4011 -p:Configuration=Release /m ${{ env.ENABLE_DIAGNOSTICS == 'true' && '/bl' || '' }} /v:${{ env.MSBUILD_VERBOSITY }}

# Run tests
- name: Setup VSTest Path
Expand All @@ -238,7 +239,7 @@ jobs:
uses: actions/upload-artifact@v4
if: ${{ (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }}
with:
name: new-experiment-logs
name: new-experiment-logs-${{ matrix.multitarget }}-winui${{ matrix.winui }}
path: ./**/*.*log

wasm-linux:
Expand Down
43 changes: 36 additions & 7 deletions GenerateSingleSolution.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,14 @@ $projects = [System.Collections.ArrayList]::new()
dotnet tool restore

$generatedSolutionFilePath = "$componentPath\$componentName.sln"
$platforms = '"Any CPU;x64;x86;ARM64"'
$slngenConfig = "--folders true --collapsefolders true --ignoreMainProject"
$platforms = 'Any CPU;x64;x86;ARM64'
$slngenConfig = @(
'--folders'
'true'
'--collapsefolders'
'true'
'--ignoreMainProject'
)

# Remove previous file if it exists
if (Test-Path -Path $generatedSolutionFilePath)
Expand Down Expand Up @@ -211,20 +217,43 @@ $projects = $projects + "$PSScriptRoot\CommunityToolkit.Tooling.XamlNamedPropert

if ($UseDiagnostics.IsPresent)
{
$sdkoptions = " -d"
$diagnostics = '-bl:slngen.binlog --consolelogger:"ShowEventId;Summary;Verbosity=Detailed" --filelogger:"LogFile=slngen.log;Append;Verbosity=Diagnostic;Encoding=UTF-8" '
$sdkoptions = "-d"
$diagnostics = @(
'-bl:slngen.binlog'
# Console logger + binlog causes exception and failure
# Track https://github.com/microsoft/slngen/issues/451
#'--consolelogger:ShowEventId;Summary;Verbosity=Detailed'
)
}
else
{
$sdkoptions = ""
$diagnostics = ""
}

$cmd = "dotnet$sdkoptions tool run slngen -o $generatedSolutionFilePath $slngenConfig $diagnostics--platform $platforms $($projects -Join ' ')"
$cmd = 'dotnet'
$arguments = @(
$sdkoptions
'tool'
'run'
'slngen'
'-o'
$generatedSolutionFilePath
$slngenConfig
$diagnostics
'--platform'
$platforms
$projects
"--launch $launch"
)

# See https://learn.microsoft.com/en-us/powershell/scripting/learn/experimental-features?view=powershell-7.4#psnativecommandargumentpassing
$PSNativeCommandArgumentPassing = 'Legacy'


Write-Output "Running Command: $cmd"
Write-Output "Running Command: $cmd $arguments"

Invoke-Expression $cmd
&$cmd @arguments

# go back to main working directory
Pop-Location
2 changes: 1 addition & 1 deletion MultiTarget/PackageReferences/Uwp/Microsoft.Web.WebView2.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- Explicit WebView2 reference needed to work around WebView2 pulling in Microsoft.VCLibs.Desktop on uap -->
<When Condition="'$(HasWinUI)' == 'true' AND '$(MultiTargetPlatformIdentifier)' != 'windows'" >
<ItemGroup>
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
</ItemGroup>
</When>
<Otherwise>
Expand Down
5 changes: 2 additions & 3 deletions MultiTarget/PackageReferences/WinAppSdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project>
<ItemGroup>
<PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
<PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.Windows.CsWinRt" Version="2.2.0" PrivateAssets="all" />
<PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.Web.WebView2" Version="1.0.2903.40" PrivateAssets="all" />
<PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.WindowsAppSDK.WinUI" Version="1.8.260204000" />
<PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.Windows.CsWinRT" Version="2.2.0" PrivateAssets="all" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ProjectHeads/App.Head.Uwp.Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Project>
<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Markdown" Version="7.1.3" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.0" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.1" />
<PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ProjectHeads/App.Head.WinAppSdk.Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<Project>
<ItemGroup>
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="3.0.0" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="3.0.1" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions ProjectHeads/App.Head.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<Choose>
<When Condition="'$(ToolkitConvertersSourceProject)' == ''">
<ItemGroup>
<PackageReference Include="CommunityToolkit.$(DependencyVariant).Converters" Version="8.2.250402"/>
<PackageReference Include="CommunityToolkit.$(DependencyVariant).Converters" Version="8.3.260331-pull-837.1767"/>
</ItemGroup>
</When>
<!-- This is tripping up the linux build using dotnet build as we have a duplicate reference
Expand All @@ -49,7 +49,7 @@
<Choose>
<When Condition="'$(ToolkitSettingsControlsSourceProject)' == ''">
<ItemGroup>
<PackageReference Include="CommunityToolkit.$(DependencyVariant).Controls.SettingsControls" Version="8.2.250402"/>
<PackageReference Include="CommunityToolkit.$(DependencyVariant).Controls.SettingsControls" Version="8.3.260331-pull-837.1767"/>
</ItemGroup>
</When>
<When Condition="'$(IsSingleExperimentHead)' == 'true' and $(MSBuildProjectName.StartsWith('SettingsControls')) == 'false'">
Expand All @@ -61,7 +61,7 @@
<Choose>
<When Condition="'$(ToolkitExtensionsSourceProject)' == ''">
<ItemGroup>
<PackageReference Include="CommunityToolkit.$(DependencyVariant).Extensions" Version="8.2.250402"/>
<PackageReference Include="CommunityToolkit.$(DependencyVariant).Extensions" Version="8.3.260331-pull-837.1767"/>
</ItemGroup>
</When>
<When Condition="'$(IsSingleExperimentHead)' == 'true' and $(MSBuildProjectName.StartsWith('Extensions')) == 'false'">
Expand All @@ -73,7 +73,7 @@
<Choose>
<When Condition="'$(ToolkitTriggersSourceProject)' == ''">
<ItemGroup>
<PackageReference Include="CommunityToolkit.$(DependencyVariant).Triggers" Version="8.2.250402"/>
<PackageReference Include="CommunityToolkit.$(DependencyVariant).Triggers" Version="8.3.260331-pull-837.1767"/>
</ItemGroup>
</When>
<When Condition="'$(IsSingleExperimentHead)' == 'true' and $(MSBuildProjectName.StartsWith('Triggers')) == 'false'">
Expand Down
2 changes: 1 addition & 1 deletion ProjectHeads/Tests.Head.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Choose>
<When Condition="'$(ToolkitExtensionsSourceProject)' == ''">
<ItemGroup>
<PackageReference Include="CommunityToolkit.$(DependencyVariant).Extensions" Version="8.2.250402"/>
<PackageReference Include="CommunityToolkit.$(DependencyVariant).Extensions" Version="8.3.260331-pull-837.1767"/>
</ItemGroup>
</When>
<When Condition="'$(IsSingleExperimentHead)' == 'true' and $(MSBuildProjectName.StartsWith('Extensions')) == 'false'">
Expand Down