Skip to content

chore: Adjust net10 major #370

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

Merged
jeromelaban merged 5 commits into from
Apr 14, 2025
Merged

chore: Adjust net10 major #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8e4992
chore: Adjust net major
jeromelaban Apr 14, 2025
f1996e6
chore: Adjust for next major
jeromelaban Apr 14, 2025
14b4f3e
chore: comments
jeromelaban Apr 14, 2025
b0dfc8c
chore: Adjust maui version
jeromelaban Apr 14, 2025
473d3bf
chore: Bump default manifest
jeromelaban Apr 14, 2025
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
82 changes: 56 additions & 26 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
manifest_name: Preview
tool_params: '--target webassembly --target ios --target android --target macos --target linux --target win32'
- manifest: 'manifests\uno.ui-preview-major.manifest.json'
manifest_name: Preview net9
manifest_name: Preview Major
tool_params: '--target webassembly --target ios --target android --target macos --target linux --target win32'
- manifest: 'manifests\uno.ui.manifest.json'
manifest_name: Stable Upgrade
Expand All @@ -98,35 +98,49 @@ jobs:
previous_tool_params: '--pre'
tool_params: '--target webassembly --target ios --target android --target macos --target linux --target win32'
- manifest: 'manifests\uno.ui-preview-major.manifest.json'
manifest_name: Preview Upgrade net8
manifest_name: Preview Upgrade Major
previous_tool_version: 1.4.2
previous_tool_params: '--pre'
tool_params: '--target webassembly --target ios --target android --target macos --target linux --target win32'
- manifest: 'manifests\uno.ui.manifest.json'
manifest_name: Test default Uno template TFM's
tool_params: '--tfm net8.0-android --tfm net8.0-ios --tfm net8.0-maccatalyst --tfm net8.0-windows10.0.19041 --tfm net8.0-browserwasm --tfm net8.0-desktop'
manifest_name: Test default Uno template TFMs
tool_params: '--tfm net9.0-android --tfm net9.0-ios --tfm net9.0-maccatalyst --tfm net9.0-windows10.0.19041 --tfm net9.0-browserwasm --tfm net9.0-desktop'
- manifest: 'manifests\uno.ui.manifest.json'
manifest_name: Test net8.0-android\ios TFM's
tool_params: '--tfm net8.0-android --tfm net8.0-ios'
manifest_name: Test net9.0-android\ios TFMs
tool_params: '--tfm net9.0-android --tfm net9.0-ios'
- manifest: 'manifests\uno.ui.manifest.json'
manifest_name: Test net8.0-browserwasm TFM
tool_params: '--tfm net8.0-browserwasm'
manifest_name: Test net9.0-browserwasm TFM
tool_params: '--tfm net9.0-browserwasm'
- manifest: 'manifests\uno.ui.manifest.json'
manifest_name: Test unoSdkVersion
tool_params: '--unoSdkVersion 5.6.19'
- manifest: 'manifests\uno.ui-preview-major.manifest.json'
manifest_name: Test default Uno template TFM's with net9

- manifest: 'manifests\uno.ui-preview.manifest.json'
manifest_name: Test default Uno template TFMs with net9
tool_params: '--tfm net9.0-android --tfm net9.0-ios --tfm net9.0-maccatalyst --tfm net9.0-windows10.0.19041 --tfm net9.0-browserwasm --tfm net9.0-desktop'
- manifest: 'manifests\uno.ui-preview-major.manifest.json'
manifest_name: Test net9.0-android\ios TFM's
- manifest: 'manifests\uno.ui-preview.manifest.json'
manifest_name: Test net9.0-android\ios TFMs
tool_params: '--tfm net9.0-android --tfm net9.0-ios'
- manifest: 'manifests\uno.ui-preview-major.manifest.json'
- manifest: 'manifests\uno.ui-preview.manifest.json'
manifest_name: Test net9.0-browserwasm TFM
tool_params: '--tfm net9.0-browserwasm'
- manifest: 'manifests\uno.ui-preview-major.manifest.json'
- manifest: 'manifests\uno.ui-preview.manifest.json'
manifest_name: Test net9.0-tvos TFM
tool_params: '--tfm net9.0-tvos'

- manifest: 'manifests\uno.ui-preview-major.manifest.json'
manifest_name: Test default Uno template TFMs with net10
tool_params: '--tfm net10.0-android --tfm net10.0-ios --tfm net10.0-maccatalyst --tfm net10.0-windows10.0.19041 --tfm net10.0-browserwasm --tfm net10.0-desktop'
- manifest: 'manifests\uno.ui-preview-major.manifest.json'
manifest_name: Test net10.0-android\ios TFMs
tool_params: '--tfm net10.0-android --tfm net10.0-ios'
- manifest: 'manifests\uno.ui-preview-major.manifest.json'
manifest_name: Test net10.0-browserwasm TFM
tool_params: '--tfm net10.0-browserwasm'
- manifest: 'manifests\uno.ui-preview-major.manifest.json'
manifest_name: Test net10.0-tvos TFM
tool_params: '--tfm net10.0-tvos'

env:
DOTNET_INSTALL_DIR: '${{ github.workspace }}\.dotnet'

Expand Down Expand Up @@ -207,13 +221,13 @@ jobs:
dotnet_version: 8.0.300

- manifest: 'manifests/uno.ui.manifest.json'
manifest_name: Test default Uno template TFM's
manifest_name: Test default Uno template TFMs
os: macos-14
dotnet_version: 8.0.300
tool_params: '--tfm net8.0-android --tfm net8.0-ios --tfm net8.0-maccatalyst --tfm net8.0-windows10.0.19041 --tfm net8.0-browserwasm --tfm net8.0-desktop'

- manifest: 'manifests/uno.ui.manifest.json'
manifest_name: Test net8.0-android\ios TFM's
manifest_name: Test net8.0-android\ios TFMs
os: macos-14
dotnet_version: 8.0.300
tool_params: '--tfm net8.0-android --tfm net8.0-ios'
Expand Down Expand Up @@ -293,7 +307,7 @@ jobs:
- manifest: 'manifests/uno.ui-preview.manifest.json'
manifest_name: Preview
- manifest: 'manifests/uno.ui-preview-major.manifest.json'
manifest_name: Preview net9
manifest_name: Preview Major
- manifest: 'manifests/uno.ui.manifest.json'
manifest_name: Stable Upgrade
previous_tool_version: 1.4.2
Expand All @@ -303,31 +317,47 @@ jobs:
previous_tool_version: 1.4.2
previous_tool_params: '--pre'
- manifest: 'manifests/uno.ui-preview-major.manifest.json'
manifest_name: Preview Upgrade net8
manifest_name: Preview Upgrade Major
previous_tool_version: 1.4.2
previous_tool_params: '--pre'

- manifest: 'manifests/uno.ui.manifest.json'
manifest_name: Test default Uno template TFM's
manifest_name: Test default Uno template TFMs
tool_params: '--tfm net8.0-android --tfm net8.0-ios --tfm net8.0-maccatalyst --tfm net8.0-windows10.0.19041 --tfm net8.0-browserwasm --tfm net8.0-desktop'
- manifest: 'manifests/uno.ui.manifest.json'
manifest_name: Test net8.0-android\ios TFM's
manifest_name: Test net8.0-android\ios TFMs
tool_params: '--tfm net8.0-android --tfm net8.0-ios'
- manifest: 'manifests/uno.ui.manifest.json'
manifest_name: Test net8.0-browserwasm TFM
tool_params: '--tfm net8.0-browserwasm'
- manifest: 'manifests/uno.ui-preview-major.manifest.json'
manifest_name: Test default Uno template TFM's with net9

- manifest: 'manifests/uno.ui.manifest.json'
manifest_name: Test default Uno template TFMs with net9
tool_params: '--tfm net9.0-android --tfm net9.0-ios --tfm net9.0-maccatalyst --tfm net9.0-windows10.0.19041 --tfm net9.0-browserwasm --tfm net9.0-desktop'
- manifest: 'manifests/uno.ui-preview-major.manifest.json'
manifest_name: Test net9.0-android\ios TFM's
- manifest: 'manifests/uno.ui.manifest.json'
manifest_name: Test net9.0-android\ios TFMs
tool_params: '--tfm net9.0-android --tfm net9.0-ios'
- manifest: 'manifests/uno.ui-preview-major.manifest.json'
- manifest: 'manifests/uno.ui.manifest.json'
manifest_name: Test net9.0-browserwasm TFM
tool_params: '--tfm net9.0-browserwasm'
- manifest: 'manifests/uno.ui-preview-major.manifest.json'
- manifest: 'manifests/uno.ui.manifest.json'
manifest_name: Test net9.0-tvos TFM
tool_params: '--tfm net9.0-tvos'

# preview major
- manifest: 'manifests/uno.ui-preview-major.manifest.json'
manifest_name: Test default Uno template TFMs with net10
tool_params: '--tfm net10.0-android --tfm net10.0-ios --tfm net10.0-maccatalyst --tfm net10.0-windows10.0.19041 --tfm net10.0-browserwasm --tfm net10.0-desktop'
- manifest: 'manifests/uno.ui-preview-major.manifest.json'
manifest_name: Test net10.0-android\ios TFMs
tool_params: '--tfm net10.0-android --tfm net10.0-ios'
- manifest: 'manifests/uno.ui-preview-major.manifest.json'
manifest_name: Test net10.0-browserwasm TFM
tool_params: '--tfm net10.0-browserwasm'
- manifest: 'manifests/uno.ui-preview-major.manifest.json'
manifest_name: Test net10.0-tvos TFM
tool_params: '--tfm net10.0-tvos'

steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions UnoCheck/Manifest/Manifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ namespace DotNetCheck.Manifest
{
public partial class Manifest
{
public const string DefaultManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/e02af3e5fb82b180725ff20bf51598406d859b85/manifests/uno.ui.manifest.json";
public const string PreviewManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/e02af3e5fb82b180725ff20bf51598406d859b85/manifests/uno.ui-preview.manifest.json";
public const string PreviewMajorManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/e02af3e5fb82b180725ff20bf51598406d859b85/manifests/uno.ui-preview-major.manifest.json";
public const string DefaultManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/b0dfc8cabb3741a315920f02aefb3c640b153d22/manifests/uno.ui.manifest.json";
public const string PreviewManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/b0dfc8cabb3741a315920f02aefb3c640b153d22/manifests/uno.ui-preview.manifest.json";
public const string PreviewMajorManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/b0dfc8cabb3741a315920f02aefb3c640b153d22/manifests/uno.ui-preview-major.manifest.json";

public static Task<Manifest> FromFileOrUrl(string fileOrUrl)
{
Expand Down
28 changes: 14 additions & 14 deletions manifests/uno.ui-preview-major.manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"toolVersion": "1.14.0",
"variables": {
"OPENJDK_VERSION": "11.0.20.1",
"DOTNET_SDK_VERSION": "9.0.203",
"MACCATALYST_SDK_VERSION": "18.4.9288/9.0.100",
"IOS_SDK_VERSION": "18.4.9288/9.0.100",
"TVOS_SDK_VERSION": "18.4.9288/9.0.100",
"ANDROID_SDK_VERSION": "35.0.61/9.0.100",
"MAUI_VERSION": "9.0.20/9.0.100",
"WASMTOOLS_VERSION": "9.0.4/9.0.100"
"DOTNET_SDK_VERSION": "10.0.100-preview.3.25201.16",
"MACCATALYST_SDK_VERSION": "18.2.10695-net10-p3/10.0.100-preview.3",
"IOS_SDK_VERSION": "18.2.10695-net10-p3/10.0.100-preview.3",
"TVOS_SDK_VERSION": "18.2.10695-net10-p3/10.0.100-preview.3",
"ANDROID_SDK_VERSION": "36.0.0-preview.3.22/10.0.100-preview.3",
"MAUI_VERSION": "10.0.0-preview.3.25208.1/10.0.100-preview.3",
"WASMTOOLS_VERSION": "10.0.0-preview.3.25171.5/10.0.100-preview.3"
},
"variableMappers": [
],
Expand Down Expand Up @@ -100,49 +100,49 @@
{
"workloadId": "android",
"workloadManifestId": "microsoft.net.sdk.android",
"packageId": "Microsoft.NET.Sdk.Android.Manifest-9.0.100",
"packageId": "Microsoft.NET.Sdk.Android.Manifest-10.0.100-preview.3",
"version": "$(ANDROID_SDK_VERSION)",
"supportedPlatforms": [ "Windows", "OSX", "Linux/x64" ]
},
{
"workloadId": "ios",
"workloadManifestId": "microsoft.net.sdk.ios",
"packageId": "Microsoft.NET.Sdk.iOS.Manifest-9.0.100",
"packageId": "Microsoft.NET.Sdk.iOS.Manifest-10.0.100-preview.3",
"version": "$(IOS_SDK_VERSION)",
"supportedPlatforms": [ "Windows", "OSX" ]
},
{
"workloadId": "maccatalyst",
"workloadManifestId": "microsoft.net.sdk.maccatalyst",
"packageId": "Microsoft.NET.Sdk.MacCatalyst.Manifest-9.0.100",
"packageId": "Microsoft.NET.Sdk.MacCatalyst.Manifest-10.0.100-preview.3",
"version": "$(MACCATALYST_SDK_VERSION)",
"supportedPlatforms": [ "Windows", "OSX" ]
},
{
"workloadId": "tvos",
"workloadManifestId": "microsoft.net.sdk.tvos",
"packageId": "Microsoft.NET.Sdk.tvos.Manifest-9.0.100",
"packageId": "Microsoft.NET.Sdk.tvos.Manifest-10.0.100-preview.3",
"version": "$(TVOS_SDK_VERSION)",
"supportedPlatforms": [ "Windows", "OSX" ]
},
{
"workloadId": "maui",
"workloadManifestId": "microsoft.net.sdk.maui",
"packageId": "Microsoft.NET.Sdk.Maui.Manifest-9.0.100",
"packageId": "Microsoft.NET.Sdk.Maui.Manifest-10.0.100-preview.3",
"version": "$(MAUI_VERSION)",
"supportedPlatforms": [ "Windows", "OSX" ]
},
{
"workloadId": "maui-android",
"workloadManifestId": "microsoft.net.sdk.maui",
"packageId": "Microsoft.NET.Sdk.Maui.Manifest-9.0.100",
"packageId": "Microsoft.NET.Sdk.Maui.Manifest-10.0.100-preview.3",
"version": "$(MAUI_VERSION)",
"supportedPlatforms": [ "Linux/x64" ]
},
{
"workloadId": "wasm-tools",
"workloadManifestId": "microsoft.net.workload.mono.toolchain.current",
"packageId": "Microsoft.NET.Workload.Mono.ToolChain.Manifest-9.0.100",
"packageId": "Microsoft.NET.Workload.Mono.ToolChain.Manifest-10.0.100-preview.3",
"version": "$(WASMTOOLS_VERSION)",
"supportedPlatforms": [ "Windows", "OSX", "Linux/x64", "Linux/arm64" ]
}
Expand Down
Loading