CM15A on 64 bit

Automate1 · Jul 31, 2013 · 004dc88 · 004dc88
1 parent 0e10907
commit 004dc88
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 44 deletions.
diff --git a/Plugins/OSAE.CM15A/CM15A.osapd b/Plugins/OSAE.CM15A/CM15A.osapd
@@ -2,13 +2,13 @@
 <plugin-description xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="3.0">
 <plugin-name>CM15A</plugin-name>
 <plugin-id>031d1870-2202-4e5d-9d1a-648158d44230</plugin-id>
-<plugin-version>1.1.0</plugin-version>
+<plugin-version>1.1.1</plugin-version>
 <plugin-state>stable</plugin-state>
 <short-description>X10 CM15A/19A Plugin</short-description>
 <author>Vaughn Rupp</author>
 <destination-folder>CM15A</destination-folder>
 <main-file>OSAE.CM15A.dll</main-file>
-<wiki-url></wiki-url>
+<wiki-url>http://www.opensourceautomation.com/wiki/index.php?title=CM15A</wiki-url>
 <additional-assemblies>
 <name>Interop.ActiveHomeScriptLib.dll</name>
 </additional-assemblies>

diff --git a/Plugins/OSAE.CM15A/Interop.ActiveHomeScriptLib.dll b/Plugins/OSAE.CM15A/Interop.ActiveHomeScriptLib.dll
diff --git a/Plugins/OSAE.CM15A/My Project/AssemblyInfo.vb b/Plugins/OSAE.CM15A/My Project/AssemblyInfo.vb
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("")> 
 <Assembly: AssemblyProduct("CM15A")> 
-<Assembly: AssemblyCopyright("Copyright ©  2010")> 
+<Assembly: AssemblyCopyright("Copyright ©  2013")> 
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.0.0")> 
-<Assembly: AssemblyFileVersion("1.0.0.0")> 
+<Assembly: AssemblyVersion("1.1.1.0")> 
+<Assembly: AssemblyFileVersion("1.1.1.0")> 
diff --git a/Plugins/OSAE.CM15A/OSAE.CM15A.sln b/Plugins/OSAE.CM15A/OSAE.CM15A.sln
diff --git a/Plugins/OSAE.CM15A/OSAE.CM15A.vb b/Plugins/OSAE.CM15A/OSAE.CM15A.vb
@@ -2,7 +2,7 @@
 Option Explicit On
 Imports MySql.Data.MySqlClient
 Imports ActiveHomeScriptLib
-Imports System.AddIn
+Imports X10
 
 Public Class CM15A
     Inherits OSAEPluginBase

diff --git a/Plugins/OSAE.CM15A/OSAE.CM15A.vbproj b/Plugins/OSAE.CM15A/OSAE.CM15A.vbproj
@@ -42,11 +42,11 @@
     <DebugType>full</DebugType>
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
-    <OutputPath>..\..\output\PlugIns\CM15A\</OutputPath>
+    <OutputPath>..\..\output\Plugins\CM15A\</OutputPath>
     <DocumentationFile>OSAE.CM15A.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -63,12 +63,11 @@
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x86\Debug\</OutputPath>
+    <OutputPath>..\..\output\Plugins\CM15A\</OutputPath>
     <DocumentationFile>OSAE.CM15A.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisLogFile>..\..\output\AddIns\CM15A\OSAE.CM15A.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.vb</CodeAnalysisModuleSuppressionsFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -94,11 +93,6 @@
     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Interop.ActiveHomeScriptLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>.\Interop.ActiveHomeScriptLib.dll</HintPath>
-    </Reference>
     <Reference Include="MySql.Data">
       <HintPath>..\..\Assemblies\MySql.Data.dll</HintPath>
       <Private>False</Private>
@@ -154,7 +148,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="CM15A.osapd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
@@ -184,6 +178,9 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="ahscript.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="ahsdk_install.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -204,6 +201,26 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="ActiveHomeScriptLib">
+      <Guid>{001000AF-1DEF-0010-10B6-DC5BA692C858}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="X10">
+      <Guid>{001000AF-1DEF-0001-10B6-DC5BA692C858}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Plugins/OSAE.CM15A/ahscript.dll b/Plugins/OSAE.CM15A/ahscript.dll
diff --git a/Plugins/OSAE.CM15A/ahsdk_install.exe b/Plugins/OSAE.CM15A/ahsdk_install.exe
diff --git a/Plugins/OSAE.CM15A/install.sql b/Plugins/OSAE.CM15A/install.sql
@@ -27,4 +27,4 @@ CALL osae_sp_object_type_method_add ('BRIGHT','Bright','X10 DIMMER','Increment %
 CALL osae_sp_object_type_method_add ('DIM','Dim','X10 DIMMER','Decrement %','','10','');
 CALL osae_sp_object_type_property_add ('Off Timer','Integer','','X10 DIMMER',0);
 CALL osae_sp_object_type_property_add ('Level','Integer','','X10 DIMMER',1);
-CALL osae_sp_object_type_property_add ('SoftStart','Boolean','FALSE','X10 DIMMER',0);
+CALL osae_sp_object_type_property_add ('SoftStart','Boolean','FALSE','X10 DIMMER',0);