Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/actions/ci/run-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ runs:

if ($templateArgs -match 'net9.0')
{
$dotnetVersion = '9.0.304'
$dotnetVersion = '9.0.305'
$ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet9
}

if ($templateArgs -match 'net10.0')
{
$dotnetVersion = '10.0.100-preview.7.25380.108'
$dotnetVersion = '10.0.100-rc.1.25451.107'
$ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet10
}

Expand Down
3 changes: 2 additions & 1 deletion .github/sdk-update-exclude.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"exclude": [
"SvgSkia"
"SvgSkia",
"WinAppSdk"
]
}

6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ concurrency:
env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
IsCanaryBranch: ${{ startsWith(github.ref, 'refs/heads/canaries/') }}
ValidationUnoCheckVersionNet9: '1.32.0-dev.52'
ValidationUnoCheckVersionNet10: '1.32.0-dev.52'
ValidationDotNetVersion: '9.0.304'
ValidationUnoCheckVersionNet9: '1.33.0-dev.13'
ValidationUnoCheckVersionNet10: '1.33.0-dev.13'
ValidationDotNetVersion: '9.0.305'

# https://github.com/unoplatform/Uno.Wasm.Bootstrap/pull/887 remove when upgarding to .NET 9
# compatible version of the bootstrapper
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Sdk.Updater.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<!-- This file is generated by the Uno.Sdk.Updater. Do not make manual changes. -->
<PropertyGroup>
<UnoVersion>6.3.0-dev.193</UnoVersion>
<UnoVersion>6.4.0-dev.49</UnoVersion>
<UnoWasmBootstrapVersionNet9>9.0.20</UnoWasmBootstrapVersionNet9>
<UnoWasmBootstrapVersionNet10>10.0.0-dev.24</UnoWasmBootstrapVersionNet10>
<UnoExtensionsLoggingVersion>1.7.0</UnoExtensionsLoggingVersion>
Expand Down
48 changes: 24 additions & 24 deletions src/Uno.Sdk/ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp

| MSBuild Property | Default Version |
|----------------|:---------------:|
| UnoVersion* | 6.3.0-dev.193 |
| UnoVersion* | 6.4.0-dev.49 |
| UnoExtensionsVersion | 6.3.0-dev.3 |
| UnoToolkitVersion | 8.2.0-dev.11 |
| UnoToolkitVersion | 8.3.0-dev.3 |
| UnoThemesVersion | 5.8.0-dev.2 |
| UnoCSharpMarkupVersion | 6.3.0-dev.3 |
| UnoCSharpMarkupVersion | 6.4.0-dev.5 |
| UnoWasmBootstrapVersion** | 9.0.20 |
| UnoLoggingVersion | 1.7.0 |
| UnoCoreLoggingSingletonVersion | 4.1.1 |
| UnoUniversalImageLoaderVersion | 1.9.37 |
| UnoDspTasksVersion | 1.4.0 |
| UnoResizetizerVersion | 1.11.0-dev.17 |
| UnoResizetizerVersion | 1.12.0-dev.3 |
| SkiaSharpVersion | 3.119.0 |
| SvgSkiaVersion | 3.0.6 |
| WinAppSdkVersion | 1.7.250606001 |
| WinAppSdkVersion | 1.8.250907003 |
| WinAppSdkBuildToolsVersion | 10.0.26100.4948 |
| MicrosoftLoggingVersion** | 9.0.8 |
| WindowsCompatibilityVersion** | 9.0.8 |
| MicrosoftIdentityClientVersion | 4.76.0 |
| MicrosoftLoggingVersion** | 9.0.9 |
| WindowsCompatibilityVersion** | 9.0.9 |
| MicrosoftIdentityClientVersion | 4.77.0 |
| CommunityToolkitMvvmVersion | 8.4.0 |
| PrismVersion | 9.0.537 |
| AndroidMaterialVersion | 1.12.0.4 |
Expand All @@ -34,7 +34,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
| AndroidXSwipeRefreshLayoutVersion | 1.1.0.28 |
| AndroidXNavigationVersion | 2.8.9.2 |
| AndroidXCollectionVersion | 1.5.0.2 |
| MauiVersion** | 9.0.100 |
| MauiVersion** | 9.0.110 |

\* UnoVersion cannot be changed via MSBuild. You must change the SDK Version to change the UnoVersion.
\*\* This version may have a different version for .NET 10.0.
Expand All @@ -43,7 +43,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
[
{
"group": "Core",
"version": "6.3.0-dev.193",
"version": "6.4.0-dev.49",
"packages": [
"Uno.WinUI",
"Uno.UI.Adapter.Microsoft.Extensions.Logging",
Expand Down Expand Up @@ -116,7 +116,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
},
{
"group": "Resizetizer",
"version": "1.11.0-dev.17",
"version": "1.12.0-dev.3",
"packages": [
"Uno.Resizetizer"
]
Expand All @@ -130,14 +130,14 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
},
{
"group": "settings",
"version": "1.6.0-dev.15",
"version": "1.7.0-dev.1",
"packages": [
"Uno.Settings.DevServer"
]
},
{
"group": "hotdesign",
"version": "1.16.0-dev.194",
"version": "1.17.0-dev.41",
"packages": [
"Uno.UI.HotDesign"
]
Expand All @@ -164,7 +164,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
},
{
"group": "WinAppSdk",
"version": "1.7.250606001",
"version": "1.8.250907003",
"packages": [
"Microsoft.WindowsAppSDK"
]
Expand All @@ -178,27 +178,27 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
},
{
"group": "MicrosoftLoggingConsole",
"version": "9.0.8",
"version": "9.0.9",
"packages": [
"Microsoft.Extensions.Logging.Console"
],
"versionOverride": {
"net10.0": "10.0.0-preview.7.25380.108"
"net10.0": "10.0.0-rc.1.25451.107"
}
},
{
"group": "WindowsCompatibility",
"version": "9.0.8",
"version": "9.0.9",
"packages": [
"Microsoft.Windows.Compatibility"
],
"versionOverride": {
"net10.0": "10.0.0-preview.7.25380.108"
"net10.0": "10.0.0-rc.1.25451.107"
}
},
{
"group": "MsalClient",
"version": "4.76.0",
"version": "4.77.0",
"packages": [
"Microsoft.Identity.Client",
"Microsoft.Identity.Client.Extensions.Msal"
Expand Down Expand Up @@ -332,19 +332,19 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
},
{
"group": "Maui",
"version": "9.0.100",
"version": "9.0.110",
"packages": [
"Microsoft.Maui.Controls",
"Microsoft.Maui.Controls.Compatibility",
"Microsoft.Maui.Graphics"
],
"versionOverride": {
"net10.0": "10.0.0-preview.7.25406.3"
"net10.0": "10.0.0-rc.1.25452.6"
}
},
{
"group": "CSharpMarkup",
"version": "6.3.0-dev.3",
"version": "6.4.0-dev.5",
"packages": [
"Uno.WinUI.Markup",
"Uno.Extensions.Markup.Generators"
Expand Down Expand Up @@ -382,7 +382,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
},
{
"group": "Toolkit",
"version": "8.2.0-dev.11",
"version": "8.3.0-dev.3",
"packages": [
"Uno.Toolkit.WinUI",
"Uno.Toolkit.WinUI.Cupertino",
Expand Down Expand Up @@ -411,7 +411,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
},
{
"group": "MicrosoftWebView2",
"version": "1.0.3405.78",
"version": "1.0.3485.44",
"packages": [
"Microsoft.Web.WebView2"
]
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Sdk/Uno.Sdk.Updater.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<PackageTags></PackageTags>
<SdkPackageId>Uno.Sdk.Private</SdkPackageId>
<SdkVersion>6.3.0-dev.193</SdkVersion>
<SdkVersion>6.4.0-dev.49</SdkVersion>
<PackageReadmeFile>ReadMe.md</PackageReadmeFile>
</PropertyGroup>

Expand Down
47 changes: 25 additions & 22 deletions src/Uno.Sdk/packages.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"group": "Core",
"version": "6.3.0-dev.193",
"version": "6.4.0-dev.49",
"packages": [
"Uno.WinUI",
"Uno.UI.Adapter.Microsoft.Extensions.Logging",
Expand Down Expand Up @@ -74,7 +74,7 @@
},
{
"group": "Resizetizer",
"version": "1.11.0-dev.17",
"version": "1.12.0-dev.3",
"packages": [
"Uno.Resizetizer"
]
Expand All @@ -88,14 +88,14 @@
},
{
"group": "settings",
"version": "1.6.0-dev.15",
"version": "1.7.0-dev.1",
"packages": [
"Uno.Settings.DevServer"
]
},
{
"group": "hotdesign",
"version": "1.16.0-dev.194",
"version": "1.17.0-dev.41",
"packages": [
"Uno.UI.HotDesign"
]
Expand Down Expand Up @@ -136,27 +136,27 @@
},
{
"group": "MicrosoftLoggingConsole",
"version": "9.0.8",
"version": "9.0.9",
"packages": [
"Microsoft.Extensions.Logging.Console"
],
"versionOverride": {
"net10.0": "10.0.0-preview.7.25380.108"
"net10.0": "10.0.0-rc.1.25451.107"
}
},
{
"group": "WindowsCompatibility",
"version": "9.0.8",
"version": "9.0.9",
"packages": [
"Microsoft.Windows.Compatibility"
],
"versionOverride": {
"net10.0": "10.0.0-preview.7.25380.108"
"net10.0": "10.0.0-rc.1.25451.107"
}
},
{
"group": "MsalClient",
"version": "4.76.0",
"version": "4.77.0",
"packages": [
"Microsoft.Identity.Client",
"Microsoft.Identity.Client.Extensions.Msal"
Expand Down Expand Up @@ -194,7 +194,7 @@
"Xamarin.Google.Android.Material"
],
"versionOverride": {
"net10.0": "1.12.0.4"
"net10.0": "1.12.0.5"
}
},
{
Expand Down Expand Up @@ -224,7 +224,7 @@
"Xamarin.AndroidX.AppCompat"
],
"versionOverride": {
"net10.0": "1.7.0.7"
"net10.0": "1.7.1.1"
}
},
{
Expand All @@ -234,7 +234,7 @@
"Xamarin.AndroidX.RecyclerView"
],
"versionOverride": {
"net10.0": "1.4.0.2"
"net10.0": "1.4.0.3"
}
},
{
Expand All @@ -244,7 +244,7 @@
"Xamarin.AndroidX.Activity"
],
"versionOverride": {
"net10.0": "1.10.1.2"
"net10.0": "1.10.1.3"
}
},
{
Expand All @@ -254,7 +254,7 @@
"Xamarin.AndroidX.Browser"
],
"versionOverride": {
"net10.0": "1.8.0.10"
"net10.0": "1.8.0.11"
}
},
{
Expand All @@ -264,7 +264,7 @@
"Xamarin.AndroidX.SwipeRefreshLayout"
],
"versionOverride": {
"net10.0": "1.1.0.28"
"net10.0": "1.1.0.29"
}
},
{
Expand All @@ -275,7 +275,10 @@
"Xamarin.AndroidX.Navigation.Fragment",
"Xamarin.AndroidX.Navigation.Runtime",
"Xamarin.AndroidX.Navigation.Common"
]
],
"versionOverride": {
"net10.0": "2.9.2.1"
}
},
{
"group": "AndroidXCollection",
Expand All @@ -285,24 +288,24 @@
"Xamarin.AndroidX.Collection.Ktx"
],
"versionOverride": {
"net10.0": "1.5.0.2"
"net10.0": "1.5.0.3"
}
},
{
"group": "Maui",
"version": "9.0.100",
"version": "9.0.110",
"packages": [
"Microsoft.Maui.Controls",
"Microsoft.Maui.Controls.Compatibility",
"Microsoft.Maui.Graphics"
],
"versionOverride": {
"net10.0": "10.0.0-preview.7.25406.3"
"net10.0": "10.0.0-rc.1.25452.6"
}
},
{
"group": "CSharpMarkup",
"version": "6.3.0-dev.3",
"version": "6.4.0-dev.5",
"packages": [
"Uno.WinUI.Markup",
"Uno.Extensions.Markup.Generators"
Expand Down Expand Up @@ -340,7 +343,7 @@
},
{
"group": "Toolkit",
"version": "8.2.0-dev.11",
"version": "8.3.0-dev.3",
"packages": [
"Uno.Toolkit.WinUI",
"Uno.Toolkit.WinUI.Cupertino",
Expand Down Expand Up @@ -369,7 +372,7 @@
},
{
"group": "MicrosoftWebView2",
"version": "1.0.3405.78",
"version": "1.0.3485.44",
"packages": [
"Microsoft.Web.WebView2"
]
Expand Down
Loading