diff --git a/Test.CM15/Properties/AssemblyInfo.cs b/Test.CM15/Properties/AssemblyInfo.cs deleted file mode 100644 index ae1dfb3..0000000 --- a/Test.CM15/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle ("Test.CM15")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("gene")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion ("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/Test.CM15/Test.CM15.csproj b/Test.CM15/Test.CM15.csproj index cef33e1..807fb7f 100644 --- a/Test.CM15/Test.CM15.csproj +++ b/Test.CM15/Test.CM15.csproj @@ -1,55 +1,14 @@ - - - - Debug - AnyCPU - {F294E092-807A-493C-85AD-BB8AA5C5AB22} - Exe - Test.CM15 - Test.CM15 - v4.5 - 1.0 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - true - - - full - true - bin\Release - prompt - 4 - true - - - - ..\packages\NLog.4.5.10\lib\net45\NLog.dll - True - - - - - - - - - - - {92933BA1-609C-4DE0-B29E-FDA37C7DC0EF} - XTenLib - - - - - PreserveNewest - - - - \ No newline at end of file + + + + Exe + net6.0 + enable + enable + + + + + + + diff --git a/Test.CM15/packages.config b/Test.CM15/packages.config deleted file mode 100644 index da189d0..0000000 --- a/Test.CM15/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/XTenLib.Tests/Properties/AssemblyInfo.cs b/XTenLib.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 1ea745c..0000000 --- a/XTenLib.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("XTenLib.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("XTenLib.Tests")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3F2ECBE2-8D4E-4363-88DE-29478CBFACF6")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/XTenLib.Tests/Tests.cs b/XTenLib.Tests/Tests.cs deleted file mode 100644 index 41d94d4..0000000 --- a/XTenLib.Tests/Tests.cs +++ /dev/null @@ -1,33 +0,0 @@ -/* - This file is part of XTenLib (https://github.com/genielabs/x10-lib-dotnet) - - Copyright (2012-2018) G-Labs (https://github.com/genielabs) - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -using System; -using NUnit.Framework; - -namespace XTenLib.Tests -{ - [TestFixture] - public class Tests - { - [Test] - public void Test1() - { - Assert.True(true); - } - } -} \ No newline at end of file diff --git a/XTenLib.Tests/UnitTest1.cs b/XTenLib.Tests/UnitTest1.cs new file mode 100644 index 0000000..d7fcfdc --- /dev/null +++ b/XTenLib.Tests/UnitTest1.cs @@ -0,0 +1,17 @@ +using NUnit.Framework; + +namespace XTenLib.Tests; + +public class Tests +{ + [SetUp] + public void Setup() + { + } + + [Test] + public void Test1() + { + Assert.Pass(); + } +} \ No newline at end of file diff --git a/XTenLib.Tests/XTenLib.Tests.csproj b/XTenLib.Tests/XTenLib.Tests.csproj index 8142481..65a4f7b 100644 --- a/XTenLib.Tests/XTenLib.Tests.csproj +++ b/XTenLib.Tests/XTenLib.Tests.csproj @@ -1,67 +1,17 @@ - - - - - - Debug - AnyCPU - {3F2ECBE2-8D4E-4363-88DE-29478CBFACF6} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - XTenLib.Tests - XTenLib.Tests - v4.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll - True - - - - - - - - - - - - - - - + + - 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}. + net6.0 + enable + + false - - - - \ No newline at end of file + + + + + + + + + diff --git a/XTenLib.Tests/packages.config b/XTenLib.Tests/packages.config deleted file mode 100644 index 391f728..0000000 --- a/XTenLib.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/XTenLib.sln b/XTenLib.sln index 3dac5dd..b355057 100644 --- a/XTenLib.sln +++ b/XTenLib.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XTenLib", "XTenLib\XTenLib.csproj", "{92933BA1-609C-4DE0-B29E-FDA37C7DC0EF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.CM15", "Test.CM15\Test.CM15.csproj", "{F294E092-807A-493C-85AD-BB8AA5C5AB22}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.CM15", "Test.CM15\Test.CM15.csproj", "{D4FA5123-46E8-4731-9D0F-6545C655FCCB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XTenLib.Tests", "XTenLib.Tests\XTenLib.Tests.csproj", "{3F2ECBE2-8D4E-4363-88DE-29478CBFACF6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XTenLib.Tests", "XTenLib.Tests\XTenLib.Tests.csproj", "{8DD58A35-6CD1-4D32-800C-81133311674B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,14 +17,14 @@ Global {92933BA1-609C-4DE0-B29E-FDA37C7DC0EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {92933BA1-609C-4DE0-B29E-FDA37C7DC0EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {92933BA1-609C-4DE0-B29E-FDA37C7DC0EF}.Release|Any CPU.Build.0 = Release|Any CPU - {F294E092-807A-493C-85AD-BB8AA5C5AB22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F294E092-807A-493C-85AD-BB8AA5C5AB22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F294E092-807A-493C-85AD-BB8AA5C5AB22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F294E092-807A-493C-85AD-BB8AA5C5AB22}.Release|Any CPU.Build.0 = Release|Any CPU - {3F2ECBE2-8D4E-4363-88DE-29478CBFACF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F2ECBE2-8D4E-4363-88DE-29478CBFACF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F2ECBE2-8D4E-4363-88DE-29478CBFACF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F2ECBE2-8D4E-4363-88DE-29478CBFACF6}.Release|Any CPU.Build.0 = Release|Any CPU + {D4FA5123-46E8-4731-9D0F-6545C655FCCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D4FA5123-46E8-4731-9D0F-6545C655FCCB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D4FA5123-46E8-4731-9D0F-6545C655FCCB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D4FA5123-46E8-4731-9D0F-6545C655FCCB}.Release|Any CPU.Build.0 = Release|Any CPU + {8DD58A35-6CD1-4D32-800C-81133311674B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8DD58A35-6CD1-4D32-800C-81133311674B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8DD58A35-6CD1-4D32-800C-81133311674B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8DD58A35-6CD1-4D32-800C-81133311674B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 diff --git a/XTenLib/Properties/AssemblyInfo.cs b/XTenLib/Properties/AssemblyInfo.cs deleted file mode 100644 index 6e271ae..0000000 --- a/XTenLib/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Le informazioni generali relative a un assembly sono controllate dal seguente -// set di attributi. Per modificare le informazioni associate a un assembly -// occorre quindi modificare i valori di questi attributi. -[assembly: AssemblyTitle("XTenLib")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("GenieLabs")] -[assembly: AssemblyProduct("XTenLib")] -[assembly: AssemblyCopyright("Copyright © 2012")] -[assembly: AssemblyTrademark("Generoso Martello")] -[assembly: AssemblyCulture("")] - -// Se si imposta ComVisible su false, i tipi in questo assembly non saranno visibili -// ai componenti COM. Se è necessario accedere a un tipo in questo assembly da -// COM, impostare su true l'attributo ComVisible per tale tipo. -[assembly: ComVisible(false)] - -// Se il progetto viene esposto a COM, il GUID che segue verrà utilizzato per creare l'ID della libreria dei tipi -[assembly: Guid("8bdf8c06-49d8-478a-bed0-abb29d064e7b")] - -// Le informazioni sulla versione di un assembly sono costituite dai seguenti quattro valori: -// -// Numero di versione principale -// Numero di versione secondario -// Numero build -// Revisione -// -// È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build -// utilizzando l'asterisco (*) come descritto di seguito: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/XTenLib/X10Module.cs b/XTenLib/X10Module.cs index 1b3c4fc..6a02e20 100644 --- a/XTenLib/X10Module.cs +++ b/XTenLib/X10Module.cs @@ -23,7 +23,6 @@ limitations under the License. #pragma warning disable 1591 -using System; using System.ComponentModel; namespace XTenLib diff --git a/XTenLib/XTenLib.csproj b/XTenLib/XTenLib.csproj index 3681dac..9d849ca 100644 --- a/XTenLib/XTenLib.csproj +++ b/XTenLib/XTenLib.csproj @@ -1,70 +1,36 @@ - - + - Debug - AnyCPU - {92933BA1-609C-4DE0-B29E-FDA37C7DC0EF} + XTenLib + 1.1.0 + Generoso Martello + G-Labs + X10 Home Automation library for .NET + + Features + - Supports both *CM11* and *CM15* hardware + - Event driven + - Hot plug + - Automatically restabilish connection on error/disconnect + - Compatible with Mono + ./LICENSE + https://github.com/genielabs/x10-lib-dotnet/ + x10 home automation cm11 cm15 + win8-arm;linux-arm;win10-x64;osx.10.11-x64;linux-x64 Library - Properties - XTenLib - XTenLib - 512 - v4.5 - 1.0 + net6.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\XTenLib.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\LibUsbDotNet.2.2.8\lib\LibUsbDotNet.dll - True - - - ..\packages\NLog.4.5.10\lib\net45\NLog.dll - True - - - - - - - - - - - - - - - - - + README.md - \ No newline at end of file + + + + + + + + diff --git a/XTenLib/XTenLib.nuspec b/XTenLib/XTenLib.nuspec deleted file mode 100644 index 3bd61fa..0000000 --- a/XTenLib/XTenLib.nuspec +++ /dev/null @@ -1,33 +0,0 @@ - - - - XTenLib - $version$ - XTenLib - Generoso Martello - G-Labs - https://github.com/genielabs/x10-lib-dotnet/blob/master/LICENSE - https://github.com/genielabs/x10-lib-dotnet/ - false - X10 Home Automation library for .Net / Mono - -Features -- Supports both *CM11* and *CM15* hardware -- Event driven -- Hot plug -- Automatically restabilish connection on error/disconnect -- Compatible with Mono - X10 Home Automation library for .Net / Mono - - G-Labs - x10 home automation cm11 cm15 - - - - - - - - - - diff --git a/XTenLib/XTenManager.cs b/XTenLib/XTenManager.cs index 278b0a0..1b21eff 100644 --- a/XTenLib/XTenManager.cs +++ b/XTenLib/XTenManager.cs @@ -226,7 +226,7 @@ public void Disconnect() if (connectionWatcher != null) { if (!connectionWatcher.Join(5000)) - connectionWatcher.Abort(); + connectionWatcher.Interrupt(); connectionWatcher = null; } disconnectRequested = false; @@ -849,7 +849,7 @@ private void Close() if (reader != null) { if (!reader.Join(5000)) - reader.Abort(); + reader.Interrupt(); reader = null; } OnConnectionStatusChanged(new ConnectionStatusChangedEventArgs(false)); diff --git a/XTenLib/nuget_pack.ps1 b/XTenLib/nuget_pack.ps1 index 928f5ef..8c3122c 100644 --- a/XTenLib/nuget_pack.ps1 +++ b/XTenLib/nuget_pack.ps1 @@ -1,17 +1,18 @@ $project = "XTenLib" $root = (split-path -parent $MyInvocation.MyCommand.Definition) + '\..' -#$version = [System.Reflection.Assembly]::LoadFile("$root\$project\bin\Debug\$project.dll").GetName().Version $versionStr = "{0}" -f ($env:APPVEYOR_REPO_TAG_NAME) if (-not ([string]::IsNullOrEmpty($versionStr))) { - Write-Host "Setting $project .nuspec version tag to $versionStr" + Write-Host "Setting $project .csproj version tag to $versionStr" - $content = (Get-Content $root\$project\$project.nuspec) - $content = $content -replace '\$version\$',$versionStr + $content = (Get-Content $root\$project\$project.csproj) + $content = $content -replace '(?<=\).*?(?=\)',$versionStr - $content | Out-File $root\$project\$project.compiled.nuspec + $content | Out-File $root\$project\$project.csproj - & nuget pack $root\$project\$project.compiled.nuspec + & dotnet pack $root\$project -o . +} +else { + Write-Host "Version string is empty, possibly dry run or APPVEYOR_REPO_TAG_NAME environment variable is not set" } - diff --git a/appveyor.yml b/appveyor.yml index cd71194..2812d79 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ -version: 1.0.{build} -image: Visual Studio 2015 -configuration: Debug +version: 1.1.{build} +image: Visual Studio 2022 +configuration: Release before_build: - nuget restore build: @@ -15,23 +15,20 @@ after_test: artifacts: - path: .\XTenLib\bin\Debug\XTenLib.dll name: XTenLib - type: File - path: '*.nupkg' name: XTenLib nupkg - type: NuGetPackage deploy: - provider: GitHub auth_token: - secure: 1aMBEFi1qBAoV4H+LYx7hoVLgXJfndGoQ8I8qjLsoxXNA1zS+zgQHi2zVlRrmw1v + secure: q0rRgZDDKmOASUrMCHGUlPh34wIipSYKWJiDeiwftkB7hLH/QyYhNL5MckCyse+1 draft: false prerelease: false on: appveyor_repo_tag: true - provider: NuGet api_key: - secure: nFeqkA4BfbPz0Fpqo0Q5+/Y1ISiQ/lGEj3oqH07+XUo9S3FrixM0ENcd2hj3UARu + secure: xe7KBrpDVPQYOr4XpJNPs2/9vdT5lO/qV5z8Qrv3yXWd6kQScl3UfB5WaF7olbfy skip_symbols: false artifact: /.*\.nupkg/ on: appveyor_repo_tag: true -