Permalink
Browse files

Fixed Installer: Advanced options page was not built/registered for VS80

  • Loading branch information...
1 parent a7d8a36 commit d4eef65ab98597061b88e0a53354c4d8ec0d7584 (no author) committed Mar 27, 2010
@@ -6,7 +6,7 @@
<book >
<title>Visual Assert</title>
<bookinfo>
- <releaseinfo>Release 1.0</releaseinfo>
+ <releaseinfo>Release 1.1</releaseinfo>
<author>Johannes Passing</author>
</bookinfo>
@@ -118,6 +118,12 @@
<Directory Id="CommonAppDataFolder">
<!-- BEGIN VS VERSION SPECIFIC -->
+
+ <!--
+ Note the escaping of XPath filter expressions:
+ For [ use [\[]
+ For ] use [\]]
+ -->
<Directory Id="DirAppDataMs80" Name="Microsft" LongName="Microsoft">
<Directory Id="DirAppDataMsVs80" Name="VisualSt" LongName="VisualStudio">
@@ -138,10 +144,16 @@
ElementPath="//Extensibility/HostApplication/Version"
Value="8.0"/>
<XmlFile
- Id="XmlConfigOptionsAssemblyVs80"
+ Id="XmlConfigOptionsWindbgAssemblyVs80"
+ Action="setValue"
+ File="[DirAppDataMsVs80Addins80]\Cfix.Addin.Addin"
+ ElementPath="//Extensibility/ToolsOptionsPage/Category/SubCategory[\[]@Name='WinDBG Integration'[\]]/Assembly"
+ Value="[DirBinI386]cfix.addin.80.dll"/>
+ <XmlFile
+ Id="XmlConfigOptionsAdvancedAssemblyVs80"
Action="setValue"
File="[DirAppDataMsVs80Addins80]\Cfix.Addin.Addin"
- ElementPath="//Extensibility/ToolsOptionsPage/Category/SubCategory/Assembly"
+ ElementPath="//Extensibility/ToolsOptionsPage/Category/SubCategory[\[]@Name='Advanced'[\]]/Assembly"
Value="[DirBinI386]cfix.addin.80.dll"/>
</Component>
</Directory>
@@ -168,10 +180,16 @@
ElementPath="//Extensibility/HostApplication/Version"
Value="9.0"/>
<XmlFile
- Id="XmlConfigOptionsAssemblyVs90"
+ Id="XmlConfigOptionsWinDbgAssemblyVs90"
+ Action="setValue"
+ File="[DirAppDataMsVs90Addins90]\Cfix.Addin.Addin"
+ ElementPath="//Extensibility/ToolsOptionsPage/Category/SubCategory[\[]@Name='WinDBG Integration'[\]]/Assembly"
+ Value="[DirBinI386]cfix.addin.90.dll"/>
+ <XmlFile
+ Id="XmlConfigOptionsAdvancedAssemblyVs90"
Action="setValue"
File="[DirAppDataMsVs90Addins90]\Cfix.Addin.Addin"
- ElementPath="//Extensibility/ToolsOptionsPage/Category/SubCategory/Assembly"
+ ElementPath="//Extensibility/ToolsOptionsPage/Category/SubCategory[\[]@Name='Advanced'[\]]/Assembly"
Value="[DirBinI386]cfix.addin.90.dll"/>
</Component>
</Directory>
View
@@ -213,6 +213,11 @@ signbinaries:
pad:
sed s/__VERSION__/$(VERSION)/ installer\pad.xml | sed s/__DAY__/$(NOW_DAY)/ | sed s/__MONTH__/$(NOW_MONTH)/ | sed s/__YEAR__/$(NOW_YEAR)/ > rtm\pad.xml
+test-installer: build docs
+ cd installer
+ $(MAKE) clean VisualAssert.msi
+ cd ..
+
installer: signbinaries docs
cd installer
$(MAKE) clean VisualAssert.msi
@@ -157,6 +157,12 @@
<Compile Include="Windows\ExplorerWindow.designer.cs">
<DependentUpon>ExplorerWindow.cs</DependentUpon>
</Compile>
+ <Compile Include="Windows\OptionsPageAdvanced.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="Windows\OptionsPageAdvanced.Designer.cs">
+ <DependentUpon>OptionsPageAdvanced.cs</DependentUpon>
+ </Compile>
<Compile Include="Windows\OptionsPageWindbg.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -217,6 +223,10 @@
<DependentUpon>ExplorerWindow.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Windows\OptionsPageAdvanced.resx">
+ <DependentUpon>OptionsPageAdvanced.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="Windows\OptionsPageWindbg.resx">
<DependentUpon>OptionsPageWindbg.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -136,6 +136,12 @@
<DesignTime>True</DesignTime>
<DependentUpon>Icons.resx</DependentUpon>
</Compile>
+ <Compile Include="Windows\OptionsPageAdvanced.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="Windows\OptionsPageAdvanced.Designer.cs">
+ <DependentUpon>OptionsPageAdvanced.cs</DependentUpon>
+ </Compile>
<Compile Include="Windows\OptionsPageWindbg.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -213,6 +219,10 @@
<SubType>Designer</SubType>
<DependentUpon>ExplorerWindow.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="Windows\OptionsPageAdvanced.resx">
+ <DependentUpon>OptionsPageAdvanced.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="Windows\OptionsPageWindbg.resx">
<SubType>Designer</SubType>
<DependentUpon>OptionsPageWindbg.cs</DependentUpon>
@@ -22,7 +22,7 @@
<FullClassName>Cfix.Addin.Windows.OptionsPageWindbg</FullClassName>
</SubCategory>
<SubCategory Name="Advanced">
- <Assembly>Cfix.Addin.xx.dll</Assembly>
+ <Assembly>D:\dev\wdev\cfixplus\trunk\bin\chk\i386\Cfix.Addin.80.dll</Assembly>
<FullClassName>Cfix.Addin.Windows.OptionsPageAdvanced</FullClassName>
</SubCategory>
</Category>
@@ -485,7 +485,7 @@ public uint HostRegistrationTimeout
{
object value = this.key.GetValue(
"HostRegistrationTimeout",
- Agent.DefaultHostRegistrationTimeout );
+ ( int ) Agent.DefaultHostRegistrationTimeout );
return ( uint ) ( int ) value;
}
set
@@ -508,7 +508,7 @@ public uint InstrumentedHostRegistrationTimeout
{
object value = this.key.GetValue(
"InstrumentedHostRegistrationTimeout",
- 50 * Agent.DefaultHostRegistrationTimeout );
+ ( int ) ( 50 * Agent.DefaultHostRegistrationTimeout ) );
return ( uint ) ( int ) value;
}
set

0 comments on commit d4eef65

Please sign in to comment.