From bb0741e784a11ba7712411e559f87d27d7dc6779 Mon Sep 17 00:00:00 2001 From: Thomas Bolon Date: Fri, 3 Jan 2020 13:16:10 +0100 Subject: [PATCH 1/3] only target useful frameworks fix #3 --- ...mponentFactory.Krypton.Docking 2019.csproj | 6 +- ...onentFactory.Krypton.Navigator 2019.csproj | 6 +- ...omponentFactory.Krypton.Ribbon 2019.csproj | 6 +- ...mponentFactory.Krypton.Toolkit 2019.csproj | 168 ++---------------- ...onentFactory.Krypton.Workspace 2019.csproj | 6 +- .../Krypton Components/TestApp/TestApp.csproj | 2 +- 6 files changed, 29 insertions(+), 165 deletions(-) diff --git a/Source/Krypton Components/ComponentFactory.Krypton.Docking/ComponentFactory.Krypton.Docking 2019.csproj b/Source/Krypton Components/ComponentFactory.Krypton.Docking/ComponentFactory.Krypton.Docking 2019.csproj index 7de1d674..5b45b02a 100644 --- a/Source/Krypton Components/ComponentFactory.Krypton.Docking/ComponentFactory.Krypton.Docking 2019.csproj +++ b/Source/Krypton Components/ComponentFactory.Krypton.Docking/ComponentFactory.Krypton.Docking 2019.csproj @@ -1,6 +1,6 @@  - net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;netcoreapp3.1 + net40;netcoreapp3.1 8.0 Library ComponentFactory.Krypton.Docking @@ -63,9 +63,11 @@ - + + + ..\..\..\Bin\$(Configuration)\Krypton Docking.xml ..\..\..\Bin\$(Configuration)\ diff --git a/Source/Krypton Components/ComponentFactory.Krypton.Navigator/ComponentFactory.Krypton.Navigator 2019.csproj b/Source/Krypton Components/ComponentFactory.Krypton.Navigator/ComponentFactory.Krypton.Navigator 2019.csproj index ef8fc0ab..4e789e7a 100644 --- a/Source/Krypton Components/ComponentFactory.Krypton.Navigator/ComponentFactory.Krypton.Navigator 2019.csproj +++ b/Source/Krypton Components/ComponentFactory.Krypton.Navigator/ComponentFactory.Krypton.Navigator 2019.csproj @@ -1,6 +1,6 @@  - net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;netcoreapp3.1 + net40;netcoreapp3.1 8.0 Library ComponentFactory.Krypton.Navigator @@ -78,9 +78,11 @@ - + + + ..\..\..\Bin\$(Configuration)\Krypton Navigator.xml ..\..\..\Bin\$(Configuration)\ diff --git a/Source/Krypton Components/ComponentFactory.Krypton.Ribbon/ComponentFactory.Krypton.Ribbon 2019.csproj b/Source/Krypton Components/ComponentFactory.Krypton.Ribbon/ComponentFactory.Krypton.Ribbon 2019.csproj index b1d46713..95b21ce3 100644 --- a/Source/Krypton Components/ComponentFactory.Krypton.Ribbon/ComponentFactory.Krypton.Ribbon 2019.csproj +++ b/Source/Krypton Components/ComponentFactory.Krypton.Ribbon/ComponentFactory.Krypton.Ribbon 2019.csproj @@ -1,6 +1,6 @@  - net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;netcoreapp3.1 + net40;netcoreapp3.1 8.0 Library ComponentFactory.Krypton.Ribbon @@ -102,9 +102,11 @@ - + + + ..\..\..\Bin\$(Configuration)\Krypton Ribbon.xml ..\..\..\Bin\$(Configuration)\ diff --git a/Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2019.csproj b/Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2019.csproj index eae24c75..21c9eff2 100644 --- a/Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2019.csproj +++ b/Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2019.csproj @@ -1,6 +1,6 @@  - net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;netcoreapp3.1 + net40;netcoreapp3.1 8.0 Library ComponentFactory.Krypton.Toolkit @@ -36,6 +36,7 @@ app.manifest + Component @@ -183,170 +184,25 @@ Component + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + ..\..\..\Bin\$(Configuration)\Krypton Toolkit.xml ..\..\..\Bin\$(Configuration)\ diff --git a/Source/Krypton Components/ComponentFactory.Krypton.Workspace/ComponentFactory.Krypton.Workspace 2019.csproj b/Source/Krypton Components/ComponentFactory.Krypton.Workspace/ComponentFactory.Krypton.Workspace 2019.csproj index cab26bc7..f32a98ae 100644 --- a/Source/Krypton Components/ComponentFactory.Krypton.Workspace/ComponentFactory.Krypton.Workspace 2019.csproj +++ b/Source/Krypton Components/ComponentFactory.Krypton.Workspace/ComponentFactory.Krypton.Workspace 2019.csproj @@ -1,6 +1,6 @@  - net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;netcoreapp3.1 + net40;netcoreapp3.1 8.0 Library ComponentFactory.Krypton.Workspace @@ -54,9 +54,11 @@ - + + + ..\..\..\Bin\$(Configuration)\Krypton Workspace.xml ..\..\..\Bin\$(Configuration)\ diff --git a/Source/Krypton Components/TestApp/TestApp.csproj b/Source/Krypton Components/TestApp/TestApp.csproj index e2a0a70f..758094c4 100644 --- a/Source/Krypton Components/TestApp/TestApp.csproj +++ b/Source/Krypton Components/TestApp/TestApp.csproj @@ -1,6 +1,6 @@  - net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;netcoreapp3.1 + net472;netcoreapp3.1 8.0 WinExe 19.4.168.9 From de9ab014992ba3309f63b2a00292f24fdadb094f Mon Sep 17 00:00:00 2001 From: Thomas Bolon Date: Fri, 3 Jan 2020 17:46:42 +0100 Subject: [PATCH 2/3] revert csproj cleanup --- ...mponentFactory.Krypton.Toolkit 2019.csproj | 67 ++++++++++++++++--- 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2019.csproj b/Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2019.csproj index 21c9eff2..025d00a0 100644 --- a/Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2019.csproj +++ b/Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2019.csproj @@ -184,9 +184,66 @@ Component - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -194,15 +251,9 @@ - - - - - - ..\..\..\Bin\$(Configuration)\Krypton Toolkit.xml ..\..\..\Bin\$(Configuration)\ From 4d06559922e77946933de5e01ba951020f10773b Mon Sep 17 00:00:00 2001 From: Thomas Bolon Date: Sat, 4 Jan 2020 09:54:23 +0100 Subject: [PATCH 3/3] revert csproj changes --- ...mponentFactory.Krypton.Docking 2019.csproj | 2 - ...onentFactory.Krypton.Navigator 2019.csproj | 2 - ...omponentFactory.Krypton.Ribbon 2019.csproj | 2 - ...mponentFactory.Krypton.Toolkit 2019.csproj | 99 ++++++++++++++++++- ...onentFactory.Krypton.Workspace 2019.csproj | 2 - 5 files changed, 96 insertions(+), 11 deletions(-) diff --git a/Source/Krypton Components/ComponentFactory.Krypton.Docking/ComponentFactory.Krypton.Docking 2019.csproj b/Source/Krypton Components/ComponentFactory.Krypton.Docking/ComponentFactory.Krypton.Docking 2019.csproj index 5b45b02a..7036661b 100644 --- a/Source/Krypton Components/ComponentFactory.Krypton.Docking/ComponentFactory.Krypton.Docking 2019.csproj +++ b/Source/Krypton Components/ComponentFactory.Krypton.Docking/ComponentFactory.Krypton.Docking 2019.csproj @@ -63,11 +63,9 @@ - - ..\..\..\Bin\$(Configuration)\Krypton Docking.xml ..\..\..\Bin\$(Configuration)\ diff --git a/Source/Krypton Components/ComponentFactory.Krypton.Navigator/ComponentFactory.Krypton.Navigator 2019.csproj b/Source/Krypton Components/ComponentFactory.Krypton.Navigator/ComponentFactory.Krypton.Navigator 2019.csproj index 4e789e7a..0b59d616 100644 --- a/Source/Krypton Components/ComponentFactory.Krypton.Navigator/ComponentFactory.Krypton.Navigator 2019.csproj +++ b/Source/Krypton Components/ComponentFactory.Krypton.Navigator/ComponentFactory.Krypton.Navigator 2019.csproj @@ -78,11 +78,9 @@ - - ..\..\..\Bin\$(Configuration)\Krypton Navigator.xml ..\..\..\Bin\$(Configuration)\ diff --git a/Source/Krypton Components/ComponentFactory.Krypton.Ribbon/ComponentFactory.Krypton.Ribbon 2019.csproj b/Source/Krypton Components/ComponentFactory.Krypton.Ribbon/ComponentFactory.Krypton.Ribbon 2019.csproj index 95b21ce3..0cf8aeaa 100644 --- a/Source/Krypton Components/ComponentFactory.Krypton.Ribbon/ComponentFactory.Krypton.Ribbon 2019.csproj +++ b/Source/Krypton Components/ComponentFactory.Krypton.Ribbon/ComponentFactory.Krypton.Ribbon 2019.csproj @@ -102,11 +102,9 @@ - - ..\..\..\Bin\$(Configuration)\Krypton Ribbon.xml ..\..\..\Bin\$(Configuration)\ diff --git a/Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2019.csproj b/Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2019.csproj index 025d00a0..6041e28e 100644 --- a/Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2019.csproj +++ b/Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2019.csproj @@ -36,7 +36,6 @@ app.manifest - Component @@ -245,12 +244,106 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/Source/Krypton Components/ComponentFactory.Krypton.Workspace/ComponentFactory.Krypton.Workspace 2019.csproj b/Source/Krypton Components/ComponentFactory.Krypton.Workspace/ComponentFactory.Krypton.Workspace 2019.csproj index f32a98ae..b93e1471 100644 --- a/Source/Krypton Components/ComponentFactory.Krypton.Workspace/ComponentFactory.Krypton.Workspace 2019.csproj +++ b/Source/Krypton Components/ComponentFactory.Krypton.Workspace/ComponentFactory.Krypton.Workspace 2019.csproj @@ -54,11 +54,9 @@ - - ..\..\..\Bin\$(Configuration)\Krypton Workspace.xml ..\..\..\Bin\$(Configuration)\