diff --git a/.github/workflows/uwp-autoconvert.yml b/.github/workflows/uwp-autoconvert.yml
index 5114b0c9ef05..26517e23f25a 100644
--- a/.github/workflows/uwp-autoconvert.yml
+++ b/.github/workflows/uwp-autoconvert.yml
@@ -13,7 +13,7 @@ concurrency:
cancel-in-progress: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- UnoCheck_Version: '1.26.0-dev.6'
+ UnoCheck_Version: '1.26.0-dev.28'
jobs:
build:
@@ -69,7 +69,7 @@ jobs:
& dotnet tool update --global uno.check --version $env:UnoCheck_Version --add-source https://api.nuget.org/v3/index.json
name: Install Uno Check
- run: |
- & uno-check -v --ci --non-interactive --fix --skip androidsdk --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --pre-major
+ & uno-check -v --ci --non-interactive --fix --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --pre-major
name: Run uno-check
- name: Convert source tree to UWP
@@ -77,10 +77,15 @@ jobs:
cd $env:GITHUB_WORKSPACE\src\Uno.WinUIRevert
dotnet run "$env:GITHUB_WORKSPACE"
+ - name: Workloads list
+ run: |
+ dotnet workload list
+
- name: Run API Sync Tool
run: |
cd $env:GITHUB_WORKSPACE\build
- msbuild Uno.UI.Build.csproj /v:m "/p:CombinedConfiguration=Release|AnyCPU" /m /t:RunAPISyncTool /bl
+ msbuild Uno.UI.Build.csproj /v:m "/p:CombinedConfiguration=Release|AnyCPU" /m /t:RunAPISyncTool /bl:$env:GITHUB_WORKSPACE\artifacts-logs\msbuild.binlog
+
- name: Turn script debugging on
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
run: Set-PSDebug -Trace 1
@@ -95,3 +100,10 @@ jobs:
- name: Push to repository
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
run: git push origin $env:GITHUB_REF_NAME`:generated/$env:GITHUB_REF_NAME/uwp-autoconvert -f
+
+ - name: Upload Logs
+ uses: actions/upload-artifact@v4
+ if: always()
+ with:
+ name: logs
+ path: .\artifacts-logs
diff --git a/Directory.Build.props b/Directory.Build.props
index 8be58b3efefb..0d481f59ff94 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -21,7 +21,7 @@
net9.0
net8.0
- $(NetCurrent)-android;$(NetCurrent)-ios17.2;$(NetCurrent)-maccatalyst17.2;$(NetCurrent)-macos14.2
+ $(NetCurrent)-android;$(NetCurrent)-ios17.5;$(NetCurrent)-maccatalyst17.5;$(NetCurrent)-macos14.5
$(NetPrevious)-android;$(NetPrevious)-ios17.0;$(NetPrevious)-maccatalyst17.0;$(NetPrevious)-macos14.0
$(NetPrevious)-windows
diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj
index baae146433fe..e11771b46f5e 100644
--- a/build/Uno.UI.Build.csproj
+++ b/build/Uno.UI.Build.csproj
@@ -116,9 +116,10 @@
+
diff --git a/build/ci/.azure-devops-docs.yml b/build/ci/.azure-devops-docs.yml
index 64f40776873c..cafdcae200f1 100644
--- a/build/ci/.azure-devops-docs.yml
+++ b/build/ci/.azure-devops-docs.yml
@@ -48,3 +48,11 @@ jobs:
PathtoPublish: $(build.artifactstagingdirectory)
ArtifactName: DocumentationArtifacts
ArtifactType: Container
+
+ - task: PublishBuildArtifacts@1
+ condition: always()
+ retryCountOnTaskFailure: 3
+ inputs:
+ PathtoPublish: $(Build.SourcesDirectory)/doc
+ ArtifactName: GeneratedDocDirectory
+ ArtifactType: Container
diff --git a/build/ci/net9/global.json b/build/ci/net9/global.json
index 433df69988b5..ce82d982a7f8 100644
--- a/build/ci/net9/global.json
+++ b/build/ci/net9/global.json
@@ -1,11 +1,11 @@
{
"sdk": {
- "version": "9.0.100-preview.6.24328.19",
+ "version": "9.0.100-rc.1.24452.12",
"allowPrerelease": true,
"rollForward": "disable"
},
"tools": {
- "dotnet": "9.0.100-preview.6.24328.19"
+ "dotnet": "9.0.100-rc.1.24452.12"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.44",
diff --git a/build/ci/templates/dotnet-mobile-install-linux.yml b/build/ci/templates/dotnet-mobile-install-linux.yml
index 66ba3add7d30..365c688490c5 100644
--- a/build/ci/templates/dotnet-mobile-install-linux.yml
+++ b/build/ci/templates/dotnet-mobile-install-linux.yml
@@ -1,5 +1,5 @@
parameters:
- UnoCheck_Version: '1.26.0-dev.6'
+ UnoCheck_Version: '1.26.0-dev.28'
steps:
@@ -17,7 +17,6 @@ steps:
- bash: |
dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
- # androidsdk disabled for https://github.com/unoplatform/uno.check/issues/241
- uno-check --ci --non-interactive --fix --skip androidsdk --skip gtk3 --pre-major
+ uno-check --ci --non-interactive --fix --skip gtk3 --skip androidsdk --pre-major
displayName: Install .NET Workloads
retryCountOnTaskFailure: 3
diff --git a/build/ci/templates/dotnet-mobile-install-mac.yml b/build/ci/templates/dotnet-mobile-install-mac.yml
index dc7515678113..ea70f1b7795e 100644
--- a/build/ci/templates/dotnet-mobile-install-mac.yml
+++ b/build/ci/templates/dotnet-mobile-install-mac.yml
@@ -1,5 +1,5 @@
parameters:
- UnoCheck_Version: '1.26.0-dev.6'
+ UnoCheck_Version: '1.26.0-dev.28'
steps:
@@ -9,7 +9,7 @@ steps:
- powershell: |
& dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
- & uno-check -v --ci --non-interactive --fix --skip androidsdk --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --pre-major
+ & uno-check -v --ci --non-interactive --fix --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --pre-major
displayName: Install .NET Workloads
errorActionPreference: continue
ignoreLASTEXITCODE: true
diff --git a/build/ci/templates/dotnet-mobile-install-windows.yml b/build/ci/templates/dotnet-mobile-install-windows.yml
index dc7515678113..ea70f1b7795e 100644
--- a/build/ci/templates/dotnet-mobile-install-windows.yml
+++ b/build/ci/templates/dotnet-mobile-install-windows.yml
@@ -1,5 +1,5 @@
parameters:
- UnoCheck_Version: '1.26.0-dev.6'
+ UnoCheck_Version: '1.26.0-dev.28'
steps:
@@ -9,7 +9,7 @@ steps:
- powershell: |
& dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
- & uno-check -v --ci --non-interactive --fix --skip androidsdk --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --pre-major
+ & uno-check -v --ci --non-interactive --fix --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --pre-major
displayName: Install .NET Workloads
errorActionPreference: continue
ignoreLASTEXITCODE: true
diff --git a/build/nuget/Uno.WinUI.DevServer.nuspec b/build/nuget/Uno.WinUI.DevServer.nuspec
index 0a3175e96d60..6ef6056cad27 100644
--- a/build/nuget/Uno.WinUI.DevServer.nuspec
+++ b/build/nuget/Uno.WinUI.DevServer.nuspec
@@ -52,8 +52,8 @@
-
-
+
+
@@ -61,8 +61,8 @@
-
-
+
+
@@ -70,8 +70,8 @@
-
-
+
+
@@ -145,14 +145,14 @@
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/build/nuget/Uno.WinUI.Lottie.nuspec b/build/nuget/Uno.WinUI.Lottie.nuspec
index e1c7506bcaa7..1f67232e9296 100644
--- a/build/nuget/Uno.WinUI.Lottie.nuspec
+++ b/build/nuget/Uno.WinUI.Lottie.nuspec
@@ -72,7 +72,7 @@
-
+
@@ -80,7 +80,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
@@ -111,13 +111,13 @@
-
+
-
+
-
+
@@ -142,8 +142,8 @@
-
-
+
+
diff --git a/build/nuget/Uno.WinUI.MSAL.nuspec b/build/nuget/Uno.WinUI.MSAL.nuspec
index b06693337439..59b2075c890e 100644
--- a/build/nuget/Uno.WinUI.MSAL.nuspec
+++ b/build/nuget/Uno.WinUI.MSAL.nuspec
@@ -54,15 +54,15 @@
-
+
-
+
-
+
@@ -89,9 +89,9 @@
-
-
-
+
+
+
diff --git a/build/nuget/Uno.WinUI.RemoteControl.nuspec b/build/nuget/Uno.WinUI.RemoteControl.nuspec
index 0525cbe8d64f..c7bf8a992c20 100644
--- a/build/nuget/Uno.WinUI.RemoteControl.nuspec
+++ b/build/nuget/Uno.WinUI.RemoteControl.nuspec
@@ -35,8 +35,8 @@
-
-
-
+
+
+
diff --git a/build/nuget/Uno.WinUI.Svg.nuspec b/build/nuget/Uno.WinUI.Svg.nuspec
index e17eeee38227..4e057b06134f 100644
--- a/build/nuget/Uno.WinUI.Svg.nuspec
+++ b/build/nuget/Uno.WinUI.Svg.nuspec
@@ -56,14 +56,14 @@
-
+
-
+
@@ -73,10 +73,10 @@
-
+
-
+
@@ -109,8 +109,8 @@
-
-
+
+
diff --git a/build/nuget/Uno.WinUI.XamlHost.nuspec b/build/nuget/Uno.WinUI.XamlHost.nuspec
index 0659ef6c1430..ac8e3183b091 100644
--- a/build/nuget/Uno.WinUI.XamlHost.nuspec
+++ b/build/nuget/Uno.WinUI.XamlHost.nuspec
@@ -28,13 +28,13 @@
-
+
-
+
-
+
@@ -55,14 +55,14 @@
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/build/nuget/Uno.WinUI.nuspec b/build/nuget/Uno.WinUI.nuspec
index 4c156928b734..2b72c15cbffa 100644
--- a/build/nuget/Uno.WinUI.nuspec
+++ b/build/nuget/Uno.WinUI.nuspec
@@ -36,22 +36,22 @@
-
-
+
+
-
-
+
+
-
-
+
+
@@ -195,8 +195,8 @@
-
-
+
+
@@ -210,7 +210,7 @@
-
+
@@ -223,8 +223,8 @@
-
-
+
+
@@ -377,74 +377,74 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -624,9 +624,9 @@
-
-
-
+
+
+
@@ -635,9 +635,9 @@
-
-
-
+
+
+
diff --git a/build/test-scripts/run-netcore-mobile-template-tests.ps1 b/build/test-scripts/run-netcore-mobile-template-tests.ps1
index d223f9b7018c..d95e93043519 100644
--- a/build/test-scripts/run-netcore-mobile-template-tests.ps1
+++ b/build/test-scripts/run-netcore-mobile-template-tests.ps1
@@ -150,9 +150,14 @@ if ($IsWindows)
& $msbuild "@build.rsp"
Assert-ExitCodeIsZero
- # Uno Cross-Runtime Library
- & $msbuild $debug /t:Pack MyCrossRuntimeLib\MyCrossRuntimeLib.sln
- Assert-ExitCodeIsZero
+ if (!$IsWindows)
+ {
+ # disabled on windows until android 35 is supported in the installed VS instance
+
+ # Uno Cross-Runtime Library
+ & $msbuild $debug /t:Pack MyCrossRuntimeLib\MyCrossRuntimeLib.sln -bl:binlogs/MyCrossRuntimeLib/msbuild.binlog
+ Assert-ExitCodeIsZero
+ }
#
# Uno Library with assets, Validate assets count
@@ -222,13 +227,18 @@ $projects =
@("5.1/uno51blank/uno51blank.Skia.Linux.FrameBuffer/uno51blank.Skia.Linux.FrameBuffer.csproj", "", $true, $true),
@("5.1/uno51blank/uno51blank.Skia.Wpf/uno51blank.Skia.Wpf.csproj", "", $true, $false),
@("5.1/uno51blank/uno51blank.Wasm/uno51blank.Wasm.csproj", "", $true, $false),
- @("5.1/uno51blank/uno51blank.Windows/uno51blank.Windows.csproj", "", $false, $false),
+
+ # disabled on windows until android 35 is supported in the installed VS instance
+ # @("5.1/uno51blank/uno51blank.Windows/uno51blank.Windows.csproj", "", $false, $false),
#
# 5.1 Recommended
#
@("5.1/uno51recommended/uno51recommended.Mobile/uno51recommended.Mobile.csproj", "", $true, $true),
- @("5.1/uno51recommended/uno51recommended.Windows/uno51recommended.Windows.csproj", "", $false, $false),
+
+ # disabled on windows until android 35 is supported in the installed VS instance
+ # @("5.1/uno51recommended/uno51recommended.Windows/uno51recommended.Windows.csproj", "", $false, $false),
+
@("5.1/uno51recommended/uno51recommended.Skia.Gtk/uno51recommended.Skia.Gtk.csproj", "", $true, $true),
@("5.1/uno51recommended/uno51recommended.Skia.Linux.FrameBuffer/uno51recommended.Skia.Linux.FrameBuffer.csproj", "", $true, $true),
@("5.1/uno51recommended/uno51recommended.Skia.Wpf/uno51recommended.Skia.Wpf.csproj", "", $true, $false),
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index f7995e5b124d..7d77c0a2e11a 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -195,4 +195,6 @@
+
+
diff --git a/src/SolutionTemplate/5.2/uno52AppWithLib/Directory.Build.targets b/src/SolutionTemplate/5.2/uno52AppWithLib/Directory.Build.targets
index 36e82feacf57..b207aa11fdb9 100644
--- a/src/SolutionTemplate/5.2/uno52AppWithLib/Directory.Build.targets
+++ b/src/SolutionTemplate/5.2/uno52AppWithLib/Directory.Build.targets
@@ -5,4 +5,8 @@
+
+
+
+
diff --git a/src/SolutionTemplate/5.2/uno52AppWithLib/uno52AppWithLib/uno52AppWithLib.csproj b/src/SolutionTemplate/5.2/uno52AppWithLib/uno52AppWithLib/uno52AppWithLib.csproj
index 13b98c98c5ba..65168bf4a93a 100644
--- a/src/SolutionTemplate/5.2/uno52AppWithLib/uno52AppWithLib/uno52AppWithLib.csproj
+++ b/src/SolutionTemplate/5.2/uno52AppWithLib/uno52AppWithLib/uno52AppWithLib.csproj
@@ -4,6 +4,11 @@
$(TargetFrameworks);net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-desktop
$(TargetFrameworks);net8.0-windows10.0.19041
+
+ $(TargetFrameworks.Replace('net8.0-android',''))
+ $(TargetFrameworks.Replace('net8.0-ios',''))
+ $(TargetFrameworks.Replace('net8.0-maccatalyst',''))
+
Exe
true
diff --git a/src/SolutionTemplate/5.2/uno52AppWithLib/uno52emptylib/uno52emptylib.csproj b/src/SolutionTemplate/5.2/uno52AppWithLib/uno52emptylib/uno52emptylib.csproj
index 0410cdfb0ef8..4c1a25d4673f 100644
--- a/src/SolutionTemplate/5.2/uno52AppWithLib/uno52emptylib/uno52emptylib.csproj
+++ b/src/SolutionTemplate/5.2/uno52AppWithLib/uno52emptylib/uno52emptylib.csproj
@@ -3,6 +3,11 @@
net8.0-browserwasm;net8.0-desktop;net8.0
$(TargetFrameworks);net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-desktop
$(TargetFrameworks);net8.0-windows10.0.19041
+
+
+ $(TargetFrameworks.Replace('net8.0-android',''))
+ $(TargetFrameworks.Replace('net8.0-ios',''))
+ $(TargetFrameworks.Replace('net8.0-maccatalyst',''))
true
Library
diff --git a/src/SolutionTemplate/5.2/uno52AppWithLib/uno52lib/uno52lib.csproj b/src/SolutionTemplate/5.2/uno52AppWithLib/uno52lib/uno52lib.csproj
index 0d315b599f14..3b536a6df335 100644
--- a/src/SolutionTemplate/5.2/uno52AppWithLib/uno52lib/uno52lib.csproj
+++ b/src/SolutionTemplate/5.2/uno52AppWithLib/uno52lib/uno52lib.csproj
@@ -4,6 +4,11 @@
$(TargetFrameworks);net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-desktop
$(TargetFrameworks);net8.0-windows10.0.19041
+
+ $(TargetFrameworks.Replace('net8.0-android',''))
+ $(TargetFrameworks.Replace('net8.0-ios',''))
+ $(TargetFrameworks.Replace('net8.0-maccatalyst',''))
+
true
Library
diff --git a/src/SolutionTemplate/5.2/uno52Lib/uno52Lib.csproj b/src/SolutionTemplate/5.2/uno52Lib/uno52Lib.csproj
index 5ea7eb6c99a8..ef105687423f 100644
--- a/src/SolutionTemplate/5.2/uno52Lib/uno52Lib.csproj
+++ b/src/SolutionTemplate/5.2/uno52Lib/uno52Lib.csproj
@@ -5,6 +5,11 @@
$(TargetFrameworks);net8.0-android
+
+ $(TargetFrameworks.Replace('net8.0-android',''))
+ $(TargetFrameworks.Replace('net8.0-ios',''))
+ $(TargetFrameworks.Replace('net8.0-maccatalyst',''))
+
true
enable
diff --git a/src/SolutionTemplate/5.2/uno52NuGetLib/uno52NuGetLib.csproj b/src/SolutionTemplate/5.2/uno52NuGetLib/uno52NuGetLib.csproj
index 0afe0cbcb96e..c8b3d005c86f 100644
--- a/src/SolutionTemplate/5.2/uno52NuGetLib/uno52NuGetLib.csproj
+++ b/src/SolutionTemplate/5.2/uno52NuGetLib/uno52NuGetLib.csproj
@@ -5,6 +5,11 @@
$(TargetFrameworks);net8.0-android
+
+ $(TargetFrameworks.Replace('net8.0-android',''))
+ $(TargetFrameworks.Replace('net8.0-ios',''))
+ $(TargetFrameworks.Replace('net8.0-maccatalyst',''))
+
true
enable
@@ -84,9 +89,9 @@
<_AssetsToValidate Include="$(_tempNuGetOutput)\lib\net8.0-browserwasm1.0\uno52NuGetLib\Assets\test.xml" />
<_AssetsToValidate Include="$(_tempNuGetOutput)\lib\net8.0-desktop1.0\uno52NuGetLib\Assets\test.xml" />
- <_AssetsToValidate Include="$(_tempNuGetOutput)\lib\net8.0-ios17.2\uno52NuGetLib\Assets\test.xml" Condition="!$([MSBuild]::IsOSPlatform('linux'))" />
- <_AssetsToValidate Include="$(_tempNuGetOutput)\lib\net8.0-android34.0\uno52NuGetLib\Assets\test.xml" Condition="!$([MSBuild]::IsOSPlatform('linux'))" />
- <_AssetsToValidate Include="$(_tempNuGetOutput)\lib\net8.0-maccatalyst17.2\uno52NuGetLib\Assets\test.xml" Condition="!$([MSBuild]::IsOSPlatform('linux'))" />
+ <_AssetsToValidate Include="$(_tempNuGetOutput)\lib\net8.0-ios17.5\uno52NuGetLib\Assets\test.xml" Condition="!$([MSBuild]::IsOSPlatform('linux'))" />
+ <_AssetsToValidate Include="$(_tempNuGetOutput)\lib\net8.0-android34.0\uno52NuGetLib\Assets\test.xml" Condition="!$([MSBuild]::IsOSPlatform('linux')) AND '$(MSBuildRuntimeType)' != 'Full'" />
+ <_AssetsToValidate Include="$(_tempNuGetOutput)\lib\net8.0-maccatalyst17.5\uno52NuGetLib\Assets\test.xml" Condition="!$([MSBuild]::IsOSPlatform('linux'))" />
$(TargetFrameworks);net8.0-android
+
+ $(TargetFrameworks.Replace('net8.0-android',''))
+ $(TargetFrameworks.Replace('net8.0-ios',''))
+ $(TargetFrameworks.Replace('net8.0-maccatalyst',''))
+
true
enable
diff --git a/src/SolutionTemplate/5.2/uno52blank/Directory.Build.targets b/src/SolutionTemplate/5.2/uno52blank/Directory.Build.targets
index 2af1a7b46168..511f78ed894a 100644
--- a/src/SolutionTemplate/5.2/uno52blank/Directory.Build.targets
+++ b/src/SolutionTemplate/5.2/uno52blank/Directory.Build.targets
@@ -4,4 +4,8 @@
+
+
+
+
diff --git a/src/SolutionTemplate/5.2/uno52blank/uno52blank/uno52blank.csproj b/src/SolutionTemplate/5.2/uno52blank/uno52blank/uno52blank.csproj
index 680c0b71a083..20a7d5370285 100644
--- a/src/SolutionTemplate/5.2/uno52blank/uno52blank/uno52blank.csproj
+++ b/src/SolutionTemplate/5.2/uno52blank/uno52blank/uno52blank.csproj
@@ -4,6 +4,11 @@
$(TargetFrameworks);net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-desktop
$(TargetFrameworks);net8.0-windows10.0.19041
+
+ $(TargetFrameworks.Replace('net8.0-android',''))
+ $(TargetFrameworks.Replace('net8.0-ios',''))
+ $(TargetFrameworks.Replace('net8.0-maccatalyst',''))
+
Exe
true
diff --git a/src/SolutionTemplate/Directory.Build.targets b/src/SolutionTemplate/Directory.Build.targets
index 887251a19bd7..2a95b11e6b5f 100644
--- a/src/SolutionTemplate/Directory.Build.targets
+++ b/src/SolutionTemplate/Directory.Build.targets
@@ -1,4 +1,7 @@
+
+
+
diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json
index 1e9d1d097af6..997db7c58cd4 100644
--- a/src/Uno.Sdk/packages.json
+++ b/src/Uno.Sdk/packages.json
@@ -111,7 +111,7 @@
"Microsoft.Extensions.Logging.Console"
],
"versionOverride": {
- "net9.0": "9.0.0-preview.6.24327.7"
+ "net9.0": "9.0.0-rc.1.24431.7"
}
},
{
@@ -121,7 +121,7 @@
"Microsoft.Windows.Compatibility"
],
"versionOverride": {
- "net9.0": "9.0.0-preview.6.24327.6"
+ "net9.0": "9.0.0-rc.1.24452.1"
}
},
{
@@ -233,7 +233,7 @@
"Microsoft.Maui.Graphics"
],
"versionOverride": {
- "net9.0": "9.0.0-preview.6.24327.7"
+ "net9.0": "9.0.0-rc.1.24453.9"
}
},
{
diff --git a/src/Uno.UI.RemoteControl.Host/Config/global-net9.0.json b/src/Uno.UI.RemoteControl.Host/Config/global-net9.0.json
index 435b91aa8aca..91e657e5c590 100644
--- a/src/Uno.UI.RemoteControl.Host/Config/global-net9.0.json
+++ b/src/Uno.UI.RemoteControl.Host/Config/global-net9.0.json
@@ -1,11 +1,11 @@
{
"sdk": {
- "version": "9.0.100-preview.6.24328.19",
+ "version": "9.0.100-rc.1.24452.12",
"allowPrerelease": true,
"rollForward": "latestFeature"
},
"tools": {
- "dotnet": "9.0.100-preview.6.24328.19"
+ "dotnet": "9.0.100-rc.1.24452.12"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.44"
diff --git a/src/Uno.UI.Runtime.Skia.Wpf/Builder/WpfHostBuilder.cs b/src/Uno.UI.Runtime.Skia.Wpf/Builder/WpfHostBuilder.cs
index a9aab9d41cf1..bebe87abbef9 100644
--- a/src/Uno.UI.Runtime.Skia.Wpf/Builder/WpfHostBuilder.cs
+++ b/src/Uno.UI.Runtime.Skia.Wpf/Builder/WpfHostBuilder.cs
@@ -35,6 +35,12 @@ private static void AdjustPath(string dotnetSharedDirectory, string runtimeVersi
//.NET Desktop Runtime 9.0.0-preview.4.24267.11
// This is a quite hacky to get to the right path where we don't exactly know the version beforehand.
var indexOfPreview = runtimeVersion.IndexOf("-preview", StringComparison.Ordinal);
+
+ if (indexOfPreview == -1)
+ {
+ indexOfPreview = runtimeVersion.IndexOf("-rc", StringComparison.Ordinal);
+ }
+
if (indexOfPreview > -1)
{
var mainVersion = runtimeVersion.Substring(0, indexOfPreview);
@@ -43,6 +49,12 @@ private static void AdjustPath(string dotnetSharedDirectory, string runtimeVersi
{
var possibleVersion = Path.GetFileName(directory);
var possibleIndexOfPreview = possibleVersion?.IndexOf("-preview", StringComparison.Ordinal) ?? -1;
+
+ if (possibleIndexOfPreview == -1)
+ {
+ possibleIndexOfPreview = possibleVersion?.IndexOf("-rc", StringComparison.Ordinal) ?? -1;
+ }
+
if (possibleIndexOfPreview > -1)
{
var desktopRuntimeVersion = possibleVersion!.Substring(0, possibleIndexOfPreview);
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Image.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Image.cs
index 1b1ce5e23cd9..7a7768fd42c5 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Image.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Image.cs
@@ -385,7 +385,7 @@ public async Task When_Image_Source_Nullify()
#if !WINAPPSDK
[TestMethod]
[RunsOnUIThread]
-#if IS_UNIT_TESTS || __MACOS__ || __SKIA__
+#if IS_UNIT_TESTS || __MACOS__ || __SKIA__ || __IOS__
[Ignore("Currently fails on macOS, part of #9282! epic and Monochromatic Image not supported for IS_UNIT_TESTS and SKIA")]
#endif
public async Task When_Image_Is_Monochromatic()
diff --git a/src/Workaround-43339.targets b/src/Workaround-43339.targets
new file mode 100644
index 000000000000..739e58fc4772
--- /dev/null
+++ b/src/Workaround-43339.targets
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/targetframework-override.props b/src/targetframework-override.props
index 2e11f9c2e419..ec47017dd41c 100644
--- a/src/targetframework-override.props
+++ b/src/targetframework-override.props
@@ -3,11 +3,11 @@
$(UnoTargetFrameworkOverride)
net8.0-ios17.0
- net9.0-ios17.2
+ net9.0-ios17.5
net8.0-maccatalyst17.0
- net9.0-maccatalyst17.2
+ net9.0-maccatalyst17.5
net8.0-macos14.0
- net9.0-macos14.2
+ net9.0-macos14.5