Skip to content

Commit 144cd7a

Browse files
genemarsgenemars
authored
Merge branch 'master' into master
2 parents b88d644 + f3fb24f commit 144cd7a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+820
-946
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
*.suo
1111
*.pidb
1212
Thumbs.db
13+
.idea
1314

1415
# Nuget packages
15-
packages/*
16+
packages
1617
!packages/repositories.config
1718

1819
# IDEs

‎CONTRIBUTING.md

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Contributing
2+
3+
## How to contribute to this repository
4+
5+
#### **Did you find a bug?**
6+
7+
* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/genielabs/mig-service-dotnet/issues).
8+
9+
* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/genielabs/mig-service-dotnet/issues/new).
10+
Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
11+
12+
#### **Did you write a patch that fixes a bug?**
13+
14+
* Open a new GitHub pull request with the patch.
15+
16+
* Ensure the PR description clearly describes the problem and solution.
17+
Include the relevant issue number if applicable.
18+
19+
#### **Did you fix whitespace, format code, or make a purely cosmetic patch?**
20+
21+
Changes that are cosmetic in nature and do not add anything substantial to the stability, functionality,
22+
or testability of this project, will generally not be accepted unless discussed via the [issue tracker](https://github.com/genielabs/mig-service-dotnet/issues).
23+
24+
#### **Do you intend to add a new feature or change an existing one?**
25+
26+
File a new *[enhancement issue](https://github.com/genielabs/mig-service-dotnet/issues/new?labels=enhancement)*.
27+
28+
#### **Do you have questions about the source code?**
29+
30+
File a new *[question issue](https://github.com/genielabs/mig-service-dotnet/issues/new?labels=question)*.
31+
32+
#### **Coding styles and conventions**
33+
34+
This project follows *Microsoft .Net* [coding conventions](https://docs.microsoft.com/dotnet/csharp/programming-guide/inside-a-program/coding-conventions) and [naming guidelines](https://docs.microsoft.com/en-us/dotnet/standard/design-guidelines/capitalization-conventions).
35+
36+
##### Releasing a new version
37+
38+
To release a new version push a new tag using the format:
39+
40+
`<major>.<minor>.<build>`
41+
42+
examples: `1.0.19`, `1.0.20-pre1`
43+
44+
When a new tag is submitted the CI system will build the project, run tests and package assets (.dll and .nupkg distribution files). The NuGet package will be automatically published and assets will be also uploaded to the new release tag on GitHub repository.
45+
46+
#### Join SerialPortLib team!
47+
48+
SerialPortLib is a volunteer effort. We encourage you to pitch in and join the team!
49+
50+
Thanks! :heart:
51+

‎LICENSE

+201-674
Large diffs are not rendered by default.

‎MIG.HomeAutomation/MIG.HomeAutomation.csproj

+37-18
Original file line numberDiff line numberDiff line change
@@ -31,31 +31,50 @@
3131
<ConsolePause>false</ConsolePause>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="System" />
35-
<Reference Include="System.Xml" />
36-
<Reference Include="LibUsbDotNet">
37-
<HintPath>..\packages\LibUsbDotNet.2.2.8\lib\LibUsbDotNet.dll</HintPath>
34+
<Reference Include="ICSharpCode.SharpZipLib, Version=1.0.0.999, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
35+
<HintPath>..\packages\SharpZipLib.1.0.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
36+
<Private>True</Private>
3837
</Reference>
39-
<Reference Include="Microsoft.CSharp" />
40-
<Reference Include="NLog">
41-
<HintPath>..\packages\NLog.4.1.0\lib\net45\NLog.dll</HintPath>
38+
<Reference Include="LibUsb.Common, Version=2.2.0.0, Culture=neutral, PublicKeyToken=null">
39+
<HintPath>..\packages\LibUsb.Common.2.2.18\lib\net45\LibUsb.Common.dll</HintPath>
40+
<Private>True</Private>
4241
</Reference>
43-
<Reference Include="XTenLib">
44-
<HintPath>..\packages\XTenLib.1.0.7\lib\XTenLib.dll</HintPath>
42+
<Reference Include="LibUsbDotNet.LibUsbDotNet, Version=2.2.0.0, Culture=neutral, PublicKeyToken=null">
43+
<HintPath>..\packages\LibUsbDotNet.2.2.18\lib\net45\LibUsbDotNet.LibUsbDotNet.dll</HintPath>
44+
<Private>True</Private>
4545
</Reference>
46-
<Reference Include="System.Xml.Linq" />
47-
<Reference Include="ICSharpCode.SharpZipLib">
48-
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
46+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
47+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
48+
<Private>True</Private>
4949
</Reference>
50-
<Reference Include="System.Net" />
51-
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
52-
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
50+
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
51+
<HintPath>..\packages\NLog.4.5.10\lib\net45\NLog.dll</HintPath>
52+
<Private>True</Private>
53+
</Reference>
54+
<Reference Include="SerialPortLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
55+
<HintPath>..\packages\SerialPortLib.1.0.16\lib\SerialPortLib.dll</HintPath>
56+
<Private>True</Private>
5357
</Reference>
54-
<Reference Include="SerialPortLib">
55-
<HintPath>..\packages\SerialPortLib.1.0.12\lib\SerialPortLib.dll</HintPath>
58+
<Reference Include="System" />
59+
<Reference Include="System.Configuration" />
60+
<Reference Include="System.Core" />
61+
<Reference Include="System.Data" />
62+
<Reference Include="System.IO.Compression" />
63+
<Reference Include="System.Runtime.Serialization" />
64+
<Reference Include="System.ServiceModel" />
65+
<Reference Include="System.Transactions" />
66+
<Reference Include="System.Windows.Forms" />
67+
<Reference Include="System.Xml" />
68+
<Reference Include="Microsoft.CSharp" />
69+
<Reference Include="System.Xml.Linq" />
70+
<Reference Include="System.Net" />
71+
<Reference Include="XTenLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
72+
<HintPath>..\packages\XTenLib.1.0.10\lib\XTenLib.dll</HintPath>
73+
<Private>True</Private>
5674
</Reference>
5775
<Reference Include="ZWaveLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
58-
<HintPath>..\packages\ZWaveLib.1.0.15\lib\ZWaveLib.dll</HintPath>
76+
<HintPath>..\packages\ZWaveLib.1.0.17\lib\ZWaveLib.dll</HintPath>
77+
<Private>True</Private>
5978
</Reference>
6079
</ItemGroup>
6180
<ItemGroup>

‎MIG.HomeAutomation/ModuleEvents.cs

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
/*
2-
This file is part of MIG Project source code.
2+
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
3+
4+
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
35
4-
MIG is free software: you can redistribute it and/or modify
5-
it under the terms of the GNU General Public License as published by
6-
the Free Software Foundation, either version 3 of the License, or
7-
(at your option) any later version.
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
89
9-
MIG is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
GNU General Public License for more details.
10+
http://www.apache.org/licenses/LICENSE-2.0
1311
14-
You should have received a copy of the GNU General Public License
15-
along with MIG. If not, see <http://www.gnu.org/licenses/>.
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
1617
*/
1718

1819
/*

‎MIG.HomeAutomation/X10.cs

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
/*
2-
This file is part of MIG Project source code.
2+
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
3+
4+
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
35
4-
MIG is free software: you can redistribute it and/or modify
5-
it under the terms of the GNU General Public License as published by
6-
the Free Software Foundation, either version 3 of the License, or
7-
(at your option) any later version.
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
89
9-
MIG is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
GNU General Public License for more details.
10+
http://www.apache.org/licenses/LICENSE-2.0
1311
14-
You should have received a copy of the GNU General Public License
15-
along with MIG. If not, see <http://www.gnu.org/licenses/>.
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
1617
*/
1718

1819
/*

‎MIG.HomeAutomation/ZWave.cs

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
/*
2-
This file is part of MIG Project source code.
2+
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
3+
4+
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
35
4-
MIG is free software: you can redistribute it and/or modify
5-
it under the terms of the GNU General Public License as published by
6-
the Free Software Foundation, either version 3 of the License, or
7-
(at your option) any later version.
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
89
9-
MIG is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
GNU General Public License for more details.
10+
http://www.apache.org/licenses/LICENSE-2.0
1311
14-
You should have received a copy of the GNU General Public License
15-
along with MIG. If not, see <http://www.gnu.org/licenses/>.
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
1617
*/
1718

1819
/*

‎MIG.HomeAutomation/packages.config

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="LibUsbDotNet" version="2.2.8" targetFramework="net45" />
4-
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
5-
<package id="NLog" version="4.1.0" targetFramework="net45" />
6-
<package id="SerialPortLib" version="1.0.12" targetFramework="net45" />
7-
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
8-
<package id="XTenLib" version="1.0.7" targetFramework="net45" />
9-
<package id="ZWaveLib" version="1.0.15" targetFramework="net45" />
3+
<package id="LibUsb.Common" version="2.2.18" targetFramework="net45" />
4+
<package id="LibUsbDotNet" version="2.2.18" targetFramework="net45" />
5+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
6+
<package id="NLog" version="4.5.10" targetFramework="net45" />
7+
<package id="SerialPortLib" version="1.0.16" targetFramework="net45" />
8+
<package id="SharpZipLib" version="1.0.0" targetFramework="net45" />
9+
<package id="XTenLib" version="1.0.10" targetFramework="net45" />
10+
<package id="ZWaveLib" version="1.0.17" targetFramework="net45" />
1011
</packages>

‎MIG.Protocols/UPnP.cs

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
/*
2-
This file is part of MIG Project source code.
2+
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
3+
4+
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
35
4-
MIG is free software: you can redistribute it and/or modify
5-
it under the terms of the GNU General Public License as published by
6-
the Free Software Foundation, either version 3 of the License, or
7-
(at your option) any later version.
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
89
9-
MIG is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
GNU General Public License for more details.
10+
http://www.apache.org/licenses/LICENSE-2.0
1311
14-
You should have received a copy of the GNU General Public License
15-
along with MIG. If not, see <http://www.gnu.org/licenses/>.
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
1617
*/
1718

1819
/*

‎MIG.Tests/MIG.Tests.csproj

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
4+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
5+
<PropertyGroup>
6+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8+
<ProjectGuid>{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}</ProjectGuid>
9+
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10+
<OutputType>Library</OutputType>
11+
<AppDesignerFolder>Properties</AppDesignerFolder>
12+
<RootNamespace>MIG.Tests</RootNamespace>
13+
<AssemblyName>MIG.Tests</AssemblyName>
14+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
15+
<FileAlignment>512</FileAlignment>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18+
<PlatformTarget>AnyCPU</PlatformTarget>
19+
<DebugSymbols>true</DebugSymbols>
20+
<DebugType>full</DebugType>
21+
<Optimize>false</Optimize>
22+
<OutputPath>bin\Debug\</OutputPath>
23+
<DefineConstants>DEBUG;TRACE</DefineConstants>
24+
<ErrorReport>prompt</ErrorReport>
25+
<WarningLevel>4</WarningLevel>
26+
</PropertyGroup>
27+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28+
<PlatformTarget>AnyCPU</PlatformTarget>
29+
<DebugType>pdbonly</DebugType>
30+
<Optimize>true</Optimize>
31+
<OutputPath>bin\Release\</OutputPath>
32+
<DefineConstants>TRACE</DefineConstants>
33+
<ErrorReport>prompt</ErrorReport>
34+
<WarningLevel>4</WarningLevel>
35+
</PropertyGroup>
36+
<ItemGroup>
37+
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
38+
<HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
39+
<Private>True</Private>
40+
</Reference>
41+
<Reference Include="System" />
42+
<Reference Include="System.Core" />
43+
<Reference Include="System.Data" />
44+
<Reference Include="System.Xml" />
45+
</ItemGroup>
46+
<ItemGroup>
47+
<Compile Include="Tests.cs" />
48+
<Compile Include="Properties\AssemblyInfo.cs" />
49+
</ItemGroup>
50+
<ItemGroup>
51+
<None Include="packages.config" />
52+
</ItemGroup>
53+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
54+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
55+
<PropertyGroup>
56+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
57+
</PropertyGroup>
58+
<Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
59+
</Target>
60+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
61+
Other similar extension points exist, see Microsoft.Common.targets.
62+
<Target Name="BeforeBuild">
63+
</Target>
64+
<Target Name="AfterBuild">
65+
</Target>
66+
-->
67+
</Project>

‎MIG.Tests/Properties/AssemblyInfo.cs

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
using System.Reflection;
2+
using System.Runtime.InteropServices;
3+
4+
// General Information about an assembly is controlled through the following
5+
// set of attributes. Change these attribute values to modify the information
6+
// associated with an assembly.
7+
[assembly: AssemblyTitle("MIG.Tests")]
8+
[assembly: AssemblyDescription("")]
9+
[assembly: AssemblyConfiguration("")]
10+
[assembly: AssemblyCompany("")]
11+
[assembly: AssemblyProduct("MIG.Tests")]
12+
[assembly: AssemblyCopyright("Copyright © 2018")]
13+
[assembly: AssemblyTrademark("")]
14+
[assembly: AssemblyCulture("")]
15+
16+
// Setting ComVisible to false makes the types in this assembly not visible
17+
// to COM components. If you need to access a type in this assembly from
18+
// COM, set the ComVisible attribute to true on that type.
19+
[assembly: ComVisible(false)]
20+
21+
// The following GUID is for the ID of the typelib if this project is exposed to COM
22+
[assembly: Guid("5074EC2B-D316-4EEB-9A6F-563728CBEDF3")]
23+
24+
// Version information for an assembly consists of the following four values:
25+
//
26+
// Major Version
27+
// Minor Version
28+
// Build Number
29+
// Revision
30+
//
31+
// You can specify all the values or you can default the Build and Revision Numbers
32+
// by using the '*' as shown below:
33+
// [assembly: AssemblyVersion("1.0.*")]
34+
[assembly: AssemblyVersion("1.0.0.0")]
35+
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)