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

feat: Update to WinAppSDK 26100 #1141

Merged
merged 1 commit into from
Dec 11, 2024
+135 −142
Merged

feat: Update to WinAppSDK 26100 #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Uno.Sdk/ReadMe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
| SkiaSharpVersion | 2.88.9-preview.2.2 |
| SvgSkiaVersion | 2.0.0.4 |
| WinAppSdkVersion | 1.6.241114003 |
| WinAppSdkBuildToolsVersion | 10.0.22621.3233 |
| WinAppSdkBuildToolsVersion | 10.0.26100.1742 |
| MicrosoftLoggingVersion** | 8.0.1 |
| WindowsCompatibilityVersion** | 8.0.11 |
| MicrosoftIdentityClientVersion | 4.66.2 |
Expand Down Expand Up @@ -162,7 +162,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
},
{
"group": "WinAppSdkBuildTools",
"version": "10.0.22621.3233",
"version": "10.0.26100.1742",
"packages": [
"Microsoft.Windows.SDK.BuildTools"
]
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Sdk/packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
},
{
"group": "WinAppSdkBuildTools",
"version": "10.0.22621.3233",
"version": "10.0.26100.1742",
"packages": [
"Microsoft.Windows.SDK.BuildTools"
]
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Templates/content/unoapp/.run/MyExtensionsApp.1.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<!--#if (useWinAppSdk)-->
<configuration default="false" name="MyExtensionsApp.1 (WinAppSDK Unpackaged)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MyExtensionsApp.1/MyExtensionsApp.1.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="$baseTargetFramework$-windows10.0.22621.0" />
<option name="LAUNCH_PROFILE_TFM" value="$baseTargetFramework$-windows10.0.26100.0" />
<option name="LAUNCH_PROFILE_NAME" value="MyExtensionsApp.1 (WinAppSDK Unpackaged)" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
Expand Down
256 changes: 128 additions & 128 deletions src/Uno.Templates/content/unoapp/.template.config/template.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...lates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<!--#endif-->
<!--#if (useWinAppSdk)-->
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$baseTargetFramework$-windows10.0.22621</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$baseTargetFramework$-windows10.0.26100</TargetFrameworks>
<!--#endif-->
<TargetFrameworks>
$baseTargetFramework$;
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Templates/content/unolib/CrossTargetedLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Uno.Sdk">
<PropertyGroup>
<TargetFrameworks>$baseTargetFramework$;$baseTargetFramework$-ios;$baseTargetFramework$-maccatalyst;$baseTargetFramework$-android;$baseTargetFramework$-windows10.0.22621;$baseTargetFramework$-browserwasm;$baseTargetFramework$-desktop</TargetFrameworks>
<TargetFrameworks>$baseTargetFramework$;$baseTargetFramework$-ios;$baseTargetFramework$-maccatalyst;$baseTargetFramework$-android;$baseTargetFramework$-windows10.0.26100;$baseTargetFramework$-browserwasm;$baseTargetFramework$-desktop</TargetFrameworks>
<UnoSingleProject>true</UnoSingleProject>
<OutputType>Library</OutputType>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
Expand Down
2 changes: 1 addition & 1 deletion tools/TemplateTfmSwitchGenerator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
new Platform("platforms == android", "platforms != android", "android"),
new Platform("platforms == ios", "platforms != ios", "ios"),
new Platform("platforms == maccatalyst", "platforms != maccatalyst", "maccatalyst"),
new Platform("platforms == windows", "platforms != windows", "windows10.0.22621"),
new Platform("platforms == windows", "platforms != windows", "windows10.0.26100"),
new Platform("platforms == wasm", "platforms != wasm", "browserwasm"),
new Platform("platforms == desktop", "platforms != desktop", "desktop"),
new Platform("useUnitTests == true", "useUnitTests == false", null)
Expand Down
7 changes: 0 additions & 7 deletions tools/Uno.Sdk.Updater/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System.Globalization;
using System.IO.Compression;
using System.Text;
using System.Text.Json;
Expand Down Expand Up @@ -300,12 +299,6 @@ static async Task<ManifestGroup> UpdateGroup(ManifestGroup group, NuGetVersion u
Console.WriteLine("Skipping " + group.Group + " to avoid Java misalignment.");
return group;
}
// Skip WinAppSdkBuildTools group due to https://github.com/unoplatform/uno/issues/18840
else if (string.Equals(group.Group, "WinAppSdkBuildTools", StringComparison.InvariantCultureIgnoreCase))
{
Console.WriteLine("Skipping " + group.Group + "to avoid issues caused by https://github.com/unoplatform/uno/issues/18840");
return group;
}

var preview = unoVersion.IsPreview;

Expand Down
Loading