From 0ade18376f9d7b3e2068717dda09aae37ccc5e1f Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Tue, 31 Oct 2023 17:08:41 -0600 Subject: [PATCH 1/4] chore: convert to spaces --- .../HelloWorld.Mobile.csproj | 134 +++++++++--------- .../HelloWorld.Skia.Gtk.csproj | 52 +++---- .../HelloWorld.Skia.Linux.FrameBuffer.csproj | 52 +++---- .../HelloWorld.Skia.WPF.csproj | 76 +++++----- .../HelloWorld.Wasm/HelloWorld.Wasm.csproj | 122 ++++++++-------- .../HelloWorld.Windows.csproj | 102 ++++++------- 6 files changed, 269 insertions(+), 269 deletions(-) diff --git a/e2e/Uno/HelloWorld.Mobile/HelloWorld.Mobile.csproj b/e2e/Uno/HelloWorld.Mobile/HelloWorld.Mobile.csproj index 1b7a14f2fc..20572744c2 100644 --- a/e2e/Uno/HelloWorld.Mobile/HelloWorld.Mobile.csproj +++ b/e2e/Uno/HelloWorld.Mobile/HelloWorld.Mobile.csproj @@ -1,71 +1,71 @@ - - net7.0-ios;net7.0-android;net7.0-maccatalyst - true - Exe - - HelloWorld - - com.prismlibrary.unoe2e - 99E7FC0B-E6B5-4000-B84D-21FBA59E0E45 - - 1.0 - 1 + + net7.0-ios;net7.0-android;net7.0-maccatalyst + true + Exe + + HelloWorld + + com.prismlibrary.unoe2e + 99E7FC0B-E6B5-4000-B84D-21FBA59E0E45 + + 1.0 + 1 - - - - True - true - + + + + True + true + - - - - - - - - - - - - - - - - - - - - - - - - - - $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep - - $(MtouchExtraArgs) --registrar:static - - $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable - - - - - - $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep - - $(MtouchExtraArgs) --registrar:static - - $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable - - false - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep + + $(MtouchExtraArgs) --registrar:static + + $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable + + + + + + $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep + + $(MtouchExtraArgs) --registrar:static + + $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable + + false + + + + + + + diff --git a/e2e/Uno/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj b/e2e/Uno/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj index 5c4d30078e..c6eedbd9f5 100644 --- a/e2e/Uno/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj +++ b/e2e/Uno/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj @@ -1,29 +1,29 @@ - - WinExe - Exe - net7.0 - - - - + + WinExe + Exe + net7.0 + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/e2e/Uno/HelloWorld.Skia.Linux.FrameBuffer/HelloWorld.Skia.Linux.FrameBuffer.csproj b/e2e/Uno/HelloWorld.Skia.Linux.FrameBuffer/HelloWorld.Skia.Linux.FrameBuffer.csproj index d8efd94043..d3f67783ec 100644 --- a/e2e/Uno/HelloWorld.Skia.Linux.FrameBuffer/HelloWorld.Skia.Linux.FrameBuffer.csproj +++ b/e2e/Uno/HelloWorld.Skia.Linux.FrameBuffer/HelloWorld.Skia.Linux.FrameBuffer.csproj @@ -1,29 +1,29 @@ - - WinExe - Exe - net7.0 - - - - + + WinExe + Exe + net7.0 + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/e2e/Uno/HelloWorld.Skia.WPF/HelloWorld.Skia.WPF.csproj b/e2e/Uno/HelloWorld.Skia.WPF/HelloWorld.Skia.WPF.csproj index 32cff4f35d..2e47db0a51 100644 --- a/e2e/Uno/HelloWorld.Skia.WPF/HelloWorld.Skia.WPF.csproj +++ b/e2e/Uno/HelloWorld.Skia.WPF/HelloWorld.Skia.WPF.csproj @@ -1,41 +1,41 @@ - - WinExe - Exe - net7.0-windows - true - - - - <_Parameter1>false - - - <_Parameter1>System.Windows.ResourceDictionaryLocation.None - <_Parameter1_IsLiteral>true - <_Parameter2>System.Windows.ResourceDictionaryLocation.SourceAssembly - <_Parameter2_IsLiteral>true - - + + WinExe + Exe + net7.0-windows + true + + + + <_Parameter1>false + + + <_Parameter1>System.Windows.ResourceDictionaryLocation.None + <_Parameter1_IsLiteral>true + <_Parameter2>System.Windows.ResourceDictionaryLocation.SourceAssembly + <_Parameter2_IsLiteral>true + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/e2e/Uno/HelloWorld.Wasm/HelloWorld.Wasm.csproj b/e2e/Uno/HelloWorld.Wasm/HelloWorld.Wasm.csproj index 037a9a1e85..2df461c00c 100644 --- a/e2e/Uno/HelloWorld.Wasm/HelloWorld.Wasm.csproj +++ b/e2e/Uno/HelloWorld.Wasm/HelloWorld.Wasm.csproj @@ -1,65 +1,65 @@ - - Exe - net7.0 - $(NoWarn);NU1504;NU1505;NU1701 - - disable - manifest.json - Properties - - - true - $(DefineConstants);TRACE;DEBUG - portable - true - - false - - - - - - - - - - - - - - + disable + manifest.json + Properties + + + true + $(DefineConstants);TRACE;DEBUG + portable + true + + false + + + + + + + + + + + + + + - - - - + You can safely remove this ItemGroup completely. + --> + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/e2e/Uno/HelloWorld.Windows/HelloWorld.Windows.csproj b/e2e/Uno/HelloWorld.Windows/HelloWorld.Windows.csproj index a679f3461e..959a8ac7d4 100644 --- a/e2e/Uno/HelloWorld.Windows/HelloWorld.Windows.csproj +++ b/e2e/Uno/HelloWorld.Windows/HelloWorld.Windows.csproj @@ -1,60 +1,60 @@ - - WinExe - net7.0-windows10.0.22621.0 - 10.0.18362.0 - UnoWinUIQuickStart - x86;x64;arm64 - win10-x86;win10-x64;win10-arm64 - win10-$(Platform).pubxml - true - true - - - - - - true - + + WinExe + net7.0-windows10.0.22621.0 + 10.0.18362.0 + UnoWinUIQuickStart + x86;x64;arm64 + win10-x86;win10-x64;win10-arm64 + win10-$(Platform).pubxml + true + true + + + + + + true + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - + - - - - + This means that the two packages below must be aligned with the "build" version number of + the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number + must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref. + --> + + From abaa3339112fa653c5f32ef2e09dd50fa3ae598b Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Wed, 1 Nov 2023 18:11:42 -0600 Subject: [PATCH 2/4] chore(deps): update for Uno 5.0 --- Directory.Packages.props | 51 +++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 73aa56f0cb..c895c4e80a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -15,39 +15,36 @@ - - - - - - - - - - + + + + + + + + + - - - + - - + + - - - - - - - - - - + + + + + + + + + + - + @@ -82,4 +79,4 @@ - \ No newline at end of file + From e9f1e8c4e1c04f2e7089282b0c0fd5d210d37433 Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Fri, 3 Nov 2023 16:23:19 -0600 Subject: [PATCH 3/4] chore: update xunit --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c895c4e80a..6c9997bc48 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -57,8 +57,8 @@ - - + + From bb1ba2a0473c4508d0be79fb14145d93edb7300a Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Fri, 3 Nov 2023 16:23:46 -0600 Subject: [PATCH 4/4] chore: fixing intellisense --- e2e/Uno/HelloWorld/HelloWorld.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/Uno/HelloWorld/HelloWorld.csproj b/e2e/Uno/HelloWorld/HelloWorld.csproj index bbaad1d9ed..180b7e5d45 100644 --- a/e2e/Uno/HelloWorld/HelloWorld.csproj +++ b/e2e/Uno/HelloWorld/HelloWorld.csproj @@ -1,8 +1,8 @@  - net7.0;net7.0-ios;net7.0-android;net7.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.22621 + net7.0-windows10.0.22621 + $(TargetFrameworks);net7.0;net7.0-ios;net7.0-android;net7.0-maccatalyst true