diff --git a/.github/actions/ci/generate-test-matrix/action.yml b/.github/actions/ci/generate-test-matrix/action.yml index 9bbad1583..3fca84637 100644 --- a/.github/actions/ci/generate-test-matrix/action.yml +++ b/.github/actions/ci/generate-test-matrix/action.yml @@ -117,25 +117,23 @@ runs: $currentGroup = @() $groupSize = 8 - # disabled until we get net10 support - # # Generate matrix for net10 - # for ($i = 0; $i -lt $tests.Count; $i++) - # { - # $currentGroup += $tests[$i] + " -tfm net10.0"; - # - # if ( ($currentGroup.Count -eq $groupSize) -or ($i -eq ($tests.Count - 1))) { - # $newGroup = @{ - # 'groupName' = "Group$($matrixGroups.Count)_net10" - # 'unocheckArguments' = '--pre-major' - # 'validations' = ($currentGroup -join "`r`n") - # }; - # - # $matrixGroups += $newGroup; - # - # $currentGroup = @() - # } - # } + for ($i = 0; $i -lt $tests.Count; $i++) + { + $currentGroup += $tests[$i] + " -tfm net10.0"; + + if ( ($currentGroup.Count -eq $groupSize) -or ($i -eq ($tests.Count - 1))) { + $newGroup = @{ + 'groupName' = "Group$($matrixGroups.Count)_net10" + 'unocheckArguments' = '--pre-major' + 'validations' = ($currentGroup -join "`r`n") + }; + + $matrixGroups += $newGroup; + + $currentGroup = @() + } + } # generate matrix for net9 for ($i = 0; $i -lt $tests.Count; $i++) diff --git a/.github/actions/ci/run-tests/action.yml b/.github/actions/ci/run-tests/action.yml index 81a6e4460..f67518dd4 100644 --- a/.github/actions/ci/run-tests/action.yml +++ b/.github/actions/ci/run-tests/action.yml @@ -68,14 +68,20 @@ runs: $templateArgs = '${{ inputs.arguments }}' echo "TemplateArgs = '$templateArgs'" $dotnetVersion = $env:TargetDotNetVersion - $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet8 + $ValidationUnoCheckVersion = "invalid" if ($templateArgs -match 'net9.0') { - $dotnetVersion = '9.0.300' + $dotnetVersion = '9.0.304' $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet9 } + if ($templateArgs -match 'net10.0') + { + $dotnetVersion = '10.0.100-preview.7.25380.108' + $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet10 + } + echo "Dotnet Version = '$dotnetVersion'" echo "UnoCheck Version = '$ValidationUnoCheckVersion'" @@ -83,7 +89,7 @@ runs: echo "ValidationUnoCheckVersion=$ValidationUnoCheckVersion" >> $env:GITHUB_ENV env: TargetDotNetVersion: ${{ env.ValidationDotNetVersion }} - ValidationUnoCheckVersionNet8: ${{ env.ValidationUnoCheckVersionNet8 }} + ValidationUnoCheckVersionNet10: ${{ env.ValidationUnoCheckVersionNet10 }} ValidationUnoCheckVersionNet9: ${{ env.ValidationUnoCheckVersionNet9 }} - name: Cache EMSDK @@ -137,7 +143,7 @@ runs: sudo rm -fR /usr/lib/jvm sudo apt-get install apt-transport-https sudo apt-get update - sudo apt-get install -y msopenjdk-11 + sudo apt-get install -y msopenjdk-17 - name: 'Uno Check (Linux)' if: runner.os == 'linux' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8439c2aa..a093fb63a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,9 +22,9 @@ concurrency: env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true IsCanaryBranch: ${{ startsWith(github.ref, 'refs/heads/canaries/') }} - ValidationUnoCheckVersionNet8: '1.26.4' - ValidationUnoCheckVersionNet9: '1.32.0-dev.14' - ValidationDotNetVersion: '8.0.407' + ValidationUnoCheckVersionNet9: '1.32.0-dev.52' + ValidationUnoCheckVersionNet10: '1.32.0-dev.52' + ValidationDotNetVersion: '9.0.304' # https://github.com/unoplatform/Uno.Wasm.Bootstrap/pull/887 remove when upgarding to .NET 9 # compatible version of the bootstrapper @@ -175,7 +175,7 @@ jobs: - name: "Run Tests" uses: ./.github/actions/ci/run-tests with: - xCodeRoot: '/Applications/Xcode_16.3.app' + xCodeRoot: '/Applications/Xcode_16.4.app' arguments: ${{ matrix.validations }} unocheckArguments: ${{ matrix.unocheckArguments }} logs-artifact-name: ${{ matrix.groupName }} @@ -205,7 +205,7 @@ jobs: - name: "Run Tests" uses: ./.github/actions/ci/run-tests with: - xCodeRoot: '/Applications/Xcode_16.3.app' + xCodeRoot: '/Applications/Xcode_16.4.app' arguments: ${{ matrix.validations }} unocheckArguments: ${{ matrix.unocheckArguments }} logs-artifact-name: ${{ matrix.groupName }} @@ -235,7 +235,7 @@ jobs: - name: "Run Tests" uses: ./.github/actions/ci/run-tests with: - xCodeRoot: '/Applications/Xcode_16.3.app' + xCodeRoot: '/Applications/Xcode_16.4.app' arguments: ${{ matrix.validations }} unocheckArguments: ${{ matrix.unocheckArguments }} logs-artifact-name: ${{ matrix.groupName }} diff --git a/src/Uno.Sdk.Updater.targets b/src/Uno.Sdk.Updater.targets index 9e537638c..7bc4bad1f 100644 --- a/src/Uno.Sdk.Updater.targets +++ b/src/Uno.Sdk.Updater.targets @@ -2,8 +2,8 @@ 6.3.0-dev.144 - 8.0.23 9.0.20 + 10.0.0-dev.24 1.7.0 4.1.1 1.4.0 diff --git a/src/Uno.Sdk/ReadMe.md b/src/Uno.Sdk/ReadMe.md index 98aebfdfe..562c5be2c 100644 --- a/src/Uno.Sdk/ReadMe.md +++ b/src/Uno.Sdk/ReadMe.md @@ -75,14 +75,14 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp }, { "group": "WasmBootstrap", - "version": "8.0.23", + "version": "9.0.20", "packages": [ "Uno.Wasm.Bootstrap", "Uno.Wasm.Bootstrap.DevServer", "Uno.Wasm.Bootstrap.Server" ], "versionOverride": { - "net9.0": "9.0.20" + "net10.0": "10.0.0-dev.24" } }, { @@ -178,22 +178,22 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp }, { "group": "MicrosoftLoggingConsole", - "version": "8.0.1", + "version": "9.0.8", "packages": [ "Microsoft.Extensions.Logging.Console" ], "versionOverride": { - "net9.0": "9.0.8" + "net10.0": "9.0.8" } }, { "group": "WindowsCompatibility", - "version": "8.0.19", + "version": "9.0.4", "packages": [ "Microsoft.Windows.Compatibility" ], "versionOverride": { - "net9.0": "9.0.8" + "net10.0": "9.0.4" } }, { @@ -305,14 +305,14 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp }, { "group": "Maui", - "version": "8.0.100", + "version": "9.0.60", "packages": [ "Microsoft.Maui.Controls", "Microsoft.Maui.Controls.Compatibility", "Microsoft.Maui.Graphics" ], "versionOverride": { - "net9.0": "9.0.100" + "net10.0": "9.0.60" } }, { diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json index 41d840483..cb1850171 100644 --- a/src/Uno.Sdk/packages.json +++ b/src/Uno.Sdk/packages.json @@ -33,14 +33,14 @@ }, { "group": "WasmBootstrap", - "version": "8.0.23", + "version": "9.0.20", "packages": [ "Uno.Wasm.Bootstrap", "Uno.Wasm.Bootstrap.DevServer", "Uno.Wasm.Bootstrap.Server" ], "versionOverride": { - "net9.0": "9.0.20" + "net10.0": "10.0.0-dev.24" } }, { @@ -136,22 +136,22 @@ }, { "group": "MicrosoftLoggingConsole", - "version": "8.0.1", + "version": "9.0.8", "packages": [ "Microsoft.Extensions.Logging.Console" ], "versionOverride": { - "net9.0": "9.0.8" + "net10.0": "10.0.0-preview.7.25380.108" } }, { "group": "WindowsCompatibility", - "version": "8.0.19", + "version": "9.0.8", "packages": [ "Microsoft.Windows.Compatibility" ], "versionOverride": { - "net9.0": "9.0.8" + "net10.0": "10.0.0-preview.7.25380.108" } }, { @@ -189,63 +189,87 @@ }, { "group": "AndroidMaterial", - "version": "1.12.0.2", + "version": "1.12.0.4", "packages": [ "Xamarin.Google.Android.Material" - ] + ], + "versionOverride": { + "net10.0": "1.12.0.4" + } }, { "group": "AndroidXLegacySupportV4", "version": "1.0.0.23", "packages": [ "Xamarin.AndroidX.Legacy.Support.V4" - ] + ], + "versionOverride": { + "net10.0": "1.0.0.33" + } }, { "group": "AndroidXSplashScreen", "version": "1.0.1.14", "packages": [ "Xamarin.AndroidX.Core.SplashScreen" - ] + ], + "versionOverride": { + "net10.0": "1.0.1.14" + } }, { "group": "AndroidXAppCompat", - "version": "1.7.0.5", + "version": "1.7.0.7", "packages": [ "Xamarin.AndroidX.AppCompat" - ] + ], + "versionOverride": { + "net10.0": "1.7.0.7" + } }, { "group": "AndroidXRecyclerView", - "version": "1.3.2.10", + "version": "1.4.0.2", "packages": [ "Xamarin.AndroidX.RecyclerView" - ] + ], + "versionOverride": { + "net10.0": "1.4.0.2" + } }, { "group": "AndroidXActivity", - "version": "1.9.3.2", + "version": "1.10.1.2", "packages": [ "Xamarin.AndroidX.Activity" - ] + ], + "versionOverride": { + "net10.0": "1.10.1.2" + } }, { "group": "AndroidXBrowser", - "version": "1.8.0.8", + "version": "1.8.0.10", "packages": [ "Xamarin.AndroidX.Browser" - ] + ], + "versionOverride": { + "net10.0": "1.8.0.10" + } }, { "group": "AndroidXSwipeRefreshLayout", - "version": "1.1.0.24", + "version": "1.1.0.28", "packages": [ "Xamarin.AndroidX.SwipeRefreshLayout" - ] + ], + "versionOverride": { + "net10.0": "1.1.0.28" + } }, { "group": "AndroidXNavigation", - "version": "2.8.5.1", + "version": "2.8.9.2", "packages": [ "Xamarin.AndroidX.Navigation.UI", "Xamarin.AndroidX.Navigation.Fragment", @@ -255,22 +279,25 @@ }, { "group": "AndroidXCollection", - "version": "1.4.5.2", + "version": "1.5.0.2", "packages": [ "Xamarin.AndroidX.Collection", "Xamarin.AndroidX.Collection.Ktx" - ] + ], + "versionOverride": { + "net10.0": "1.5.0.2" + } }, { "group": "Maui", - "version": "8.0.100", + "version": "9.0.100", "packages": [ "Microsoft.Maui.Controls", "Microsoft.Maui.Controls.Compatibility", "Microsoft.Maui.Graphics" ], "versionOverride": { - "net9.0": "9.0.100" + "net10.0": "10.0.0-preview.7.25406.3" } }, { diff --git a/src/Uno.Templates/Uno.Templates.csproj b/src/Uno.Templates/Uno.Templates.csproj index c2b3010b5..d8e7db7eb 100644 --- a/src/Uno.Templates/Uno.Templates.csproj +++ b/src/Uno.Templates/Uno.Templates.csproj @@ -35,7 +35,7 @@ - + diff --git a/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json b/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json index ac5f08d77..3c5bcc0f6 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json +++ b/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json @@ -669,6 +669,10 @@ "Sequence": 2, "Icon": "/Assets/Framework.NET9.svg" }, + "tfm.net10.0": { + "Sequence": 2, + "Icon": "/Assets/Framework.NET10.svg" + }, "toolkit": { "Icon": "/Assets/Features.Toolkit.svg" }, @@ -829,7 +833,7 @@ "PackageId": "Uno.Wasm.Bootstrap", "Symbol": "unoWasmBootstrapVersion", "UsePrerelease": { - "tfm": [ "net9.0" ] + "tfm": [ "net10.0" ] } }, { diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json index 9747ea2ed..7a8c5e4cf 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/template.json +++ b/src/Uno.Templates/content/unoapp/.template.config/template.json @@ -178,6 +178,11 @@ "choice": "net9.0", "displayName": ".NET 9.0", "description": "Target .NET 9.0 (Standard Term Support)" + }, + { + "choice": "net10.0", + "displayName": ".NET 10.0", + "description": "Target .NET 10.0 (Preview)" } ] }, @@ -318,6 +323,10 @@ { "condition": "(tfm == 'net9.0')", "value": "false" + }, + { + "condition": "(tfm == 'net10.0')", + "value": "true" } ] } @@ -331,9 +340,12 @@ "datatype": "string", "cases": [ { - // This could become 35 when net9.0 launches "condition": "(tfm == 'net9.0')", "value": "Component.Android.SDK34" + }, + { + "condition": "(tfm == 'net10.0')", + "value": "Component.Android.SDK35" } ] } @@ -812,6 +824,10 @@ { "condition": "(tfm == 'net9.0')", "value": "DefaultUnoWasmBootstrapVersionNet9" + }, + { + "condition": "(tfm == 'net10.0')", + "value": "DefaultUnoWasmBootstrapVersionNet10" } ] } @@ -1409,6 +1425,10 @@ { "condition": "(tfm == 'net9.0')", "value": "9.0.x" + }, + { + "condition": "(tfm == 'net10.0')", + "value": "10.0.x" } ] } @@ -1676,6 +1696,262 @@ { "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == false)", "value": "" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-windows10.0.26100" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-windows10.0.26100" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-ios" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-windows10.0.26100;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-windows10.0.26100;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-windows10.0.26100;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-windows10.0.26100;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-windows10.0.26100;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-windows10.0.26100" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "" } ] } @@ -1962,6 +2238,10 @@ { "condition": "(tfm == 'net9.0')", "value": "9.0.0" + }, + { + "condition": "(tfm == 'net10.0')", + "value": "10.0.0-preview.7.25380.108" } ] } @@ -1977,6 +2257,10 @@ { "condition": "(tfm == 'net9.0')", "value": "9.0.0" + }, + { + "condition": "(tfm == 'net10.0')", + "value": "10.0.0-preview.7.25380.108" } ] } diff --git a/src/Uno.Templates/content/unolib-uitest/.template.config/template.json b/src/Uno.Templates/content/unolib-uitest/.template.config/template.json index 72c693a53..0cc18bc6d 100644 --- a/src/Uno.Templates/content/unolib-uitest/.template.config/template.json +++ b/src/Uno.Templates/content/unolib-uitest/.template.config/template.json @@ -47,6 +47,11 @@ "choice": "net9.0", "displayName": ".NET 9.0", "description": "Target .NET 9.0 (Standard Term Support)" + }, + { + "choice": "net10.0", + "displayName": ".NET 10.0", + "description": "Target .NET 10.0 (Preview)" } ] } diff --git a/src/Uno.Templates/content/unolib/.template.config/template.json b/src/Uno.Templates/content/unolib/.template.config/template.json index cefb2a576..6e93170fe 100644 --- a/src/Uno.Templates/content/unolib/.template.config/template.json +++ b/src/Uno.Templates/content/unolib/.template.config/template.json @@ -47,6 +47,11 @@ "choice": "net9.0", "displayName": ".NET 9.0", "description": "Target .NET 9.0 (Standard Term Support)" + }, + { + "choice": "net10.0", + "displayName": ".NET 10.0", + "description": "Target .NET 10.0 (Preview)" } ] }, diff --git a/src/Uno.Templates/content/unomauilib/.template.config/template.json b/src/Uno.Templates/content/unomauilib/.template.config/template.json index 6d87c4938..6912802eb 100644 --- a/src/Uno.Templates/content/unomauilib/.template.config/template.json +++ b/src/Uno.Templates/content/unomauilib/.template.config/template.json @@ -37,6 +37,11 @@ "choice": "net9.0", "displayName": ".NET 9.0", "description": "Target .NET 9.0 (Standard Term Support)" + }, + { + "choice": "net10.0", + "displayName": ".NET 10.0", + "description": "Target .NET 10.0 (Preview)" } ] }, diff --git a/tools/TemplateTfmSwitchGenerator/Program.cs b/tools/TemplateTfmSwitchGenerator/Program.cs index b0a639645..b421f0b6a 100644 --- a/tools/TemplateTfmSwitchGenerator/Program.cs +++ b/tools/TemplateTfmSwitchGenerator/Program.cs @@ -14,7 +14,7 @@ new Platform("useUnitTests == true", "useUnitTests == false", null) ]; -string[] runtimes = ["net9.0"]; +string[] runtimes = ["net9.0", "net10.0"]; var cases = new List(); foreach (var runtime in runtimes) diff --git a/tools/Uno.Sdk.Updater/Program.cs b/tools/Uno.Sdk.Updater/Program.cs index bc084bd4d..506b0067a 100644 --- a/tools/Uno.Sdk.Updater/Program.cs +++ b/tools/Uno.Sdk.Updater/Program.cs @@ -223,8 +223,8 @@ static void CreateUpdaterTargets(IEnumerable manifest, ref bool d var props = new Dictionary { { "UnoVersion", GetManifestGroupVersion(manifest, "Core") }, - { "UnoWasmBootstrapVersionNet8", GetManifestGroupVersion(manifest, "WasmBootstrap") }, - { "UnoWasmBootstrapVersionNet9", GetManifestGroupVersionOverride(manifest, "WasmBootstrap", "net9.0") }, + { "UnoWasmBootstrapVersionNet9", GetManifestGroupVersion(manifest, "WasmBootstrap") }, + { "UnoWasmBootstrapVersionNet10", GetManifestGroupVersionOverride(manifest, "WasmBootstrap", "net10.0") }, { "UnoExtensionsLoggingVersion", GetManifestGroupVersion(manifest, "OSLogging") }, { "UnoCoreLoggingVersion", GetManifestGroupVersion(manifest, "CoreLogging") }, { "UnoDspTasksVersion", GetManifestGroupVersion(manifest, "Dsp") },