diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c98c28b..b140759 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,8 +13,8 @@ on:
- release/**
env:
- UnoCheck_Version: '1.5.4'
- UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/34b1a60f5c1c51604b47362781969dde46979fd5/manifests/uno.ui-preview.manifest.json'
+ UnoCheck_Version: '1.14.1'
+ UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json'
jobs:
build:
@@ -26,10 +26,10 @@ jobs:
with:
fetch-depth: 0
- - name: Setup .NET Core v6
+ - name: Setup .NET 7
uses: actions/setup-dotnet@v1
with:
- dotnet-version: '6.0.401'
+ dotnet-version: '7.0.403'
- name: Setup GitVersion
uses: gittools/actions/gitversion/setup@v0.9.9
@@ -86,10 +86,10 @@ jobs:
with:
fetch-depth: 0
- - name: Setup .NET Core v6
+ - name: Setup .NET 7
uses: actions/setup-dotnet@v1
with:
- dotnet-version: '6.0.100'
+ dotnet-version: '7.0.403'
- run: |
& dotnet tool update --global uno.check --version ${{ env.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
diff --git a/src/UWP/TestLibrary/TestLibrary.csproj b/src/UWP/TestLibrary/TestLibrary.csproj
index 60034c3..4dfa7ce 100644
--- a/src/UWP/TestLibrary/TestLibrary.csproj
+++ b/src/UWP/TestLibrary/TestLibrary.csproj
@@ -4,7 +4,7 @@
Please see https://github.com/unoplatform/uno/issues/3909 for more details.
-->
- uap10.0.19041;netstandard2.0;net6.0-ios;net6.0-macos;net6.0-maccatalyst;net6.0-android
+ uap10.0.19041;netstandard2.0;net7.0-ios;net7.0-macos;net7.0-maccatalyst;net7.0-android
true
@@ -56,4 +56,4 @@
TargetFramework
-
\ No newline at end of file
+
diff --git a/src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj b/src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj
index daefd5b..9eb7a6d 100644
--- a/src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj
+++ b/src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj
@@ -4,7 +4,7 @@
Please see https://github.com/unoplatform/uno/issues/3909 for more details.
-->
- uap10.0.19041;netstandard2.0;net6.0-ios;net6.0-macos;net6.0-maccatalyst;net6.0-android
+ uap10.0.19041;netstandard2.0;net7.0-ios;net7.0-macos;net7.0-maccatalyst;net7.0-android
true
@@ -63,4 +63,4 @@
-
\ No newline at end of file
+
diff --git a/src/Uno.XamlMerge.Tests/Uno.XamlMerge.Tests.csproj b/src/Uno.XamlMerge.Tests/Uno.XamlMerge.Tests.csproj
index 8767271..5dfaa88 100644
--- a/src/Uno.XamlMerge.Tests/Uno.XamlMerge.Tests.csproj
+++ b/src/Uno.XamlMerge.Tests/Uno.XamlMerge.Tests.csproj
@@ -1,7 +1,7 @@
- net6.0;net461
+ net7.0;net461
10
enable
diff --git a/src/WinUI/XamlMergeWinUITest.Mobile/XamlMergeWinUITest.Mobile.csproj b/src/WinUI/XamlMergeWinUITest.Mobile/XamlMergeWinUITest.Mobile.csproj
index 2e48e42..bf0ee56 100644
--- a/src/WinUI/XamlMergeWinUITest.Mobile/XamlMergeWinUITest.Mobile.csproj
+++ b/src/WinUI/XamlMergeWinUITest.Mobile/XamlMergeWinUITest.Mobile.csproj
@@ -1,29 +1,29 @@
- net6.0-android;net6.0-ios
+ net7.0-android;net7.0-ios
true
Exe
-
+
-
+
true
- 14.2
- 14.0
- 21.0
- 10.14
+ 14.2
+ 14.0
+ 21.0
+ 10.14
- iossimulator-x64
- maccatalyst-x64
- osx-x64
+ iossimulator-x64
+ maccatalyst-x64
+ osx-x64
@@ -33,7 +33,7 @@
-
+
@@ -42,8 +42,8 @@
-
-
+
+
$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep
$(MtouchExtraArgs) --registrar:static
@@ -54,7 +54,7 @@
-
+
$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep
@@ -69,7 +69,7 @@
-
+
@@ -91,4 +91,4 @@
-
\ No newline at end of file
+
diff --git a/src/WinUI/XamlMergeWinUITest.Skia.Gtk/XamlMergeWinUITest.Skia.Gtk.csproj b/src/WinUI/XamlMergeWinUITest.Skia.Gtk/XamlMergeWinUITest.Skia.Gtk.csproj
index 077ac7d..190dd7e 100644
--- a/src/WinUI/XamlMergeWinUITest.Skia.Gtk/XamlMergeWinUITest.Skia.Gtk.csproj
+++ b/src/WinUI/XamlMergeWinUITest.Skia.Gtk/XamlMergeWinUITest.Skia.Gtk.csproj
@@ -2,7 +2,7 @@
WinExe
Exe
- net6.0
+ net7.0
@@ -34,4 +34,4 @@
-
\ No newline at end of file
+
diff --git a/src/WinUI/XamlMergeWinUITest.Wasm/XamlMergeWinUITest.Wasm.csproj b/src/WinUI/XamlMergeWinUITest.Wasm/XamlMergeWinUITest.Wasm.csproj
index 7526b9e..0407a62 100644
--- a/src/WinUI/XamlMergeWinUITest.Wasm/XamlMergeWinUITest.Wasm.csproj
+++ b/src/WinUI/XamlMergeWinUITest.Wasm/XamlMergeWinUITest.Wasm.csproj
@@ -1,7 +1,7 @@
Exe
- net6.0
+ net7.0
NU1701
@@ -62,4 +62,4 @@
-
\ No newline at end of file
+
diff --git a/src/WinUI/XamlMergeWinUITest.Windows/XamlMergeWinUITest.Windows.csproj b/src/WinUI/XamlMergeWinUITest.Windows/XamlMergeWinUITest.Windows.csproj
index 3d0b6f7..3e136f2 100644
--- a/src/WinUI/XamlMergeWinUITest.Windows/XamlMergeWinUITest.Windows.csproj
+++ b/src/WinUI/XamlMergeWinUITest.Windows/XamlMergeWinUITest.Windows.csproj
@@ -1,7 +1,7 @@
WinExe
- net6.0-windows10.0.19041.0
+ 7.0-windows10.0.19041.0
10.0.18362.0
XamlMergeWinUITest
app.manifest