Make netcore as default, also using 3.1 now
This commit is contained in:
parent
17ba628d0b
commit
ff65760628
34
Zway.sln
34
Zway.sln
@ -1,9 +1,15 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26730.16
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.29806.167
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zway", "Zway\Zway.csproj", "{166258ED-CB3D-43F5-8E8D-3A993B64D022}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zway", "Zway\Zway.csproj", "{5D565E5E-D1E0-44A3-9817-1AEC07BC2564}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "litjson", "..\Librarys\litjson\litjson\litjson.csproj", "{5FD215BB-458C-462E-A06B-590EFCC559D3}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Iot-Interfaces", "..\Utils\Iot-Interfaces\Iot-Interfaces\Iot-Interfaces.csproj", "{49CE9A50-BBBD-4744-8D7A-CA46D4A6C3F2}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "..\Utils\Utils\Utils\Utils.csproj", "{7B542A96-636E-4A3C-8528-821EAB734266}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
@ -11,15 +17,27 @@ Global
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{166258ED-CB3D-43F5-8E8D-3A993B64D022}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{166258ED-CB3D-43F5-8E8D-3A993B64D022}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{166258ED-CB3D-43F5-8E8D-3A993B64D022}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{166258ED-CB3D-43F5-8E8D-3A993B64D022}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5D565E5E-D1E0-44A3-9817-1AEC07BC2564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5D565E5E-D1E0-44A3-9817-1AEC07BC2564}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5D565E5E-D1E0-44A3-9817-1AEC07BC2564}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5D565E5E-D1E0-44A3-9817-1AEC07BC2564}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5FD215BB-458C-462E-A06B-590EFCC559D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5FD215BB-458C-462E-A06B-590EFCC559D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5FD215BB-458C-462E-A06B-590EFCC559D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5FD215BB-458C-462E-A06B-590EFCC559D3}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{49CE9A50-BBBD-4744-8D7A-CA46D4A6C3F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{49CE9A50-BBBD-4744-8D7A-CA46D4A6C3F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{49CE9A50-BBBD-4744-8D7A-CA46D4A6C3F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{49CE9A50-BBBD-4744-8D7A-CA46D4A6C3F2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{7B542A96-636E-4A3C-8528-821EAB734266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{7B542A96-636E-4A3C-8528-821EAB734266}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{7B542A96-636E-4A3C-8528-821EAB734266}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{7B542A96-636E-4A3C-8528-821EAB734266}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {2F3A172A-4D52-4191-A84A-675D35B4A292}
|
||||
SolutionGuid = {06743A84-28DD-482E-996D-AA5511FE908F}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
||||
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
||||
// die einer Assembly zugeordnet sind.
|
||||
[assembly: AssemblyTitle("Zway")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("Zway")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2017 - 29.09.2018")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
|
||||
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
|
||||
// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
|
||||
[assembly: Guid("166258ed-cb3d-43f5-8e8d-3a993b64d022")]
|
||||
|
||||
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
|
||||
//
|
||||
// Hauptversion
|
||||
// Nebenversion
|
||||
// Buildnummer
|
||||
// Revision
|
||||
//
|
||||
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
|
||||
// indem Sie "*" wie unten gezeigt eingeben:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.5.1")]
|
||||
[assembly: AssemblyFileVersion("1.5.1")]
|
||||
128
Zway/Zway.csproj
128
Zway/Zway.csproj
@ -1,87 +1,59 @@
|
||||
<?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>{166258ED-CB3D-43F5-8E8D-3A993B64D022}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<RootNamespace>BlubbFish.IoT.Zway</RootNamespace>
|
||||
<AssemblyName>Zway</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>Zway.IoT.BlubbFish</PackageId>
|
||||
<Version>1.5.1</Version>
|
||||
<AssemblyVersion>1.5.1.0</AssemblyVersion>
|
||||
<FileVersion>1.5.1.0</FileVersion>
|
||||
<NeutralLanguage>de-DE</NeutralLanguage>
|
||||
<Description>Library that speaks with zwave module/server</Description>
|
||||
<Authors>BlubbFish</Authors>
|
||||
<Company>BlubbFish</Company>
|
||||
<Copyright>Copyright © 2017 - 09.01.2021</Copyright>
|
||||
<PackageLicenseFile>LICENCE</PackageLicenseFile>
|
||||
<PackageProjectUrl>https://git.blubbfish.net/vs_projects/Zway</PackageProjectUrl>
|
||||
<RepositoryUrl>https://git.blubbfish.net/vs_projects/Zway.git</RepositoryUrl>
|
||||
<RepositoryType>git</RepositoryType>
|
||||
<PackageReleaseNotes>1.5.1 Tiny fix for nullpointer exception
|
||||
1.5.0 Throw Exception if 3 times failed to connect to Raspberry server, add 3 new commandlcasses to IgnoredClasses
|
||||
1.4.4 Add Inclusioncontroller
|
||||
1.4.3 Fixing Issue with Math.Abs(l)
|
||||
1.4.2.0 Some sensors make wrong measurements near 0 not exactly 0, so ABS(value) >= 0.1 is alse false
|
||||
1.4.1.0 fixing Senml topics and data
|
||||
1.4.0.0 Create Senml Messages for Linksmart
|
||||
1.3.6.0 Better levelcheck and Alarmsensor added
|
||||
1.3.5.3 Change Level to numeric and create State for Bollean values, because telegraf only parse numeric
|
||||
1.3.5.2 Check to avoid megapeaks in data now also for temperature
|
||||
1.3.5.1 Check to avoid megapeaks in Data
|
||||
1.3.5.0 Add Sensorbinary, Alarm and SceneControllerConf and changed DeviceUpdateEvent so its not as complicate as before. Also fixing the gernal Json Names to the right values
|
||||
1.3.4.1 Fixing some Json Topics
|
||||
1.3.4.0 Fixing Json Names
|
||||
1.3.3.0 fixing polling once bug
|
||||
1.3.2.0 Forgot some settings, now configuration setting also works again
|
||||
1.3.1.0 Tiny fix for mqtt
|
||||
1.3.0.0 Remove Interface ICommandClass.cs and dublicated classes CommandClass.cs and CommandClassSub.cs, put them into the abstracted class ACommandClass.cs
|
||||
1.0.0.0 Telegram Condition</PackageReleaseNotes>
|
||||
</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="..\..\Librarys\litjson\litjson\litjson.csproj" />
|
||||
<ProjectReference Include="..\..\Utils\Iot-Interfaces\Iot-Interfaces\Iot-Interfaces.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="../CHANGELOG.md" />
|
||||
<Content Include="../CONTRIBUTING.md" />
|
||||
<Content Include="../LICENSE" />
|
||||
<Content Include="../README.md" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Devices\CommandClasses\Alarm.cs" />
|
||||
<Compile Include="Devices\CommandClasses\Battery.cs" />
|
||||
<Compile Include="Devices\CommandClasses\CommandClassSubs\Configurationsub.cs" />
|
||||
<Compile Include="Devices\CommandClasses\CommandClassSubs\Alarmsensorsub.cs" />
|
||||
<Compile Include="Devices\CommandClasses\CommandClassSubs\SceneControllerConfSub.cs" />
|
||||
<Compile Include="Devices\CommandClasses\CommandClassSubs\SensorBinarySub.cs" />
|
||||
<Compile Include="Devices\CommandClasses\CommandClassSubs\ThermostatSetPointSub.cs" />
|
||||
<Compile Include="Devices\CommandClasses\Configuration.cs" />
|
||||
<Compile Include="Devices\CommandClasses\Indicator.cs" />
|
||||
<Compile Include="Devices\CommandClasses\AlarmSensor.cs" />
|
||||
<Compile Include="Devices\CommandClasses\Meter.cs" />
|
||||
<Compile Include="Devices\CommandClasses\CommandClassSubs\MeterSub.cs" />
|
||||
<Compile Include="Devices\CommandClasses\CommandClassSubs\SensorMultilevelSub.cs" />
|
||||
<Compile Include="Devices\CommandClasses\SceneControllerConf.cs" />
|
||||
<Compile Include="Devices\CommandClasses\SensorBinary.cs" />
|
||||
<Compile Include="Devices\CommandClasses\Wakeup.cs" />
|
||||
<Compile Include="Devices\Device.cs" />
|
||||
<Compile Include="Interfaces\ACommandClass.cs" />
|
||||
<Compile Include="Devices\Instance.cs" />
|
||||
<Compile Include="Devices\CommandClasses\CentralScene.cs" />
|
||||
<Compile Include="Devices\CommandClasses\SensorMultilevel.cs" />
|
||||
<Compile Include="Devices\CommandClasses\SwitchBinary.cs" />
|
||||
<Compile Include="Devices\CommandClasses\ThermostatMode.cs" />
|
||||
<Compile Include="Devices\CommandClasses\SwitchMultilevel.cs" />
|
||||
<Compile Include="Devices\CommandClasses\ThermostatSetPoint.cs" />
|
||||
<Compile Include="Events\DeviceUpdateEvent.cs" />
|
||||
<Compile Include="Exceptions\ZwayExceptions.cs" />
|
||||
<Compile Include="lib\Helper.cs" />
|
||||
<Compile Include="lib\HttpClient.cs" />
|
||||
<Compile Include="ZwayController.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<None Include="..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj">
|
||||
<Project>{91a14cd2-2940-4500-8193-56d37edddbaa}</Project>
|
||||
<Name>litjson_4.7.1</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Utils\IoT\Interfaces\Iot-Interfaces.csproj">
|
||||
<Project>{4daada29-c600-4cf3-8ad3-9c97c8d7f632}</Project>
|
||||
<Name>Iot-Interfaces</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
|
||||
</Project>
|
||||
Loading…
Reference in New Issue
Block a user