From 73674548e3b06291e754c0ebd96346181ef8ffc9 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Fri, 8 Jan 2021 23:57:55 +0100 Subject: [PATCH] Make netcore as default, also using 3.1 now - BlubbFish --- Utils-IoT-4.7.1.sln | 37 +++++++++++++ Utils-IoT.sln | 32 +++++------ Utils-IoT/Utils-IoT-4.7.1.csproj | 69 +++++++++++++++++++++++ Utils-IoT/Utils-IoT.csproj | 94 +++++++++++--------------------- Utils-IoT/Utils-IoT_Core.csproj | 41 -------------- Utils-IoT_Core.sln | 37 ------------- 6 files changed, 155 insertions(+), 155 deletions(-) create mode 100644 Utils-IoT-4.7.1.sln create mode 100644 Utils-IoT/Utils-IoT-4.7.1.csproj delete mode 100644 Utils-IoT/Utils-IoT_Core.csproj delete mode 100644 Utils-IoT_Core.sln diff --git a/Utils-IoT-4.7.1.sln b/Utils-IoT-4.7.1.sln new file mode 100644 index 0000000..b601d9d --- /dev/null +++ b/Utils-IoT-4.7.1.sln @@ -0,0 +1,37 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29519.87 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "Utils-IoT\Utils-IoT-4.7.1.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-4.7.1", "..\Utils\Utils\Utils-4.7.1.csproj", "{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU + {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU + {FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {844D8F60-6DE1-4C48-976D-F71450E9707B} + EndGlobalSection +EndGlobal diff --git a/Utils-IoT.sln b/Utils-IoT.sln index 8cb6ce2..3757a0d 100644 --- a/Utils-IoT.sln +++ b/Utils-IoT.sln @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29519.87 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "Utils-IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils-IoT", "Utils-IoT\Utils-IoT.csproj", "{549D532E-F859-4128-BA8E-9658E7349F64}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "..\Utils\Utils\Utils.csproj", "{5A666820-02FF-4649-95F7-476CE95E0E29}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\Utils\Utils\Utils.csproj", "{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "litjson", "..\..\Librarys\litjson\litjson\litjson.csproj", "{822DFFA0-7838-4590-8160-63EC92AE15B5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,23 +15,23 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU - {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU - {FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.Build.0 = Release|Any CPU + {549D532E-F859-4128-BA8E-9658E7349F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {549D532E-F859-4128-BA8E-9658E7349F64}.Debug|Any CPU.Build.0 = Debug|Any CPU + {549D532E-F859-4128-BA8E-9658E7349F64}.Release|Any CPU.ActiveCfg = Release|Any CPU + {549D532E-F859-4128-BA8E-9658E7349F64}.Release|Any CPU.Build.0 = Release|Any CPU + {5A666820-02FF-4649-95F7-476CE95E0E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A666820-02FF-4649-95F7-476CE95E0E29}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A666820-02FF-4649-95F7-476CE95E0E29}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A666820-02FF-4649-95F7-476CE95E0E29}.Release|Any CPU.Build.0 = Release|Any CPU + {822DFFA0-7838-4590-8160-63EC92AE15B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {822DFFA0-7838-4590-8160-63EC92AE15B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {822DFFA0-7838-4590-8160-63EC92AE15B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {822DFFA0-7838-4590-8160-63EC92AE15B5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {844D8F60-6DE1-4C48-976D-F71450E9707B} + SolutionGuid = {28A0A2C2-A747-4FB6-80F6-50CA564403B8} EndGlobalSection EndGlobal diff --git a/Utils-IoT/Utils-IoT-4.7.1.csproj b/Utils-IoT/Utils-IoT-4.7.1.csproj new file mode 100644 index 0000000..dca2814 --- /dev/null +++ b/Utils-IoT/Utils-IoT-4.7.1.csproj @@ -0,0 +1,69 @@ + + + + + Debug + AnyCPU + {B870E4D5-6806-4A0B-B233-8907EEDC5AFC} + Library + Properties + BlubbFish.Utils.IoT + Utils-IoT + v4.7.1 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {91a14cd2-2940-4500-8193-56d37edddbaa} + litjson_4.7.1 + + + {fac8ce64-bf13-4ece-8097-aeb5dd060098} + Utils + + + + \ No newline at end of file diff --git a/Utils-IoT/Utils-IoT.csproj b/Utils-IoT/Utils-IoT.csproj index dca2814..e5abd96 100644 --- a/Utils-IoT/Utils-IoT.csproj +++ b/Utils-IoT/Utils-IoT.csproj @@ -1,69 +1,41 @@ - - - + + - Debug - AnyCPU - {B870E4D5-6806-4A0B-B233-8907EEDC5AFC} - Library - Properties + netcoreapp3.1 BlubbFish.Utils.IoT Utils-IoT - v4.7.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + 1.0.0 + de-DE + 1.0.0 Init + Copyright © BlubbFish 2017 - 24.11.2019 + Provides classes for iot development + LICENSE + BlubbFish + BlubbFish + 1.0.0 + http://git.blubbfish.net/vs_utils/Utils-IoT + http://git.blubbfish.net/vs_utils/Utils-IoT.git + git + 1.0.0 + IoT.Utils.BlubbFish + - + + + + + + + + + - - - - - - - - - - - - - - + + True + + - - - - - - - - - {91a14cd2-2940-4500-8193-56d37edddbaa} - litjson_4.7.1 - - - {fac8ce64-bf13-4ece-8097-aeb5dd060098} - Utils - - - - \ No newline at end of file + + diff --git a/Utils-IoT/Utils-IoT_Core.csproj b/Utils-IoT/Utils-IoT_Core.csproj deleted file mode 100644 index 62afb21..0000000 --- a/Utils-IoT/Utils-IoT_Core.csproj +++ /dev/null @@ -1,41 +0,0 @@ - - - - netcoreapp3.0 - BlubbFish.Utils.IoT - Utils-IoT - 1.0.0 - de-DE - 1.0.0 Init - Copyright © BlubbFish 2017 - 24.11.2019 - Provides classes for iot development - LICENSE - BlubbFish - BlubbFish - 1.0.0 - http://git.blubbfish.net/vs_utils/Utils-IoT - http://git.blubbfish.net/vs_utils/Utils-IoT.git - git - 1.0.0 - IoT.Utils.BlubbFish - - - - - - - - - - - - - - - - True - - - - - diff --git a/Utils-IoT_Core.sln b/Utils-IoT_Core.sln deleted file mode 100644 index e109895..0000000 --- a/Utils-IoT_Core.sln +++ /dev/null @@ -1,37 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29519.87 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils-IoT_Core", "Utils-IoT\Utils-IoT_Core.csproj", "{549D532E-F859-4128-BA8E-9658E7349F64}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils_Core", "..\Utils\Utils\Utils_Core.csproj", "{5A666820-02FF-4649-95F7-476CE95E0E29}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "litjson_Core", "..\..\Librarys\litjson\litjson\litjson_Core.csproj", "{822DFFA0-7838-4590-8160-63EC92AE15B5}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {549D532E-F859-4128-BA8E-9658E7349F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {549D532E-F859-4128-BA8E-9658E7349F64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {549D532E-F859-4128-BA8E-9658E7349F64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {549D532E-F859-4128-BA8E-9658E7349F64}.Release|Any CPU.Build.0 = Release|Any CPU - {5A666820-02FF-4649-95F7-476CE95E0E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A666820-02FF-4649-95F7-476CE95E0E29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A666820-02FF-4649-95F7-476CE95E0E29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A666820-02FF-4649-95F7-476CE95E0E29}.Release|Any CPU.Build.0 = Release|Any CPU - {822DFFA0-7838-4590-8160-63EC92AE15B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {822DFFA0-7838-4590-8160-63EC92AE15B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {822DFFA0-7838-4590-8160-63EC92AE15B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {822DFFA0-7838-4590-8160-63EC92AE15B5}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {28A0A2C2-A747-4FB6-80F6-50CA564403B8} - EndGlobalSection -EndGlobal