diff --git a/Iot-Interfaces-4.7.1.sln b/Iot-Interfaces-4.7.1.sln new file mode 100644 index 0000000..1458dce --- /dev/null +++ b/Iot-Interfaces-4.7.1.sln @@ -0,0 +1,31 @@ + +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}") = "Iot-Interfaces", "Iot-Interfaces\Iot-Interfaces-4.7.1.csproj", "{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\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 + {4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.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 = {6B5D61A4-D0B6-4C5C-8C8D-76EBD5ED55CE} + EndGlobalSection +EndGlobal diff --git a/Iot-Interfaces.sln b/Iot-Interfaces.sln index ad7042f..6df35df 100644 --- a/Iot-Interfaces.sln +++ b/Iot-Interfaces.sln @@ -3,9 +3,9 @@ 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}") = "Iot-Interfaces", "Iot-Interfaces\Iot-Interfaces.csproj", "{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Iot-Interfaces", "Iot-Interfaces\Iot-Interfaces.csproj", "{C673B8CF-FCAD-4FEF-9744-DB3E6E546C12}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\Utils\Utils\Utils.csproj", "{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "..\Utils\Utils\Utils.csproj", "{99709124-FAB4-479B-BB01-A34733FF4190}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,19 +13,19 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.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 + {C673B8CF-FCAD-4FEF-9744-DB3E6E546C12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C673B8CF-FCAD-4FEF-9744-DB3E6E546C12}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C673B8CF-FCAD-4FEF-9744-DB3E6E546C12}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C673B8CF-FCAD-4FEF-9744-DB3E6E546C12}.Release|Any CPU.Build.0 = Release|Any CPU + {99709124-FAB4-479B-BB01-A34733FF4190}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {99709124-FAB4-479B-BB01-A34733FF4190}.Debug|Any CPU.Build.0 = Debug|Any CPU + {99709124-FAB4-479B-BB01-A34733FF4190}.Release|Any CPU.ActiveCfg = Release|Any CPU + {99709124-FAB4-479B-BB01-A34733FF4190}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6B5D61A4-D0B6-4C5C-8C8D-76EBD5ED55CE} + SolutionGuid = {81CC4108-C7A3-4B34-A0EE-7EC946F58C28} EndGlobalSection EndGlobal diff --git a/Iot-Interfaces/Iot-Interfaces-4.7.1.csproj b/Iot-Interfaces/Iot-Interfaces-4.7.1.csproj new file mode 100644 index 0000000..7eddc20 --- /dev/null +++ b/Iot-Interfaces/Iot-Interfaces-4.7.1.csproj @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>BlubbFish.Utils.IoT.Interfaces</RootNamespace> + <AssemblyName>Iot-Interfaces</AssemblyName> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Net.Http" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="ISenml.cs" /> + <Compile Include="IMqtt.cs" /> + <Compile Include="Language\Senml.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <Content Include="..\CONTRIBUTING.md" /> + <Content Include="..\LICENSE" /> + <Content Include="..\README.md" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\Utils\Utils\Utils.csproj"> + <Project>{fac8ce64-bf13-4ece-8097-aeb5dd060098}</Project> + <Name>Utils</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> +</Project> \ No newline at end of file diff --git a/Iot-Interfaces/Iot-Interfaces.csproj b/Iot-Interfaces/Iot-Interfaces.csproj index 7eddc20..2cbf228 100644 --- a/Iot-Interfaces/Iot-Interfaces.csproj +++ b/Iot-Interfaces/Iot-Interfaces.csproj @@ -1,61 +1,37 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> + <TargetFramework>netcoreapp3.1</TargetFramework> <RootNamespace>BlubbFish.Utils.IoT.Interfaces</RootNamespace> <AssemblyName>Iot-Interfaces</AssemblyName> - <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <TargetFrameworkProfile /> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> + <PackageId>Interfaces.IoT.Utils.BlubbFish</PackageId> + <AssemblyVersion>1.0.0</AssemblyVersion> + <FileVersion>1.0.0</FileVersion> + <NeutralLanguage>de-DE</NeutralLanguage> + <Description>Interfaces for IoT-Stuff</Description> + <Authors>BlubbFish</Authors> + <Company>BlubbFish</Company> + <Copyright>Copyright © BlubbFish 2018 - 02.05.2018</Copyright> + <PackageLicenseFile>LICENSE</PackageLicenseFile> + <PackageProjectUrl>http://git.blubbfish.net/vs_utils/Iot-Interfaces</PackageProjectUrl> + <RepositoryUrl>http://git.blubbfish.net/vs_utils/Iot-Interfaces.git</RepositoryUrl> + <RepositoryType>git</RepositoryType> </PropertyGroup> + <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Xml" /> + <ProjectReference Include="..\..\Utils\Utils\Utils.csproj" /> + </ItemGroup> + + <ItemGroup> + <Content Include="../CONTRIBUTING.md" /> + <Content Include="../LICENSE" /> + <Content Include="../README.md" /> </ItemGroup> <ItemGroup> - <Compile Include="ISenml.cs" /> - <Compile Include="IMqtt.cs" /> - <Compile Include="Language\Senml.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> + <None Include="..\LICENSE"> + <Pack>True</Pack> + <PackagePath></PackagePath> + </None> </ItemGroup> - <ItemGroup> - <Content Include="..\CONTRIBUTING.md" /> - <Content Include="..\LICENSE" /> - <Content Include="..\README.md" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\Utils\Utils\Utils.csproj"> - <Project>{fac8ce64-bf13-4ece-8097-aeb5dd060098}</Project> - <Name>Utils</Name> - </ProjectReference> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> -</Project> \ No newline at end of file + +</Project> diff --git a/Iot-Interfaces/Iot-Interfaces_Core.csproj b/Iot-Interfaces/Iot-Interfaces_Core.csproj deleted file mode 100644 index 5801cbd..0000000 --- a/Iot-Interfaces/Iot-Interfaces_Core.csproj +++ /dev/null @@ -1,37 +0,0 @@ -<Project Sdk="Microsoft.NET.Sdk"> - - <PropertyGroup> - <TargetFramework>netcoreapp3.0</TargetFramework> - <RootNamespace>BlubbFish.Utils.IoT.Interfaces</RootNamespace> - <AssemblyName>Iot-Interfaces</AssemblyName> - <PackageId>Interfaces.IoT.Utils.BlubbFish</PackageId> - <AssemblyVersion>1.0.0</AssemblyVersion> - <FileVersion>1.0.0</FileVersion> - <NeutralLanguage>de-DE</NeutralLanguage> - <Description>Interfaces for IoT-Stuff</Description> - <Authors>BlubbFish</Authors> - <Company>BlubbFish</Company> - <Copyright>Copyright © BlubbFish 2018 - 02.05.2018</Copyright> - <PackageLicenseFile>LICENSE</PackageLicenseFile> - <PackageProjectUrl>http://git.blubbfish.net/vs_utils/Iot-Interfaces</PackageProjectUrl> - <RepositoryUrl>http://git.blubbfish.net/vs_utils/Iot-Interfaces.git</RepositoryUrl> - <RepositoryType>git</RepositoryType> - </PropertyGroup> - - <ItemGroup> - <ProjectReference Include="..\..\Utils\Utils\Utils_Core.csproj" /> - </ItemGroup> - - <ItemGroup> - <Content Include="../CONTRIBUTING.md" /> - <Content Include="../LICENSE" /> - <Content Include="../README.md" /> - </ItemGroup> - <ItemGroup> - <None Include="..\LICENSE"> - <Pack>True</Pack> - <PackagePath></PackagePath> - </None> - </ItemGroup> - -</Project> diff --git a/Iot-Interfaces_Core.sln b/Iot-Interfaces_Core.sln deleted file mode 100644 index baa8738..0000000 --- a/Iot-Interfaces_Core.sln +++ /dev/null @@ -1,31 +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}") = "Iot-Interfaces_Core", "Iot-Interfaces\Iot-Interfaces_Core.csproj", "{C673B8CF-FCAD-4FEF-9744-DB3E6E546C12}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils_Core", "..\Utils\Utils\Utils_Core.csproj", "{99709124-FAB4-479B-BB01-A34733FF4190}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C673B8CF-FCAD-4FEF-9744-DB3E6E546C12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C673B8CF-FCAD-4FEF-9744-DB3E6E546C12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C673B8CF-FCAD-4FEF-9744-DB3E6E546C12}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C673B8CF-FCAD-4FEF-9744-DB3E6E546C12}.Release|Any CPU.Build.0 = Release|Any CPU - {99709124-FAB4-479B-BB01-A34733FF4190}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99709124-FAB4-479B-BB01-A34733FF4190}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99709124-FAB4-479B-BB01-A34733FF4190}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99709124-FAB4-479B-BB01-A34733FF4190}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {81CC4108-C7A3-4B34-A0EE-7EC946F58C28} - EndGlobalSection -EndGlobal