From 760ba0b63407cdc53ce2093513249e6997bfe92b Mon Sep 17 00:00:00 2001 From: "WORKSTATION\\yuriy" Date: Tue, 5 Dec 2023 20:52:05 +0200 Subject: [PATCH 1/5] Updated to .NET 8 --- src/AlohaKit.Gallery/AlohaKit.Gallery.csproj | 19 ++++++------------- .../Platforms/Android/AndroidManifest.xml | 2 +- src/AlohaKit/AlohaKit.csproj | 15 ++++++++++----- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj b/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj index 6deac58..516f6c5 100644 --- a/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj +++ b/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj @@ -1,8 +1,8 @@  - net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net6.0-windows10.0.19041 + net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041 Exe AlohaKit.Gallery true @@ -24,9 +24,9 @@ True - 14.2 - 14.0 - 21.0 + 14.2 + 14.0 + 21.0 10.0.17763.0 10.0.17763.0 @@ -47,14 +47,7 @@ - - - - - - - - + diff --git a/src/AlohaKit.Gallery/Platforms/Android/AndroidManifest.xml b/src/AlohaKit.Gallery/Platforms/Android/AndroidManifest.xml index 7570ff6..0f8b33b 100644 --- a/src/AlohaKit.Gallery/Platforms/Android/AndroidManifest.xml +++ b/src/AlohaKit.Gallery/Platforms/Android/AndroidManifest.xml @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/AlohaKit/AlohaKit.csproj b/src/AlohaKit/AlohaKit.csproj index fa7abe0..f9b2e9c 100644 --- a/src/AlohaKit/AlohaKit.csproj +++ b/src/AlohaKit/AlohaKit.csproj @@ -1,13 +1,13 @@  - net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net6.0-windows10.0.19041 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041 true true - 14.2 - 14.0 - 21.0 + 14.2 + 14.0 + 21.0 10.0.17763.0 10.0.17763.0 True @@ -33,4 +33,9 @@ + + + + + From 50f17b6caba941e0554a01f8cf35b48979ecf90b Mon Sep 17 00:00:00 2001 From: Yuriy Holembyovskyy Date: Wed, 3 Jul 2024 18:21:15 +0300 Subject: [PATCH 2/5] Fixed comments and updated nugets --- .../AlohaKit.DataVisualization.csproj | 4 ++-- src/AlohaKit.Gallery/AlohaKit.Gallery.csproj | 15 ++++++++++++--- src/AlohaKit/AlohaKit.csproj | 14 +++++++++++--- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/AlohaKit.DataVisualization/AlohaKit.DataVisualization.csproj b/src/AlohaKit.DataVisualization/AlohaKit.DataVisualization.csproj index 325c40f..48f48b5 100644 --- a/src/AlohaKit.DataVisualization/AlohaKit.DataVisualization.csproj +++ b/src/AlohaKit.DataVisualization/AlohaKit.DataVisualization.csproj @@ -1,8 +1,8 @@ - net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net6.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 true diff --git a/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj b/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj index 516f6c5..b846167 100644 --- a/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj +++ b/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj @@ -24,9 +24,9 @@ True - 14.2 - 14.0 - 21.0 + 14.2 + 14.0 + 21.0 10.0.17763.0 10.0.17763.0 @@ -57,9 +57,18 @@ + + + + + + WinExe win10-x64 + + false + \ No newline at end of file diff --git a/src/AlohaKit/AlohaKit.csproj b/src/AlohaKit/AlohaKit.csproj index f9b2e9c..603bd4e 100644 --- a/src/AlohaKit/AlohaKit.csproj +++ b/src/AlohaKit/AlohaKit.csproj @@ -5,9 +5,9 @@ $(TargetFrameworks);net8.0-windows10.0.19041 true true - 14.2 - 14.0 - 21.0 + 14.2 + 14.0 + 21.0 10.0.17763.0 10.0.17763.0 True @@ -15,6 +15,9 @@ AlohaKit + + false + @@ -33,6 +36,11 @@ + + + + + From 49aaedf6ba73772ffc17ddacf339134600d9dbad Mon Sep 17 00:00:00 2001 From: Yuriy Holembyovskyy Date: Wed, 3 Jul 2024 18:45:06 +0300 Subject: [PATCH 3/5] Update src/AlohaKit.Gallery/AlohaKit.Gallery.csproj Co-authored-by: Dan Siegel --- src/AlohaKit.Gallery/AlohaKit.Gallery.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj b/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj index b846167..f3d4883 100644 --- a/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj +++ b/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj @@ -24,9 +24,9 @@ True - 14.2 - 14.0 - 21.0 + 11.0 + 13.1 + 21.0 10.0.17763.0 10.0.17763.0 From 1f2c1494b65a04ceba395b027da7c195827d0e24 Mon Sep 17 00:00:00 2001 From: Yuriy Holembyovskyy Date: Wed, 3 Jul 2024 19:33:20 +0300 Subject: [PATCH 4/5] Updated Directory.Build.pros --- Directory.Build.props | 4 ++-- src/AlohaKit/AlohaKit.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e4d7e79..397e5d4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -36,10 +36,10 @@ \ No newline at end of file diff --git a/src/AlohaKit/AlohaKit.csproj b/src/AlohaKit/AlohaKit.csproj index 603bd4e..6224908 100644 --- a/src/AlohaKit/AlohaKit.csproj +++ b/src/AlohaKit/AlohaKit.csproj @@ -43,7 +43,7 @@ - + From b5e784777b660237f46fe5083f5db03f45d39e93 Mon Sep 17 00:00:00 2001 From: Yuriy Holembyovskyy Date: Thu, 4 Jul 2024 11:17:06 +0300 Subject: [PATCH 5/5] Moved everything to Directory.Build.props --- Directory.Build.props | 20 ++++++++++++++------ src/AlohaKit.Gallery/AlohaKit.Gallery.csproj | 18 +++--------------- src/AlohaKit/AlohaKit.csproj | 20 ++------------------ 3 files changed, 19 insertions(+), 39 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 397e5d4..6501cf5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -28,6 +28,17 @@ $(MSBuildThisFileDirectory)TestResults + + 11.0 + 13.1 + 21.0 + 10.0.17763.0 + 14.2 + 14.0 + 21.0 + 10.0.17763.0 + + @@ -35,11 +46,8 @@ - - + + + \ No newline at end of file diff --git a/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj b/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj index f3d4883..b751730 100644 --- a/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj +++ b/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj @@ -22,13 +22,8 @@ 1 - True - - 11.0 - 13.1 - 21.0 - 10.0.17763.0 - 10.0.17763.0 + True + @@ -55,14 +50,7 @@ - - - - - - - - + WinExe win10-x64 diff --git a/src/AlohaKit/AlohaKit.csproj b/src/AlohaKit/AlohaKit.csproj index 6224908..5e1bcad 100644 --- a/src/AlohaKit/AlohaKit.csproj +++ b/src/AlohaKit/AlohaKit.csproj @@ -4,12 +4,7 @@ net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst $(TargetFrameworks);net8.0-windows10.0.19041 true - true - 14.2 - 14.0 - 21.0 - 10.0.17763.0 - 10.0.17763.0 + true True AlohaKit AlohaKit @@ -34,16 +29,5 @@ True \ - - - - - - - - - - - - +