Skip to content

Commit 291dd97

Browse files
alexdreskoalexdresko
authored
Merge pull request #100 from alexdresko/fixes
Fixes
2 parents 66590cf + f1a51ed commit 291dd97

Some content is hidden

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

62 files changed

+694
-641
lines changed

‎HSPI/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
55
</startup>
66
</configuration>

‎HSPI/HSPI.csproj‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Hspi</RootNamespace>
1111
<AssemblyName>Hspi</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1515
<PublishUrl>publish\</PublishUrl>
@@ -59,24 +59,56 @@
5959
<HintPath>..\packages\CommandLineParser.2.3.0\lib\net45\CommandLine.dll</HintPath>
6060
</Reference>
6161
<Reference Include="HomeSeerAPI, Version=1.0.2.1, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\packages\homeseer.1.1.0\lib\net45\HomeSeerAPI.dll</HintPath>
62+
<HintPath>..\packages\homeseer.1.2.8\lib\net45\HomeSeerAPI.dll</HintPath>
6363
</Reference>
6464
<Reference Include="HSCF, Version=1.0.0.2, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\packages\homeseer.1.1.0\lib\net45\HSCF.dll</HintPath>
65+
<HintPath>..\packages\homeseer.1.2.8\lib\net45\HSCF.dll</HintPath>
6666
</Reference>
6767
<Reference Include="Scheduler, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
68-
<HintPath>..\packages\homeseer.1.1.0\lib\net45\Scheduler.dll</HintPath>
68+
<HintPath>..\packages\homeseer.1.2.8\lib\net45\Scheduler.dll</HintPath>
6969
</Reference>
7070
<Reference Include="System" />
7171
<Reference Include="System.ComponentModel.Composition" />
7272
<Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7373
<HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
74+
<Private>True</Private>
75+
<Private>True</Private>
7476
</Reference>
7577
<Reference Include="System.Core" />
7678
<Reference Include="Microsoft.CSharp" />
79+
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
80+
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
81+
<Private>True</Private>
82+
<Private>True</Private>
83+
</Reference>
84+
<Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
85+
<HintPath>..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
86+
<Private>True</Private>
87+
<Private>True</Private>
88+
</Reference>
89+
<Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
90+
<HintPath>..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
91+
<Private>True</Private>
92+
<Private>True</Private>
93+
</Reference>
94+
<Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
95+
<HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
96+
<Private>True</Private>
97+
<Private>True</Private>
98+
</Reference>
7799
<Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78100
<HintPath>..\packages\System.Reflection.TypeExtensions.4.5.1\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
79101
</Reference>
102+
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
103+
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
104+
<Private>True</Private>
105+
<Private>True</Private>
106+
</Reference>
107+
<Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
108+
<HintPath>..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
109+
<Private>True</Private>
110+
<Private>True</Private>
111+
</Reference>
80112
<Reference Include="System.Xml" />
81113
</ItemGroup>
82114
<ItemGroup>

‎HSPI/packages.config‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CommandLineParser" version="2.3.0" targetFramework="net461" />
4-
<package id="HomeSeer" version="1.1.0" targetFramework="net461" />
5-
<package id="System.Collections" version="4.3.0" targetFramework="net461" />
6-
<package id="System.Console" version="4.3.1" targetFramework="net461" />
7-
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
8-
<package id="System.Globalization" version="4.3.0" targetFramework="net461" />
9-
<package id="System.IO" version="4.3.0" targetFramework="net461" />
10-
<package id="System.Linq" version="4.3.0" targetFramework="net461" />
11-
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
12-
<package id="System.Reflection" version="4.3.0" targetFramework="net461" />
13-
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
14-
<package id="System.Reflection.TypeExtensions" version="4.5.1" targetFramework="net461" />
15-
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
16-
<package id="System.Runtime" version="4.3.0" targetFramework="net461" />
17-
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
3+
<package id="CommandLineParser" version="2.3.0" targetFramework="net472" />
4+
<package id="homeseer" version="1.2.8" targetFramework="net472" />
5+
<package id="System.Collections" version="4.3.0" targetFramework="net472" />
6+
<package id="System.Console" version="4.3.1" targetFramework="net472" />
7+
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
8+
<package id="System.Globalization" version="4.3.0" targetFramework="net472" />
9+
<package id="System.IO" version="4.3.0" targetFramework="net472" />
10+
<package id="System.Linq" version="4.3.0" targetFramework="net472" />
11+
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net472" />
12+
<package id="System.Reflection" version="4.3.0" targetFramework="net472" />
13+
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net472" />
14+
<package id="System.Reflection.TypeExtensions" version="4.5.1" targetFramework="net472" />
15+
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net472" />
16+
<package id="System.Runtime" version="4.3.0" targetFramework="net472" />
17+
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net472" />
1818
</packages>

‎Templates/HSPIPluginA.Dev/App.config‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
1+
<?xml version="1.0" encoding="utf-8"?>
32
<configuration>
43
<startup>
5-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
65
</startup>
76
<runtime>
87
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
98
<!-- TODO: <probing privatePath="bin/$safeprojectname$" /> -->
10-
<probing privatePath="bin/PluginA.Dev" />
9+
<probing privatePath="bin/PluginA.Dev"/>
1110
</assemblyBinding>
1211
</runtime>
13-
</configuration>
12+
</configuration>

‎Templates/HSPIPluginA.Dev/HSPI.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using HomeSeerAPI;
44
using Hspi;
55

6-
//TODO: namespace $safeprojectname$
6+
//TODO: namespace HSPI_$safeprojectname$
77

88
namespace HSPIPluginA.Dev
99
{

‎Templates/HSPIPluginA.Dev/HSPIPluginA.Dev.csproj‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<RootNamespace>HSPIPluginA.Dev</RootNamespace>
1313
<AssemblyName>HSPI_PluginA.Dev</AssemblyName>
14-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
14+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1515
<FileAlignment>512</FileAlignment>
1616
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1717
<PlatformTarget>x86</PlatformTarget>
@@ -41,23 +41,55 @@
4141
<HintPath>..\..\packages\CommandLineParser.2.3.0\lib\net45\CommandLine.dll</HintPath>
4242
</Reference>
4343
<Reference Include="HomeSeerAPI, Version=1.0.2.1, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\..\packages\homeseer.1.1.0\lib\net45\HomeSeerAPI.dll</HintPath>
44+
<HintPath>..\..\packages\homeseer.1.2.8\lib\net45\HomeSeerAPI.dll</HintPath>
4545
</Reference>
4646
<Reference Include="HSCF, Version=1.0.0.2, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\homeseer.1.1.0\lib\net45\HSCF.dll</HintPath>
47+
<HintPath>..\..\packages\homeseer.1.2.8\lib\net45\HSCF.dll</HintPath>
4848
</Reference>
4949
<Reference Include="Scheduler, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\homeseer.1.1.0\lib\net45\Scheduler.dll</HintPath>
50+
<HintPath>..\..\packages\homeseer.1.2.8\lib\net45\Scheduler.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
5353
<Reference Include="System.ComponentModel.Composition" />
5454
<Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5555
<HintPath>..\..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
56+
<Private>True</Private>
57+
<Private>True</Private>
5658
</Reference>
5759
<Reference Include="System.Core" />
60+
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
61+
<HintPath>..\..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
62+
<Private>True</Private>
63+
<Private>True</Private>
64+
</Reference>
65+
<Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
66+
<HintPath>..\..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
67+
<Private>True</Private>
68+
<Private>True</Private>
69+
</Reference>
70+
<Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
71+
<HintPath>..\..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
72+
<Private>True</Private>
73+
<Private>True</Private>
74+
</Reference>
75+
<Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
76+
<HintPath>..\..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
77+
<Private>True</Private>
78+
<Private>True</Private>
79+
</Reference>
5880
<Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5981
<HintPath>..\..\packages\System.Reflection.TypeExtensions.4.5.1\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
6082
</Reference>
83+
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84+
<HintPath>..\..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
85+
<Private>True</Private>
86+
<Private>True</Private>
87+
</Reference>
88+
<Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
89+
<HintPath>..\..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
90+
<Private>True</Private>
91+
<Private>True</Private>
92+
</Reference>
6193
<Reference Include="System.Xml.Linq" />
6294
<Reference Include="System.Data.DataSetExtensions" />
6395
<Reference Include="Microsoft.CSharp" />

‎Templates/HSPIPluginA.Dev/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Hspi;
22

3-
//TODO: namespace $safeprojectname$
3+
//TODO: namespace HSPI_$safeprojectname$
44

55
namespace HSPIPluginA.Dev
66
{

‎Templates/HSPIPluginA.Dev/packages.config‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CommandLineParser" version="2.3.0" targetFramework="net461" />
4-
<package id="HomeSeer" version="1.1.0" targetFramework="net461" />
5-
<package id="System.Collections" version="4.3.0" targetFramework="net461" />
6-
<package id="System.Console" version="4.3.1" targetFramework="net461" />
7-
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
8-
<package id="System.Globalization" version="4.3.0" targetFramework="net461" />
9-
<package id="System.IO" version="4.3.0" targetFramework="net461" />
10-
<package id="System.Linq" version="4.3.0" targetFramework="net461" />
11-
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
12-
<package id="System.Reflection" version="4.3.0" targetFramework="net461" />
13-
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
14-
<package id="System.Reflection.TypeExtensions" version="4.5.1" targetFramework="net461" />
15-
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
16-
<package id="System.Runtime" version="4.3.0" targetFramework="net461" />
17-
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
3+
<package id="CommandLineParser" version="2.3.0" targetFramework="net472" />
4+
<package id="homeseer" version="1.2.8" targetFramework="net472" />
5+
<package id="System.Collections" version="4.3.0" targetFramework="net472" />
6+
<package id="System.Console" version="4.3.1" targetFramework="net472" />
7+
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
8+
<package id="System.Globalization" version="4.3.0" targetFramework="net472" />
9+
<package id="System.IO" version="4.3.0" targetFramework="net472" />
10+
<package id="System.Linq" version="4.3.0" targetFramework="net472" />
11+
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net472" />
12+
<package id="System.Reflection" version="4.3.0" targetFramework="net472" />
13+
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net472" />
14+
<package id="System.Reflection.TypeExtensions" version="4.5.1" targetFramework="net472" />
15+
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net472" />
16+
<package id="System.Runtime" version="4.3.0" targetFramework="net472" />
17+
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net472" />
1818
</packages>

‎Templates/HSPIPluginA/App.config‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
3-
<configuration>
4-
<startup>
5-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
6-
</startup>
7-
<runtime>
8-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
9-
<probing privatePath="bin/$safeprojectname$" /> </assemblyBinding>
10-
</runtime>
11-
</configuration>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
5+
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<probing privatePath="bin/$safeprojectname$" /> --> </assemblyBinding>
9+
</runtime>
10+
</configuration>

0 commit comments

Comments
 (0)