Modified the whole solution to use Any CPU, and changed the installer to use the /register /unregister commands
This commit is contained in:
@@ -39,7 +39,7 @@
|
|||||||
<OutputPath>bin\x86\Debug\</OutputPath>
|
<OutputPath>bin\x86\Debug\</OutputPath>
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
|
|||||||
@@ -18,41 +18,6 @@
|
|||||||
Vital="yes"
|
Vital="yes"
|
||||||
Assembly=".net"
|
Assembly=".net"
|
||||||
AssemblyApplication="filFocuserDriverAssembly" />
|
AssemblyApplication="filFocuserDriverAssembly" />
|
||||||
<!-- Registry entries suitable for a LocalServer served class -->
|
|
||||||
<!-- HKCR\CLSID\{driver-guid} -->
|
|
||||||
<RegistryKey Root="HKCR" Key="CLSID">
|
|
||||||
<RegistryKey Key="$(var.FocuserDriverClassId)">
|
|
||||||
<RegistryValue Value="$(var.FocuserDriverProgId)" Type="string"/>
|
|
||||||
<RegistryValue Name="AppId" Value="$(var.LocalServerAppId)" Type="string"/>
|
|
||||||
<RegistryKey Key="Implemented Categories">
|
|
||||||
<RegistryKey Key="{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}"
|
|
||||||
ForceCreateOnInstall="yes"
|
|
||||||
ForceDeleteOnUninstall="yes"/>
|
|
||||||
</RegistryKey>
|
|
||||||
<RegistryKey Key="ProgId">
|
|
||||||
<RegistryValue Value="$(var.FocuserDriverProgId)" Type="string"/>
|
|
||||||
</RegistryKey>
|
|
||||||
<RegistryKey Key="Programmable"
|
|
||||||
ForceCreateOnInstall="yes"
|
|
||||||
ForceDeleteOnUninstall="yes" />
|
|
||||||
<RegistryKey Key="LocalServer32">
|
|
||||||
<RegistryValue Value="[#filLocalServerAssembly]" Type="string"/>
|
|
||||||
</RegistryKey>
|
|
||||||
</RegistryKey>
|
|
||||||
</RegistryKey>
|
|
||||||
|
|
||||||
<!-- HKCR\{driver-prog-id} -->
|
|
||||||
<RegistryKey Root="HKCR" Key="$(var.FocuserDriverProgId)">
|
|
||||||
<RegistryValue Value="$(var.FocuserDriverDescription)" Type="string"/>
|
|
||||||
<RegistryKey Key="CLSID">
|
|
||||||
<RegistryValue Value="$(var.FocuserDriverClassId)" Type="string" />
|
|
||||||
</RegistryKey>
|
|
||||||
</RegistryKey>
|
|
||||||
|
|
||||||
<!--Register the driver with the ASCOM Profile-->
|
|
||||||
<RegistryKey Root="HKLM" Key="SOFTWARE\ASCOM\Focuser Drivers\$(var.FocuserDriverProgId)">
|
|
||||||
<RegistryValue Value="$(var.FocuserDriverDescription)" Type="string"/>
|
|
||||||
</RegistryKey>
|
|
||||||
</Component>
|
</Component>
|
||||||
</ComponentGroup>
|
</ComponentGroup>
|
||||||
</Fragment>
|
</Fragment>
|
||||||
|
|||||||
@@ -12,21 +12,31 @@
|
|||||||
Assembly=".net"
|
Assembly=".net"
|
||||||
AssemblyApplication="filLocalServerAssembly" />
|
AssemblyApplication="filLocalServerAssembly" />
|
||||||
</Component>
|
</Component>
|
||||||
<Component Id="cmpLocalServerRegistry" Win64="no">
|
|
||||||
<!-- LocalServer32 COM Registration -->
|
|
||||||
<RegistryKey Root="HKCR" Key="AppID" >
|
|
||||||
<!-- HKCR\AppID\{my-app-id} -->
|
|
||||||
<RegistryKey Key="$(var.LocalServerAppId)">
|
|
||||||
<RegistryValue Value="$(var.InstallName)" Type="string"/>
|
|
||||||
<RegistryValue Name="AppID" Value="$(var.LocalServerAppId)" Type="string"/>
|
|
||||||
<RegistryValue Name="AuthenticationLevel" Value="1" Type="integer"/>
|
|
||||||
</RegistryKey>
|
|
||||||
<!-- HKCR\AppID\{exe-name} -->
|
|
||||||
<RegistryKey Key="$(var.Meade.net.TargetFileName)">
|
|
||||||
<RegistryValue Name="AppID" Value="$(var.LocalServerAppId)" Type="string"/>
|
|
||||||
</RegistryKey>
|
|
||||||
</RegistryKey>
|
|
||||||
</Component>
|
|
||||||
</ComponentGroup>
|
</ComponentGroup>
|
||||||
|
|
||||||
|
<CustomAction Id="RegisterEXE"
|
||||||
|
Directory="INSTALLFOLDER"
|
||||||
|
ExeCommand=""[#filLocalServerAssembly]" /register"
|
||||||
|
Execute="deferred"
|
||||||
|
Return="ignore"
|
||||||
|
Impersonate="no"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<CustomAction Id="UnRegisterEXE"
|
||||||
|
Directory="INSTALLFOLDER"
|
||||||
|
ExeCommand=""[#filLocalServerAssembly]" /unregister"
|
||||||
|
Execute="deferred"
|
||||||
|
Return="ignore"
|
||||||
|
Impersonate="no"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<InstallExecuteSequence>
|
||||||
|
<Custom Action='RegisterEXE' Before="InstallFinalize">
|
||||||
|
<![CDATA[(NOT Installed)]]>
|
||||||
|
</Custom>
|
||||||
|
<Custom Action="UnRegisterEXE" After='RegisterEXE'>
|
||||||
|
<![CDATA[(REMOVE ~= "ALL")]]>
|
||||||
|
</Custom>
|
||||||
|
</InstallExecuteSequence>
|
||||||
</Fragment>
|
</Fragment>
|
||||||
</Wix>
|
</Wix>
|
||||||
@@ -18,41 +18,6 @@
|
|||||||
Vital="yes"
|
Vital="yes"
|
||||||
Assembly=".net"
|
Assembly=".net"
|
||||||
AssemblyApplication="filTelescopeDriverAssembly" />
|
AssemblyApplication="filTelescopeDriverAssembly" />
|
||||||
<!-- Registry entries suitable for a LocalServer served class -->
|
|
||||||
<!-- HKCR\CLSID\{driver-guid} -->
|
|
||||||
<RegistryKey Root="HKCR" Key="CLSID">
|
|
||||||
<RegistryKey Key="$(var.TelescopeDriverClassId)">
|
|
||||||
<RegistryValue Value="$(var.TelescopeDriverProgId)" Type="string"/>
|
|
||||||
<RegistryValue Name="AppId" Value="$(var.LocalServerAppId)" Type="string"/>
|
|
||||||
<RegistryKey Key="Implemented Categories">
|
|
||||||
<RegistryKey Key="{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}"
|
|
||||||
ForceCreateOnInstall="yes"
|
|
||||||
ForceDeleteOnUninstall="yes"/>
|
|
||||||
</RegistryKey>
|
|
||||||
<RegistryKey Key="ProgId">
|
|
||||||
<RegistryValue Value="$(var.TelescopeDriverProgId)" Type="string"/>
|
|
||||||
</RegistryKey>
|
|
||||||
<RegistryKey Key="Programmable"
|
|
||||||
ForceCreateOnInstall="yes"
|
|
||||||
ForceDeleteOnUninstall="yes" />
|
|
||||||
<RegistryKey Key="LocalServer32">
|
|
||||||
<RegistryValue Value="[#filLocalServerAssembly]" Type="string"/>
|
|
||||||
</RegistryKey>
|
|
||||||
</RegistryKey>
|
|
||||||
</RegistryKey>
|
|
||||||
|
|
||||||
<!-- HKCR\{driver-prog-id} -->
|
|
||||||
<RegistryKey Root="HKCR" Key="$(var.TelescopeDriverProgId)">
|
|
||||||
<RegistryValue Value="$(var.TelescopeDriverDescription)" Type="string"/>
|
|
||||||
<RegistryKey Key="CLSID">
|
|
||||||
<RegistryValue Value="$(var.TelescopeDriverClassId)" Type="string" />
|
|
||||||
</RegistryKey>
|
|
||||||
</RegistryKey>
|
|
||||||
|
|
||||||
<!--Register the driver with the ASCOM Profile-->
|
|
||||||
<RegistryKey Root="HKLM" Key="SOFTWARE\ASCOM\Telescope Drivers\$(var.TelescopeDriverProgId)">
|
|
||||||
<RegistryValue Value="$(var.TelescopeDriverDescription)" Type="string"/>
|
|
||||||
</RegistryKey>
|
|
||||||
</Component>
|
</Component>
|
||||||
</ComponentGroup>
|
</ComponentGroup>
|
||||||
</Fragment>
|
</Fragment>
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<Prefer32Bit>false</Prefer32Bit>
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
||||||
<OutputPath>..\bin\Debug\</OutputPath>
|
<OutputPath>..\bin\Debug\</OutputPath>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="ASCOM.Astrometry, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
|
<Reference Include="ASCOM.Astrometry, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
|
||||||
|
|||||||
@@ -66,7 +66,7 @@
|
|||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
<RegisterForComInterop>true</RegisterForComInterop>
|
<RegisterForComInterop>true</RegisterForComInterop>
|
||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -68,7 +68,7 @@
|
|||||||
<OutputPath>..\bin\Debug\</OutputPath>
|
<OutputPath>..\bin\Debug\</OutputPath>
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||||
<Prefer32Bit>true</Prefer32Bit>
|
<Prefer32Bit>true</Prefer32Bit>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<Optimize>false</Optimize>
|
<Optimize>false</Optimize>
|
||||||
|
|||||||
Reference in New Issue
Block a user