From dafc0366aafe4b44cd3fcc920f8e11b885c29fea Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 28 Dec 2023 12:03:00 -0600 Subject: [PATCH 1/4] build: add `net6` target Using the SDK stlye project, it is fairly easy to target multiple frameworks. For support here, a Crestron package update was necessary, but targeting both .NET6 & .NET Framework 4.7.2 is possible. This should allow us to support .NET 6 on 4-series processors, while still supporting .NET Framework 4.7.2 on VC-4. --- src/Pepperdash Core/PepperDash_Core.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Pepperdash Core/PepperDash_Core.csproj b/src/Pepperdash Core/PepperDash_Core.csproj index 845577b..3fe8257 100644 --- a/src/Pepperdash Core/PepperDash_Core.csproj +++ b/src/Pepperdash Core/PepperDash_Core.csproj @@ -2,7 +2,7 @@ PepperDash.Core PepperDashCore - net472 + net472;net6 false en bin\$(Configuration)\ @@ -30,7 +30,7 @@ - + Full From 4825f1ec39341d973dee2f29d387ad7909a5e6cc Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 28 Dec 2023 13:02:51 -0600 Subject: [PATCH 2/4] build: removed unnecessary references for .NET 6 --- src/Pepperdash Core/PepperDash_Core.csproj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Pepperdash Core/PepperDash_Core.csproj b/src/Pepperdash Core/PepperDash_Core.csproj index 3fe8257..df1bf53 100644 --- a/src/Pepperdash Core/PepperDash_Core.csproj +++ b/src/Pepperdash Core/PepperDash_Core.csproj @@ -24,11 +24,6 @@ pdbonly bin\4Series\$(Configuration)\PepperDashCore.xml - - - - - From b238681918356338d6d0a5714cb52d447bdb2dd4 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Fri, 2 Feb 2024 09:39:45 -0600 Subject: [PATCH 3/4] build: missing tag --- src/Pepperdash Core/PepperDash_Core.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Pepperdash Core/PepperDash_Core.csproj b/src/Pepperdash Core/PepperDash_Core.csproj index 3c87cc2..80cb5f3 100644 --- a/src/Pepperdash Core/PepperDash_Core.csproj +++ b/src/Pepperdash Core/PepperDash_Core.csproj @@ -29,6 +29,7 @@ + From 5b6c8c3ebbff3a0d09f6a8395eaa7ee3f4c207b0 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Fri, 2 Feb 2024 09:44:41 -0600 Subject: [PATCH 4/4] buid: remove unnecessary references for .NET 6 --- src/Pepperdash Core/PepperDash_Core.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Pepperdash Core/PepperDash_Core.csproj b/src/Pepperdash Core/PepperDash_Core.csproj index 80cb5f3..d90f536 100644 --- a/src/Pepperdash Core/PepperDash_Core.csproj +++ b/src/Pepperdash Core/PepperDash_Core.csproj @@ -26,9 +26,6 @@ - - -