[bistro-framework] r443 committed - Changes for 0.9.3.0 setup (complete VS 2008,2010 support)
2 views
Skip to first unread message
codesite...@google.com
May 14, 2010, 8:24:01 AM5/14/10
to bistro-d...@googlegroups.com
Revision: 443
Author: sasha_...@mail.ru
Date: Fri May 14 05:22:05 2010
Log: Changes for 0.9.3.0 setup (complete VS 2008,2010 support)
http://code.google.com/p/bistro-framework/source/detail?r=443
Added:
/Bistro/trunk/Bistro.SetupWiX/Templates/ItemTemplates/Bistro/CSharpControllers.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/CSharp.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/FSharp.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/CSharp.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/FSharp.zip
/Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix
/Bistro/trunk/Bistro.SetupWiX/lib/NDjango.BistroIntegration2008.dll
/Bistro/trunk/Bistro.SetupWiX/lib/NDjango.BistroIntegration2010.dll
/Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2008.msi
/Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2010.msi
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2008.dll
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.vsix
Deleted:
/Bistro/trunk/Bistro.SetupWiX/Templates/BistroController.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/FSharp.zip
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender.dll
Modified:
/Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi
/Bistro/trunk/Bistro.SetupWiX/ExtenderReg.wxi
/Bistro/trunk/Bistro.SetupWiX/Setup.wxs
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.dll
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.pkgdef
=======================================
--- /dev/null
+++
/Bistro/trunk/Bistro.SetupWiX/Templates/ItemTemplates/Bistro/CSharpControllers.zip
Fri May 14 05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/CSharp.zip Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/FSharp.zip Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/CSharp.zip Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/FSharp.zip Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/NDjango.BistroIntegration2008.dll Fri
May 14 05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/NDjango.BistroIntegration2010.dll Fri
May 14 05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2008.msi Fri May 14
05:22:05 2010
File is too large to display a diff.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2010.msi Fri May 14
05:22:05 2010
File is too large to display a diff.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2008.dll Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.vsix Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Templates/BistroController.zip Mon Mar 29
04:37:50 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Templates/FSharp.zip Fri Apr 30 05:13:47
2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender.dll Fri Apr 30
05:13:47 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Fri Apr 30
05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Fri May 14
05:22:05 2010
@@ -49,8 +49,8 @@
<!--Non generated part-->
<!--Writning installation path into registry. Later EditTemplates
utility can use this info to update references-->
- <RegistryKey Root="HKLM" Key="Software\Hill30\Bistro" >
+ <!--<RegistryKey Root="HKLM" Key="Software\Hill30\Bistro" >
<RegistryValue Name="InstallDir" Type="string" Value="[INSTALLDIR]" />
- </RegistryKey>
+ </RegistryKey>-->
</Include>
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/ExtenderReg.wxi Fri Apr 30 05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/ExtenderReg.wxi Fri May 14 05:22:05 2010
@@ -4,18 +4,18 @@
<Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\InstalledProducts\ProjectExtenderPackage"
Value="#110" Type="string">
<Registry Name="Package"
Value="{5a8f5a4d-d1eb-403e-85b3-63df607fa07c}" Type="string" />
<Registry Name="ProductDetails" Value="#112" Type="string" />
- <Registry Name="PID" Value="0.9" Type="string" />
+ <Registry Name="PID" Value="1.0" Type="string" />
<Registry Name="LogoID" Value="#400" Type="string" />
</Registry>
- <Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\Packages\{5a8f5a4d-d1eb-403e-85b3-63df607fa07c}"
Value="FSharp.ProjectExtender.ProjectExtenderPackage, ProjectExtender,
Version=0.9.0.0, Culture=neutral, PublicKeyToken=null" Type="string">
+ <Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\Packages\{5a8f5a4d-d1eb-403e-85b3-63df607fa07c}"
Value="FSharp.ProjectExtender.ProjectExtenderPackage, ProjectExtender2008,
Version=0.9.1.0, Culture=neutral, PublicKeyToken=null" Type="string">
<Registry Name="InprocServer32" Value="[SystemFolder]mscoree.dll"
Type="string" />
<Registry Name="Class"
Value="FSharp.ProjectExtender.ProjectExtenderPackage" Type="string" />
- <Registry Name="Assembly" Value="ProjectExtender, Version=0.9.0.0,
Culture=neutral, PublicKeyToken=null" Type="string" />
- <Registry Name="CodeBase" Value="[INSTALLDIR]ProjectExtender.dll"
Type="string" />
+ <Registry Name="Assembly" Value="ProjectExtender2008, Version=0.9.1.0,
Culture=neutral, PublicKeyToken=null" Type="string" />
+ <Registry Name="CodeBase" Value="[INSTALLDIR]ProjectExtender2008.dll"
Type="string" />
<Registry Name="ID" Value="100" Type="integer" />
<Registry Name="MinEdition" Value="Standard" Type="string" />
- <Registry Name="ProductVersion" Value="0.9" Type="string" />
+ <Registry Name="ProductVersion" Value="1.0" Type="string" />
<Registry Name="ProductName" Value="F# Project System Extender"
Type="string" />
<Registry Name="CompanyName" Value="Hill30 Inc" Type="string" />
</Registry>
@@ -27,7 +27,7 @@
<Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\CLSID\{a5fc3bbd-8795-42d0-aa55-e65fe992378e}"
Value="FSharp.ProjectExtender.Page" Type="string">
<Registry Name="InprocServer32" Value="[SystemFolder]mscoree.dll"
Type="string" />
<Registry Name="Class" Value="FSharp.ProjectExtender.Page"
Type="string" />
- <Registry Name="CodeBase" Value="[INSTALLDIR]ProjectExtender.dll"
Type="string" />
+ <Registry Name="CodeBase" Value="[INSTALLDIR]ProjectExtender2008.dll"
Type="string" />
<Registry Name="ThreadingModel" Value="Both" Type="string" />
</Registry>
@@ -36,9 +36,11 @@
<Registry Name="Package"
Value="{5a8f5a4d-d1eb-403e-85b3-63df607fa07c}" Type="string" />
</Registry>
- <Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\NewProjectTemplates\TemplateDirs\{5a8f5a4d-d1eb-403e-85b3-63df607fa07c}\/1"
Value="ProjectExtender" Type="string">
- <Registry Name="SortPriority" Value="100" Type="integer" />
- </Registry>
+ <Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\NewProjectTemplates\TemplateDirs\{5a8f5a4d-d1eb-403e-85b3-63df607fa07c}\/1"
Value="ProjectExtender" Type="string">
+ <!--<Registry Name="SortPriority" Value="100" Type="integer" />
+ <Registry Name="DisplayName" Value="Visual F#" Type="string"/>-->
+ <Registry Name="Language(VsTemplate)" Value="FSharp" Type="string"/>
+</Registry>
<RegistryKey Root="HKLM" Key="Software\Hill30\ProjectExtender" >
<RegistryValue Name="InstallDir" Type="string" Value="[INSTALLDIR]" />
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Setup.wxs Fri Apr 30 05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Setup.wxs Fri May 14 05:22:05 2010
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?define ProductVersion="0.9.2" ?>
- <?define ProductVersionTitle="0.9.2.0" ?>
+ <?define ProductVersion="0.9.3" ?>
+ <?define ProductVersionTitle="0.9.3.0" ?>
<?define VisualStudioRegistryRoot2008
= "Software\Microsoft\VisualStudio\9.0" ?>
<?define VisualStudioRegistryRoot2010
= "Software\Microsoft\VisualStudio\10.0" ?>
<?define UpgradeCode="{E63B2D78-54C6-4d2a-B3EF-219EF3AE8FBC}"?>
- <Product Id="FDEC07EB-0817-4B10-850C-3DDC05AAD540" Name="Bistro
$(var.ProductVersionTitle)" Language="1033" Version="$(var.ProductVersion)"
Manufacturer="Hill30" UpgradeCode="$(var.UpgradeCode)">
+ <Product Id="B0655900-8078-4342-8CA0-AB5A8583C5A3" Name="Bistro
$(var.ProductVersionTitle)" Language="1033" Version="$(var.ProductVersion)"
Manufacturer="Hill30" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="200" Compressed="yes" />
<!--BE70CEDF718001B458C0D3CD50AA5D04-->
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
@@ -54,7 +54,9 @@
<Property Id="DEVENV_EXE_PATH2010">
<RegistrySearch Id="RegSearch_DevenvExe_Path2010" Root="HKLM"
Key="$(var.VisualStudioRegistryRoot2010)\Setup\VS" Name="EnvironmentPath"
Type="raw" />
</Property>
- <Condition Message="This application requires Visual Studio 2008.
Please install the Visual Studio 2008 then run this installer
again.">Installed OR VS2008FOUND</Condition>
+ <Property Id="VSIX_PATH"/>
+
+ <Condition Message="This application requires Visual Studio
2008/2010. Please install the Visual Studio IDE then run this installer
again.">Installed OR VS2008FOUND OR VS2010FOUND</Condition>
<Condition Message="This application requires .NET Framework
3.5SP1. Please install the .NET Framework 3.5SP1 then run this installer
again."><![CDATA[Installed OR (NETFRAMEWORK35_SP_LEVEL and NOT
NETFRAMEWORK35_SP_LEVEL = "#0")]]></Condition>
<WixVariable Id="WixUILicenseRtf" Value="License.rtf"
Overridable="yes" />
<WixVariable Id="WixUIBannerBmp" Value="bitmaps\bannrbmp.bmp" />
@@ -65,35 +67,59 @@
<Directory Id="INSTALLDIR" Name="Bistro">
<Component Id="BistroAssemblies"
Guid="EA80C8A8-63BE-4D5E-BACB-9FA941CD0C7C">
<RemoveFolder Id="RemoveMain"
Directory="INSTALLDIR" On="uninstall" />
+ <RegistryValue Root="HKLM"
Key="Software\Hill30\Bistro" Name="InstallDir" Type="string"
Value="[INSTALLDIR]" KeyPath="yes" />
<File Id="Bistro.Core.dll"
Name="Bistro.Core.dll" Source="lib\Bistro.Core.dll" DiskId="1" />
<File Id="Bistro.Extensions.dll"
Name="Bistro.Extensions.dll" Source="lib\Bistro.Extensions.dll" DiskId="1"
/>
<File Id="Bistro.FSharpExtensions.dll"
Name="Bistro.FSharpExtensions.dll" Source="lib\Bistro.FSharpExtensions.dll"
/>
<File Id="Newtonsoft.Json.dll"
Name="Newtonsoft.Json.dll" Source="..\lib\Newtonsoft.Json.dll" />
- <File Id="NDjango.BistroIntegration.dll"
Name="$(var.BistroIntegration.TargetFileName)"
Source="$(var.BistroIntegration.TargetPath)" />
- <File Id="NDJANGO" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetupExtended.msi" />
+ <!--<File Id="NDjango.BistroIntegration.dll"
Name="$(var.BistroIntegration.TargetFileName)"
Source="$(var.BistroIntegration.TargetPath)" />-->
<File Id="BistroDesigner"
Name="Bistro.Designer.dll" Source="lib\Bistro.Designer.dll" DiskId="1" />
</Component>
+ <Component Id="Integration08"
Guid="107F0C00-5F85-4F65-BB23-E11B6878E5C6">
+ <Condition><![CDATA[VS2008FOUND <>
NULL]]></Condition>
+ <File Id="NDjango.BistroIntegration2008.dll"
Name="NDjango.BistroIntegration2008.dll"
Source="lib\NDjango.BistroIntegration2008.dll"/>
+ </Component>
+ <Component Id="Integration10"
Guid="CF62EA41-2566-4ECE-90EB-BD6594836B39">
+ <Condition><![CDATA[VS2010FOUND <>
NULL]]></Condition>
+ <File Id="NDjango.BistroIntegration2010.dll"
Name="NDjango.BistroIntegration2010.dll"
Source="lib\NDjango.BistroIntegration2010.dll"/>
+ </Component>
+ <Component Id="NDjangoMSI2008"
Guid="05FCB39B-E868-42A4-B508-958EA17050A3">
+ <Condition><![CDATA[VS2010FOUND =
NULL]]></Condition>
+ <File Id="NDJANGO08" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2008.msi" />
+ </Component>
+ <Component Id="NDjangoMSI2010"
Guid="7D7CCB7A-68A4-4E05-AA89-5A985C680559">
+ <Condition><![CDATA[VS2010FOUND <>
NULL]]></Condition>
+ <File Id="NDJANGO10" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2010.msi" />
+ </Component>
+
<Component Id="ReadmeBistro"
Guid="2F2DC3B8-A256-4AF2-B1D9-20C89AF5645A">
<File Id="ReadmeBistro" Name="Readme.txt"
ShortName="README.TXT" Source="Readme.txt" />
</Component>
<Component Id="ProjectExtender"
Guid="AA80C8A8-63BE-4D5E-BACB-9FA941CD0C7C">
- <File Id="ProjectExtender.dll"
Name="ProjectExtender.dll" Source="lib\ProjectExtender.dll" DiskId="1" />
+ <File Id="ProjectExtender.dll"
Name="ProjectExtender2008.dll" Source="lib\ProjectExtender2008.dll"
DiskId="1" />
+ </Component>
+ <Component Id="Extender2010"
Guid="D613ED0B-D741-47E1-9F2A-8547009EEA25">
+ <File Id="ProjectExtender.vsix"
Name="ProjectExtender2010.vsix" Source="lib\ProjectExtender2010.vsix"
DiskId="1"/>
+ </Component>
+ <Component Id="BistroDesigner2010"
Guid="61D1E34E-57BA-4559-AC69-957A399903E3">
+ <File Id="BistroDesigner2010.vsix"
Name="BistroDesigner2010.vsix" Source="lib\BistroDesigner2010.vsix"
DiskId="1"/>
</Component>
</Directory>
</Directory>
</Directory>
- <Directory Id="ENVDIR_2008" Name="EnvDir">
+ <Directory Id="ENVDIR_2008" Name="EnvDir08">
<Directory Id="ProjectTemplates2008"
Name="ProjectTemplates">
<Directory Id="ProjectTemplatesBistro2008"
Name="Bistro">
<Component Id="ProjectTemplates2008"
Guid="7F1095EE-D392-4596-B931-21CB35374251">
<RemoveFolder Id="ProjectTemplatesBistro2008"
Directory="ProjectTemplatesBistro2008" On="uninstall" />
<RegistryValue Root="HKCU"
Key="Software\Hill30\Bistro Designer\[ProductVersion]" Name="installed"
Type="integer" Value="1" KeyPath="yes" />
- <File Id="FSharp2008.zip"
Name="FSharp2008.zip" Source="Templates\FSharp.zip" />
- <File Id="BistroProject2008.zip"
Name="BistroProject2008.zip" Source="Templates\VS2008\BistroProject.zip" />
+ <File Id="FSharp2008.zip"
Name="FSharp2008.zip" Source="Templates\VS2008\FSharp.zip" />
+ <File Id="CSharp2008.zip"
Name="CSharp2008.zip" Source="Templates\VS2008\CSharp.zip" />
</Component>
</Directory>
</Directory>
<Directory Id="ItemTemplates2008" Name="ItemTemplates">
+
<Directory Id="ItemTemplatesBistro2008" Name="Bistro">
<Component Id="InstalledItemTemplates2008"
Guid="B67DD6E5-F6A5-49E8-853D-BE4D05CA8005">
<RemoveFolder Id="ItemTemplatesBistro2008"
Directory="ItemTemplatesBistro2008" On="uninstall" />
@@ -106,6 +132,7 @@
<File Id="Text2008.zip" Name="Text2008.zip"
Source="Templates\ItemTemplates\Bistro\Text.zip" />
<File Id="WebConfig2008.zip"
Name="WebConfig2008.zip"
Source="Templates\ItemTemplates\Bistro\WebConfig.zip" />
<File Id="WebHTMLPage2008.zip"
Name="WebHTMLPage2008.zip"
Source="Templates\ItemTemplates\Bistro\WebHTMLPage.zip" />
+
</Component>
</Directory>
</Directory>
@@ -115,10 +142,52 @@
<Component Id="CustomItemTemplates2008"
Guid="8EDB5431-75F6-4BF9-A183-BC6ACCBC90BD">
<RemoveFolder Id="vs2008Web1"
Directory="vs2008Web1" On="uninstall" />
<RegistryValue Root="HKCU"
Key="Software\Hill30\Bistro\[ProductVersion]" Name="installed"
Type="integer" Value="1" KeyPath="yes" />
- <File Id="BistroController2008"
Name="BistroController2008.zip" Source="Templates\BistroController.zip" />
+ <File Id="CSharpController2008"
Name="CSharpController2008.zip"
Source="Templates\ItemTemplates\Bistro\CSharpControllers.zip" />
</Component>
</Directory>
</Directory>
+
+ <Directory Id="ENVDIR_2010" Name="EnvDir10">
+ <Directory Id="ProjectTemplates2010"
Name="ProjectTemplates">
+ <Directory Id="ProjectTemplatesBistro2010"
Name="Bistro">
+ <Component Id="ProjectTemplates2010"
Guid="F56B6B59-1881-48ED-B84F-F2CB181C6162">
+ <RemoveFolder Id="ProjectTemplatesBistro2010"
Directory="ProjectTemplatesBistro2010" On="uninstall" />
+ <RegistryValue Root="HKCU"
Key="Software\Hill30\Bistro Designer\[ProductVersion]" Name="installed"
Type="integer" Value="1" KeyPath="yes" />
+ <File Id="FSharp2010.zip"
Name="FSharp2010.zip" Source="Templates\VS2010\FSharp.zip" />
+ <File Id="CSharp2010.zip"
Name="CSharp2010.zip" Source="Templates\VS2010\CSharp.zip" />
+ </Component>
+ </Directory>
+ </Directory>
+ <Directory Id="ItemTemplates2010" Name="ItemTemplates">
+
+ <Directory Id="ItemTemplatesBistro2010" Name="Bistro">
+ <Component Id="InstalledItemTemplates2010"
Guid="05DDE197-2323-4DE0-B0BB-450A008624CE">
+ <RemoveFolder Id="ItemTemplatesBistro2010"
Directory="ItemTemplatesBistro2010" On="uninstall" />
+ <RegistryValue Root="HKCU"
Key="Software\Hill30\Bistro Designer\[ProductVersion]" Name="installed"
Type="integer" Value="1" KeyPath="yes" />
+ <File Id="BrowserFile2010.zip"
Name="BrowserFile2010.zip"
Source="Templates\ItemTemplates\Bistro\BrowserFile.zip" />
+ <File Id="FSharpControllers2010.zip"
Name="FSharpControllers2010.zip"
Source="Templates\ItemTemplates\Bistro\FSharpControllers.zip" />
+ <File Id="JScript2010.zip"
Name="JScript2010.zip" Source="Templates\ItemTemplates\Bistro\JScript.zip"
/>
+ <File Id="NDjango2010.zip"
Name="NDjango2010.zip" Source="Templates\ItemTemplates\Bistro\NDjango.zip"
/>
+ <File Id="StyleSheet2010.zip"
Name="StyleSheet2010.zip"
Source="Templates\ItemTemplates\Bistro\StyleSheet.zip" />
+ <File Id="Text2010.zip" Name="Text2010.zip"
Source="Templates\ItemTemplates\Bistro\Text.zip" />
+ <File Id="WebConfig2010.zip"
Name="WebConfig2010.zip"
Source="Templates\ItemTemplates\Bistro\WebConfig.zip" />
+ <File Id="WebHTMLPage2010.zip"
Name="WebHTMLPage2010.zip"
Source="Templates\ItemTemplates\Bistro\WebHTMLPage.zip" />
+ </Component>
+ </Directory>
+ </Directory>
+ <Directory Id="VS2010ITEMTEMPLATESLOCATION">
+ <Directory Id="vs2010Web1" Name="Web">
+ <Component Id="CustomItemTemplates2010"
Guid="B3F465CF-D137-49FD-B0AD-12A48E461482">
+ <RemoveFolder Id="vs2010Web1"
Directory="vs2010Web1" On="uninstall" />
+ <RegistryValue Root="HKCU"
Key="Software\Hill30\Bistro\[ProductVersion]" Name="installed"
Type="integer" Value="1" KeyPath="yes" />
+ <File Id="CSharpController2010"
Name="CSharpController2010.zip"
Source="Templates\ItemTemplates\Bistro\CSharpControllers.zip" />
+ </Component>
+ </Directory>
+ </Directory>
+ </Directory>
+
+
+
<Component Id="RegistryDesignerVSX2008" DiskId="1"
Guid="5F720FC6-EC7C-44E2-BEE4-8130CE1B3F09">
<?include BistroDesigner2008Reg.wxi?>
</Component>
@@ -126,32 +195,73 @@
<?include ExtenderReg.wxi?>
</Component>
</Directory>
+
<Feature Id="ProductFeature" Level="1">
- <ComponentRef Id="ProjectExtender" />
<ComponentRef Id="BistroAssemblies" />
<ComponentRef Id="ReadmeBistro" />
</Feature>
<Feature Id="Registry2008" Title="Visual Studio 2008 integration"
Level="1">
+ <Condition Level="0"><![CDATA[VS2008FOUND = NULL]]></Condition>
+ <ComponentRef Id="ProjectExtender" />
<ComponentRef Id="ProjectTemplates2008" />
<ComponentRef Id="InstalledItemTemplates2008" />
<ComponentRef Id="CustomItemTemplates2008" />
<ComponentRef Id="RegistryDesignerVSX2008" />
<ComponentRef Id="RegistryProjectExtender" />
+ <ComponentRef Id="Integration08"/>
</Feature>
+ <Feature Id="VS10Extensions" Title="Visual Studio 2010
integration" Level="1">
+ <Condition Level="0"><![CDATA[VS2010FOUND = NULL]]></Condition>
+ <ComponentRef Id="Extender2010"/>
+ <ComponentRef Id="BistroDesigner2010"/>
+ <ComponentRef Id="ProjectTemplates2010" />
+ <ComponentRef Id="InstalledItemTemplates2010" />
+ <ComponentRef Id="CustomItemTemplates2010" />
+ <ComponentRef Id="Integration10"/>
+
+ </Feature>
+ <Feature Id="NDjango" Level="1">
+ <ComponentRef Id="NDjangoMSI2008"/>
+ <ComponentRef Id="NDjangoMSI2010"/>
+ </Feature>
+
<Binary Id="EditTemplates" SourceFile="versionWriterFull.exe" />
- <Property Id="WixShellExecTarget"
Value="[INSTALLDIR]\NDjangoSetup.msi" />
- <Property Id="NDJANGONEEDED" Value="Yes" />
- <CustomAction Id="InstallNDjango" BinaryKey="WixCA"
DllEntry="WixShellExec" Impersonate="yes" />
- <CustomAction Id="CA_DevenvSetup2008"
Property="DEVENV_EXE_PATH2008" ExeCommand="/setup" Impersonate="no"
Execute="commit" />
- <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]BistroProject2008.zip""
Id="EditBistroProject2008CustomAction" Return="ignore" Execute="commit" />
+ <Property Id="WixShellExecTarget"
Value="[INSTALLDIR]\NDjangoSetup.msi"/>
+ <Property Id="NDJANGONEEDED" Value="1" />
+ <CustomAction Id="InstallNDjango" BinaryKey="WixCA"
DllEntry="WixShellExec" Impersonate="yes"/>
+ <CustomAction Id="DevenvSetup2008" Property="DEVENV_EXE_PATH2008"
ExeCommand="/setup" Impersonate="no" Execute="commit" />
+ <CustomAction Id="DevenvSetup2010" Property="DEVENV_EXE_PATH2010"
ExeCommand="/setup" Impersonate="no" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]CSharp2008.zip""
Id="EditBistroProject2008CustomAction" Return="ignore" Execute="commit" />
<CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]FSharp2008.zip""
Id="EditFSharp2008CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]CSharp2010.zip""
Id="EditBistroProject2010CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]FSharp2010.zip""
Id="EditFSharp2010CustomAction" Return="ignore" Execute="commit" />
+
+
+ <CustomAction Id="InstallExtender2010" Property = "VSIX_PATH"
ExeCommand=""[INSTALLDIR]\ProjectExtender2010.vsix""
Return="check" Execute="deferred" />
+ <CustomAction Id="InstallBistroDesigner2010" Property
= "VSIX_PATH"
ExeCommand=""[INSTALLDIR]\BistroDesigner2010.vsix""
Return="check" Execute="deferred"/>
+ <CustomAction Id="SetExtensionDir" Property="EXTENSIONHILL30FILES"
Value="[LocalAppDataFolder]\Microsoft\VisualStudio\10.0\Extensions\Hill30
Inc"/>
+ <CustomAction Id="DeleteExtender2010" Directory = "INSTALLDIR"
ExeCommand=""cmd.exe" /c rmdir /s /q
"[EXTENSIONHILL30FILES]\F# Project System Extender""
Return="ignore"/>
+ <CustomAction Id="DeleteDesigner2010" Directory = "INSTALLDIR"
ExeCommand=""cmd.exe" /c rmdir /s /q
"[EXTENSIONHILL30FILES]\Bistro Designer"" Return="ignore"/>
+ <CustomAction Id="SetVSIXPath" Property="VSIX_PATH"
Value="[ENVDIR_2010]\vsixinstaller.exe"/>
+
<InstallExecuteSequence>
+ <RemoveExistingProducts Before ="InstallInitialize" />
<!--It is important to update templates before calling devenv
/setup-->
- <Custom Action="EditBistroProject2008CustomAction"
After="WriteRegistryValues"><![CDATA[Not Installed OR (Installer AND REMOVE
<> "ALL")]]></Custom>
- <Custom Action="EditFSharp2008CustomAction"
After="EditBistroProject2008CustomAction"><![CDATA[Not Installed OR
(Installer AND REMOVE <> "ALL")]]></Custom>
- <Custom Action="CA_DevenvSetup2008"
After="EditFSharp2008CustomAction" />
+ <Custom Action="EditBistroProject2008CustomAction"
After="WriteRegistryValues"><![CDATA[(Not Installed AND VS2008FOUND <>
NULL) OR (Installer AND REMOVE <> "ALL")]]></Custom>
+ <Custom Action="EditFSharp2008CustomAction"
After="EditBistroProject2008CustomAction"><![CDATA[(Not Installed AND
VS2008FOUND <> NULL) OR (Installer AND REMOVE <> "ALL")]]></Custom>
+ <Custom Action="EditBistroProject2010CustomAction"
After="WriteRegistryValues"><![CDATA[(Not Installed AND VS2010FOUND <>
NULL) OR (Installer AND REMOVE <> "ALL")]]></Custom>
+ <Custom Action="EditFSharp2010CustomAction"
After="EditBistroProject2010CustomAction"><![CDATA[(Not Installed AND
VS2010FOUND <> NULL)OR (Installer AND REMOVE <> "ALL")]]></Custom>
+ <Custom Action="DevenvSetup2008"
Before="InstallFinalize"><![CDATA[(Not Installed AND VS2008FOUND <> NULL)
OR (Installer AND REMOVE <> "ALL") ]]></Custom>
+ <Custom Action="DevenvSetup2010"
Before="InstallFinalize"><![CDATA[(Not Installed AND VS2010FOUND <> NULL)
OR (Installer AND REMOVE <> "ALL")]]></Custom>
+ <!--Run vsixinstaller.exe to install VS2010 extensions
correctly-->
+ <Custom Action="SetVSIXPath"
Before="InstallFinalize"><![CDATA[Not Installed AND VS2010FOUND <>
NULL]]></Custom>
+ <Custom Action="InstallExtender2010"
After="SetVSIXPath"><![CDATA[Not Installed AND VS2010FOUND <>
NULL]]></Custom>
+ <Custom Action="InstallBistroDesigner2010"
After="InstallExtender2010"><![CDATA[Not Installed AND VS2010FOUND <>
NULL]]></Custom>
+ <Custom Action="SetExtensionDir"
After="InstallInitialize"><![CDATA[REMOVE]]></Custom>
+ <Custom Action="DeleteExtender2010"
After="SetExtensionDir"><![CDATA[REMOVE]]></Custom>
+ <Custom Action="DeleteDesigner2010"
After="DeleteExtender2010"><![CDATA[REMOVE]]></Custom>
+ <!--Run NdjangoSetup.msi if the option is chosen-->
<Custom Action="InstallNDjango"
After="InstallFinalize"><![CDATA[(Not Installed OR (Installer AND REMOVE
<> "ALL")) AND NDJANGONEEDED]]></Custom>
- <RemoveExistingProducts
After="InstallFinalize"></RemoveExistingProducts>
</InstallExecuteSequence>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
<!--********UI********-->
@@ -219,8 +329,8 @@
<Control Id="ChangeFolder" Type="PushButton" X="20"
Y="120" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)">
</Control>
<Control Type="CheckBox" Id="NDjangoCheckBox" Width="230"
Height="17" X="22" Y="169" Property="NDJANGONEEDED" CheckBoxValue="Yes"
Text="Install NDjango">
- <Condition Action="enable"><![CDATA[ VS2008FOUND <>
NULL ]]></Condition>
- <Condition Action="disable"><![CDATA[ VS2008FOUND =
NULL ]]></Condition>
+ <!--<Condition Action="enable"><![CDATA[ VS2008FOUND
<> NULL ]]></Condition>
+ <Condition Action="disable"><![CDATA[ VS2008FOUND =
NULL ]]></Condition>-->
</Control>
<Control Type="Text" Id="NDjangoNote" Width="350"
Height="17" X="20" Y="190" Text="NOTE: You will not able to use Bistro
applications with .django views without NDjango" />
</Dialog>
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.dll Fri Apr 30
05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.dll Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.pkgdef Fri Apr 30
05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.pkgdef Fri May 14
05:22:05 2010
@@ -4,16 +4,15 @@
@="#110"
"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
"ProductDetails"="#112"
-"PID"="0.9"
+"PID"="1.0"
"LogoID"="#400"
[$RootKey$\Packages\{40049e67-3a71-47c2-adfa-87b89aa56b50}]
-@="Bistro.Designer.DesignerPackage, Bistro.Designer, Version=0.9.0.0,
Culture=neutral, PublicKeyToken=null"
+@="Bistro.Designer.DesignerPackage, Bistro.Designer, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null"
"InprocServer32"="%windir%\\system32\\mscoree.dll"
"Class"="Bistro.Designer.DesignerPackage"
-"Assembly"="Bistro.Designer, Version=0.9.0.0, Culture=neutral,
PublicKeyToken=null"
-"CodeBase"="[BISTRODIR]Bistro.Designer.dll"
+"Assembly"="Bistro.Designer, Version=1.0.0.0, Culture=neutral,
PublicKeyToken=null"
[$RootKey$\Packages\{40049e67-3a71-47c2-adfa-87b89aa56b50}]
-"ID"=dword:00000001
+"ID"=dword:00000064
"MinEdition"="Standard"
"ProductVersion"="0.9"
"ProductName"="Bistro Designer"
@@ -21,18 +20,11 @@
[$RootKey$\Projects\{94887830-9110-3f61-84ae-beea7891c7e6}]
@="Factory"
"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
-"ProjectTemplatesDir"="[BISTRODIR].\\NullPath"
+"ProjectTemplatesDir"="C:\\AIM\\Bistro\\branches\\WithMethodsEngine\\Bistro.Designer\\bin\\Debug\\.\\NullPath"
"Language(VsTemplate)"="Bistro"
[$RootKey$\NewProjectTemplates\TemplateDirs\{40049e67-3a71-47c2-adfa-87b89aa56b50}\/1]
"SortPriority"=dword:00000064
-"TemplatesDir"="[BISTRODIR].\\NullPath"
-[$RootKey$\Projects\{5b89fcc2-c9f6-49a8-8f8d-eddcc3fdc9e9}]
-@="Factory"
-"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
-"ProjectTemplatesDir"="[BISTRODIR].\\NullPath"
-[$RootKey$\NewProjectTemplates\TemplateDirs\{40049e67-3a71-47c2-adfa-87b89aa56b50}\/1]
-"SortPriority"=dword:00000064
-"TemplatesDir"="[BISTRODIR].\\NullPath"
+"TemplatesDir"="C:\\AIM\\Bistro\\branches\\WithMethodsEngine\\Bistro.Designer\\bin\\Debug\\.\\NullPath"
[$RootKey$\Projects\{c39a00f4-b2a4-478e-a0b2-c3e69b3bd899}]
@="Web Bistro Factory"
"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
Author: sasha_...@mail.ru
Date: Fri May 14 05:22:05 2010
Log: Changes for 0.9.3.0 setup (complete VS 2008,2010 support)
http://code.google.com/p/bistro-framework/source/detail?r=443
Added:
/Bistro/trunk/Bistro.SetupWiX/Templates/ItemTemplates/Bistro/CSharpControllers.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/CSharp.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/FSharp.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/CSharp.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/FSharp.zip
/Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix
/Bistro/trunk/Bistro.SetupWiX/lib/NDjango.BistroIntegration2008.dll
/Bistro/trunk/Bistro.SetupWiX/lib/NDjango.BistroIntegration2010.dll
/Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2008.msi
/Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2010.msi
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2008.dll
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.vsix
Deleted:
/Bistro/trunk/Bistro.SetupWiX/Templates/BistroController.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/FSharp.zip
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender.dll
Modified:
/Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi
/Bistro/trunk/Bistro.SetupWiX/ExtenderReg.wxi
/Bistro/trunk/Bistro.SetupWiX/Setup.wxs
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.dll
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.pkgdef
=======================================
--- /dev/null
+++
/Bistro/trunk/Bistro.SetupWiX/Templates/ItemTemplates/Bistro/CSharpControllers.zip
Fri May 14 05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/CSharp.zip Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/FSharp.zip Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/CSharp.zip Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/FSharp.zip Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/NDjango.BistroIntegration2008.dll Fri
May 14 05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/NDjango.BistroIntegration2010.dll Fri
May 14 05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2008.msi Fri May 14
05:22:05 2010
File is too large to display a diff.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2010.msi Fri May 14
05:22:05 2010
File is too large to display a diff.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2008.dll Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.vsix Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Templates/BistroController.zip Mon Mar 29
04:37:50 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Templates/FSharp.zip Fri Apr 30 05:13:47
2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender.dll Fri Apr 30
05:13:47 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Fri Apr 30
05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Fri May 14
05:22:05 2010
@@ -49,8 +49,8 @@
<!--Non generated part-->
<!--Writning installation path into registry. Later EditTemplates
utility can use this info to update references-->
- <RegistryKey Root="HKLM" Key="Software\Hill30\Bistro" >
+ <!--<RegistryKey Root="HKLM" Key="Software\Hill30\Bistro" >
<RegistryValue Name="InstallDir" Type="string" Value="[INSTALLDIR]" />
- </RegistryKey>
+ </RegistryKey>-->
</Include>
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/ExtenderReg.wxi Fri Apr 30 05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/ExtenderReg.wxi Fri May 14 05:22:05 2010
@@ -4,18 +4,18 @@
<Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\InstalledProducts\ProjectExtenderPackage"
Value="#110" Type="string">
<Registry Name="Package"
Value="{5a8f5a4d-d1eb-403e-85b3-63df607fa07c}" Type="string" />
<Registry Name="ProductDetails" Value="#112" Type="string" />
- <Registry Name="PID" Value="0.9" Type="string" />
+ <Registry Name="PID" Value="1.0" Type="string" />
<Registry Name="LogoID" Value="#400" Type="string" />
</Registry>
- <Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\Packages\{5a8f5a4d-d1eb-403e-85b3-63df607fa07c}"
Value="FSharp.ProjectExtender.ProjectExtenderPackage, ProjectExtender,
Version=0.9.0.0, Culture=neutral, PublicKeyToken=null" Type="string">
+ <Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\Packages\{5a8f5a4d-d1eb-403e-85b3-63df607fa07c}"
Value="FSharp.ProjectExtender.ProjectExtenderPackage, ProjectExtender2008,
Version=0.9.1.0, Culture=neutral, PublicKeyToken=null" Type="string">
<Registry Name="InprocServer32" Value="[SystemFolder]mscoree.dll"
Type="string" />
<Registry Name="Class"
Value="FSharp.ProjectExtender.ProjectExtenderPackage" Type="string" />
- <Registry Name="Assembly" Value="ProjectExtender, Version=0.9.0.0,
Culture=neutral, PublicKeyToken=null" Type="string" />
- <Registry Name="CodeBase" Value="[INSTALLDIR]ProjectExtender.dll"
Type="string" />
+ <Registry Name="Assembly" Value="ProjectExtender2008, Version=0.9.1.0,
Culture=neutral, PublicKeyToken=null" Type="string" />
+ <Registry Name="CodeBase" Value="[INSTALLDIR]ProjectExtender2008.dll"
Type="string" />
<Registry Name="ID" Value="100" Type="integer" />
<Registry Name="MinEdition" Value="Standard" Type="string" />
- <Registry Name="ProductVersion" Value="0.9" Type="string" />
+ <Registry Name="ProductVersion" Value="1.0" Type="string" />
<Registry Name="ProductName" Value="F# Project System Extender"
Type="string" />
<Registry Name="CompanyName" Value="Hill30 Inc" Type="string" />
</Registry>
@@ -27,7 +27,7 @@
<Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\CLSID\{a5fc3bbd-8795-42d0-aa55-e65fe992378e}"
Value="FSharp.ProjectExtender.Page" Type="string">
<Registry Name="InprocServer32" Value="[SystemFolder]mscoree.dll"
Type="string" />
<Registry Name="Class" Value="FSharp.ProjectExtender.Page"
Type="string" />
- <Registry Name="CodeBase" Value="[INSTALLDIR]ProjectExtender.dll"
Type="string" />
+ <Registry Name="CodeBase" Value="[INSTALLDIR]ProjectExtender2008.dll"
Type="string" />
<Registry Name="ThreadingModel" Value="Both" Type="string" />
</Registry>
@@ -36,9 +36,11 @@
<Registry Name="Package"
Value="{5a8f5a4d-d1eb-403e-85b3-63df607fa07c}" Type="string" />
</Registry>
- <Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\NewProjectTemplates\TemplateDirs\{5a8f5a4d-d1eb-403e-85b3-63df607fa07c}\/1"
Value="ProjectExtender" Type="string">
- <Registry Name="SortPriority" Value="100" Type="integer" />
- </Registry>
+ <Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\NewProjectTemplates\TemplateDirs\{5a8f5a4d-d1eb-403e-85b3-63df607fa07c}\/1"
Value="ProjectExtender" Type="string">
+ <!--<Registry Name="SortPriority" Value="100" Type="integer" />
+ <Registry Name="DisplayName" Value="Visual F#" Type="string"/>-->
+ <Registry Name="Language(VsTemplate)" Value="FSharp" Type="string"/>
+</Registry>
<RegistryKey Root="HKLM" Key="Software\Hill30\ProjectExtender" >
<RegistryValue Name="InstallDir" Type="string" Value="[INSTALLDIR]" />
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Setup.wxs Fri Apr 30 05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Setup.wxs Fri May 14 05:22:05 2010
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?define ProductVersion="0.9.2" ?>
- <?define ProductVersionTitle="0.9.2.0" ?>
+ <?define ProductVersion="0.9.3" ?>
+ <?define ProductVersionTitle="0.9.3.0" ?>
<?define VisualStudioRegistryRoot2008
= "Software\Microsoft\VisualStudio\9.0" ?>
<?define VisualStudioRegistryRoot2010
= "Software\Microsoft\VisualStudio\10.0" ?>
<?define UpgradeCode="{E63B2D78-54C6-4d2a-B3EF-219EF3AE8FBC}"?>
- <Product Id="FDEC07EB-0817-4B10-850C-3DDC05AAD540" Name="Bistro
$(var.ProductVersionTitle)" Language="1033" Version="$(var.ProductVersion)"
Manufacturer="Hill30" UpgradeCode="$(var.UpgradeCode)">
+ <Product Id="B0655900-8078-4342-8CA0-AB5A8583C5A3" Name="Bistro
$(var.ProductVersionTitle)" Language="1033" Version="$(var.ProductVersion)"
Manufacturer="Hill30" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="200" Compressed="yes" />
<!--BE70CEDF718001B458C0D3CD50AA5D04-->
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
@@ -54,7 +54,9 @@
<Property Id="DEVENV_EXE_PATH2010">
<RegistrySearch Id="RegSearch_DevenvExe_Path2010" Root="HKLM"
Key="$(var.VisualStudioRegistryRoot2010)\Setup\VS" Name="EnvironmentPath"
Type="raw" />
</Property>
- <Condition Message="This application requires Visual Studio 2008.
Please install the Visual Studio 2008 then run this installer
again.">Installed OR VS2008FOUND</Condition>
+ <Property Id="VSIX_PATH"/>
+
+ <Condition Message="This application requires Visual Studio
2008/2010. Please install the Visual Studio IDE then run this installer
again.">Installed OR VS2008FOUND OR VS2010FOUND</Condition>
<Condition Message="This application requires .NET Framework
3.5SP1. Please install the .NET Framework 3.5SP1 then run this installer
again."><![CDATA[Installed OR (NETFRAMEWORK35_SP_LEVEL and NOT
NETFRAMEWORK35_SP_LEVEL = "#0")]]></Condition>
<WixVariable Id="WixUILicenseRtf" Value="License.rtf"
Overridable="yes" />
<WixVariable Id="WixUIBannerBmp" Value="bitmaps\bannrbmp.bmp" />
@@ -65,35 +67,59 @@
<Directory Id="INSTALLDIR" Name="Bistro">
<Component Id="BistroAssemblies"
Guid="EA80C8A8-63BE-4D5E-BACB-9FA941CD0C7C">
<RemoveFolder Id="RemoveMain"
Directory="INSTALLDIR" On="uninstall" />
+ <RegistryValue Root="HKLM"
Key="Software\Hill30\Bistro" Name="InstallDir" Type="string"
Value="[INSTALLDIR]" KeyPath="yes" />
<File Id="Bistro.Core.dll"
Name="Bistro.Core.dll" Source="lib\Bistro.Core.dll" DiskId="1" />
<File Id="Bistro.Extensions.dll"
Name="Bistro.Extensions.dll" Source="lib\Bistro.Extensions.dll" DiskId="1"
/>
<File Id="Bistro.FSharpExtensions.dll"
Name="Bistro.FSharpExtensions.dll" Source="lib\Bistro.FSharpExtensions.dll"
/>
<File Id="Newtonsoft.Json.dll"
Name="Newtonsoft.Json.dll" Source="..\lib\Newtonsoft.Json.dll" />
- <File Id="NDjango.BistroIntegration.dll"
Name="$(var.BistroIntegration.TargetFileName)"
Source="$(var.BistroIntegration.TargetPath)" />
- <File Id="NDJANGO" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetupExtended.msi" />
+ <!--<File Id="NDjango.BistroIntegration.dll"
Name="$(var.BistroIntegration.TargetFileName)"
Source="$(var.BistroIntegration.TargetPath)" />-->
<File Id="BistroDesigner"
Name="Bistro.Designer.dll" Source="lib\Bistro.Designer.dll" DiskId="1" />
</Component>
+ <Component Id="Integration08"
Guid="107F0C00-5F85-4F65-BB23-E11B6878E5C6">
+ <Condition><![CDATA[VS2008FOUND <>
NULL]]></Condition>
+ <File Id="NDjango.BistroIntegration2008.dll"
Name="NDjango.BistroIntegration2008.dll"
Source="lib\NDjango.BistroIntegration2008.dll"/>
+ </Component>
+ <Component Id="Integration10"
Guid="CF62EA41-2566-4ECE-90EB-BD6594836B39">
+ <Condition><![CDATA[VS2010FOUND <>
NULL]]></Condition>
+ <File Id="NDjango.BistroIntegration2010.dll"
Name="NDjango.BistroIntegration2010.dll"
Source="lib\NDjango.BistroIntegration2010.dll"/>
+ </Component>
+ <Component Id="NDjangoMSI2008"
Guid="05FCB39B-E868-42A4-B508-958EA17050A3">
+ <Condition><![CDATA[VS2010FOUND =
NULL]]></Condition>
+ <File Id="NDJANGO08" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2008.msi" />
+ </Component>
+ <Component Id="NDjangoMSI2010"
Guid="7D7CCB7A-68A4-4E05-AA89-5A985C680559">
+ <Condition><![CDATA[VS2010FOUND <>
NULL]]></Condition>
+ <File Id="NDJANGO10" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2010.msi" />
+ </Component>
+
<Component Id="ReadmeBistro"
Guid="2F2DC3B8-A256-4AF2-B1D9-20C89AF5645A">
<File Id="ReadmeBistro" Name="Readme.txt"
ShortName="README.TXT" Source="Readme.txt" />
</Component>
<Component Id="ProjectExtender"
Guid="AA80C8A8-63BE-4D5E-BACB-9FA941CD0C7C">
- <File Id="ProjectExtender.dll"
Name="ProjectExtender.dll" Source="lib\ProjectExtender.dll" DiskId="1" />
+ <File Id="ProjectExtender.dll"
Name="ProjectExtender2008.dll" Source="lib\ProjectExtender2008.dll"
DiskId="1" />
+ </Component>
+ <Component Id="Extender2010"
Guid="D613ED0B-D741-47E1-9F2A-8547009EEA25">
+ <File Id="ProjectExtender.vsix"
Name="ProjectExtender2010.vsix" Source="lib\ProjectExtender2010.vsix"
DiskId="1"/>
+ </Component>
+ <Component Id="BistroDesigner2010"
Guid="61D1E34E-57BA-4559-AC69-957A399903E3">
+ <File Id="BistroDesigner2010.vsix"
Name="BistroDesigner2010.vsix" Source="lib\BistroDesigner2010.vsix"
DiskId="1"/>
</Component>
</Directory>
</Directory>
</Directory>
- <Directory Id="ENVDIR_2008" Name="EnvDir">
+ <Directory Id="ENVDIR_2008" Name="EnvDir08">
<Directory Id="ProjectTemplates2008"
Name="ProjectTemplates">
<Directory Id="ProjectTemplatesBistro2008"
Name="Bistro">
<Component Id="ProjectTemplates2008"
Guid="7F1095EE-D392-4596-B931-21CB35374251">
<RemoveFolder Id="ProjectTemplatesBistro2008"
Directory="ProjectTemplatesBistro2008" On="uninstall" />
<RegistryValue Root="HKCU"
Key="Software\Hill30\Bistro Designer\[ProductVersion]" Name="installed"
Type="integer" Value="1" KeyPath="yes" />
- <File Id="FSharp2008.zip"
Name="FSharp2008.zip" Source="Templates\FSharp.zip" />
- <File Id="BistroProject2008.zip"
Name="BistroProject2008.zip" Source="Templates\VS2008\BistroProject.zip" />
+ <File Id="FSharp2008.zip"
Name="FSharp2008.zip" Source="Templates\VS2008\FSharp.zip" />
+ <File Id="CSharp2008.zip"
Name="CSharp2008.zip" Source="Templates\VS2008\CSharp.zip" />
</Component>
</Directory>
</Directory>
<Directory Id="ItemTemplates2008" Name="ItemTemplates">
+
<Directory Id="ItemTemplatesBistro2008" Name="Bistro">
<Component Id="InstalledItemTemplates2008"
Guid="B67DD6E5-F6A5-49E8-853D-BE4D05CA8005">
<RemoveFolder Id="ItemTemplatesBistro2008"
Directory="ItemTemplatesBistro2008" On="uninstall" />
@@ -106,6 +132,7 @@
<File Id="Text2008.zip" Name="Text2008.zip"
Source="Templates\ItemTemplates\Bistro\Text.zip" />
<File Id="WebConfig2008.zip"
Name="WebConfig2008.zip"
Source="Templates\ItemTemplates\Bistro\WebConfig.zip" />
<File Id="WebHTMLPage2008.zip"
Name="WebHTMLPage2008.zip"
Source="Templates\ItemTemplates\Bistro\WebHTMLPage.zip" />
+
</Component>
</Directory>
</Directory>
@@ -115,10 +142,52 @@
<Component Id="CustomItemTemplates2008"
Guid="8EDB5431-75F6-4BF9-A183-BC6ACCBC90BD">
<RemoveFolder Id="vs2008Web1"
Directory="vs2008Web1" On="uninstall" />
<RegistryValue Root="HKCU"
Key="Software\Hill30\Bistro\[ProductVersion]" Name="installed"
Type="integer" Value="1" KeyPath="yes" />
- <File Id="BistroController2008"
Name="BistroController2008.zip" Source="Templates\BistroController.zip" />
+ <File Id="CSharpController2008"
Name="CSharpController2008.zip"
Source="Templates\ItemTemplates\Bistro\CSharpControllers.zip" />
</Component>
</Directory>
</Directory>
+
+ <Directory Id="ENVDIR_2010" Name="EnvDir10">
+ <Directory Id="ProjectTemplates2010"
Name="ProjectTemplates">
+ <Directory Id="ProjectTemplatesBistro2010"
Name="Bistro">
+ <Component Id="ProjectTemplates2010"
Guid="F56B6B59-1881-48ED-B84F-F2CB181C6162">
+ <RemoveFolder Id="ProjectTemplatesBistro2010"
Directory="ProjectTemplatesBistro2010" On="uninstall" />
+ <RegistryValue Root="HKCU"
Key="Software\Hill30\Bistro Designer\[ProductVersion]" Name="installed"
Type="integer" Value="1" KeyPath="yes" />
+ <File Id="FSharp2010.zip"
Name="FSharp2010.zip" Source="Templates\VS2010\FSharp.zip" />
+ <File Id="CSharp2010.zip"
Name="CSharp2010.zip" Source="Templates\VS2010\CSharp.zip" />
+ </Component>
+ </Directory>
+ </Directory>
+ <Directory Id="ItemTemplates2010" Name="ItemTemplates">
+
+ <Directory Id="ItemTemplatesBistro2010" Name="Bistro">
+ <Component Id="InstalledItemTemplates2010"
Guid="05DDE197-2323-4DE0-B0BB-450A008624CE">
+ <RemoveFolder Id="ItemTemplatesBistro2010"
Directory="ItemTemplatesBistro2010" On="uninstall" />
+ <RegistryValue Root="HKCU"
Key="Software\Hill30\Bistro Designer\[ProductVersion]" Name="installed"
Type="integer" Value="1" KeyPath="yes" />
+ <File Id="BrowserFile2010.zip"
Name="BrowserFile2010.zip"
Source="Templates\ItemTemplates\Bistro\BrowserFile.zip" />
+ <File Id="FSharpControllers2010.zip"
Name="FSharpControllers2010.zip"
Source="Templates\ItemTemplates\Bistro\FSharpControllers.zip" />
+ <File Id="JScript2010.zip"
Name="JScript2010.zip" Source="Templates\ItemTemplates\Bistro\JScript.zip"
/>
+ <File Id="NDjango2010.zip"
Name="NDjango2010.zip" Source="Templates\ItemTemplates\Bistro\NDjango.zip"
/>
+ <File Id="StyleSheet2010.zip"
Name="StyleSheet2010.zip"
Source="Templates\ItemTemplates\Bistro\StyleSheet.zip" />
+ <File Id="Text2010.zip" Name="Text2010.zip"
Source="Templates\ItemTemplates\Bistro\Text.zip" />
+ <File Id="WebConfig2010.zip"
Name="WebConfig2010.zip"
Source="Templates\ItemTemplates\Bistro\WebConfig.zip" />
+ <File Id="WebHTMLPage2010.zip"
Name="WebHTMLPage2010.zip"
Source="Templates\ItemTemplates\Bistro\WebHTMLPage.zip" />
+ </Component>
+ </Directory>
+ </Directory>
+ <Directory Id="VS2010ITEMTEMPLATESLOCATION">
+ <Directory Id="vs2010Web1" Name="Web">
+ <Component Id="CustomItemTemplates2010"
Guid="B3F465CF-D137-49FD-B0AD-12A48E461482">
+ <RemoveFolder Id="vs2010Web1"
Directory="vs2010Web1" On="uninstall" />
+ <RegistryValue Root="HKCU"
Key="Software\Hill30\Bistro\[ProductVersion]" Name="installed"
Type="integer" Value="1" KeyPath="yes" />
+ <File Id="CSharpController2010"
Name="CSharpController2010.zip"
Source="Templates\ItemTemplates\Bistro\CSharpControllers.zip" />
+ </Component>
+ </Directory>
+ </Directory>
+ </Directory>
+
+
+
<Component Id="RegistryDesignerVSX2008" DiskId="1"
Guid="5F720FC6-EC7C-44E2-BEE4-8130CE1B3F09">
<?include BistroDesigner2008Reg.wxi?>
</Component>
@@ -126,32 +195,73 @@
<?include ExtenderReg.wxi?>
</Component>
</Directory>
+
<Feature Id="ProductFeature" Level="1">
- <ComponentRef Id="ProjectExtender" />
<ComponentRef Id="BistroAssemblies" />
<ComponentRef Id="ReadmeBistro" />
</Feature>
<Feature Id="Registry2008" Title="Visual Studio 2008 integration"
Level="1">
+ <Condition Level="0"><![CDATA[VS2008FOUND = NULL]]></Condition>
+ <ComponentRef Id="ProjectExtender" />
<ComponentRef Id="ProjectTemplates2008" />
<ComponentRef Id="InstalledItemTemplates2008" />
<ComponentRef Id="CustomItemTemplates2008" />
<ComponentRef Id="RegistryDesignerVSX2008" />
<ComponentRef Id="RegistryProjectExtender" />
+ <ComponentRef Id="Integration08"/>
</Feature>
+ <Feature Id="VS10Extensions" Title="Visual Studio 2010
integration" Level="1">
+ <Condition Level="0"><![CDATA[VS2010FOUND = NULL]]></Condition>
+ <ComponentRef Id="Extender2010"/>
+ <ComponentRef Id="BistroDesigner2010"/>
+ <ComponentRef Id="ProjectTemplates2010" />
+ <ComponentRef Id="InstalledItemTemplates2010" />
+ <ComponentRef Id="CustomItemTemplates2010" />
+ <ComponentRef Id="Integration10"/>
+
+ </Feature>
+ <Feature Id="NDjango" Level="1">
+ <ComponentRef Id="NDjangoMSI2008"/>
+ <ComponentRef Id="NDjangoMSI2010"/>
+ </Feature>
+
<Binary Id="EditTemplates" SourceFile="versionWriterFull.exe" />
- <Property Id="WixShellExecTarget"
Value="[INSTALLDIR]\NDjangoSetup.msi" />
- <Property Id="NDJANGONEEDED" Value="Yes" />
- <CustomAction Id="InstallNDjango" BinaryKey="WixCA"
DllEntry="WixShellExec" Impersonate="yes" />
- <CustomAction Id="CA_DevenvSetup2008"
Property="DEVENV_EXE_PATH2008" ExeCommand="/setup" Impersonate="no"
Execute="commit" />
- <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]BistroProject2008.zip""
Id="EditBistroProject2008CustomAction" Return="ignore" Execute="commit" />
+ <Property Id="WixShellExecTarget"
Value="[INSTALLDIR]\NDjangoSetup.msi"/>
+ <Property Id="NDJANGONEEDED" Value="1" />
+ <CustomAction Id="InstallNDjango" BinaryKey="WixCA"
DllEntry="WixShellExec" Impersonate="yes"/>
+ <CustomAction Id="DevenvSetup2008" Property="DEVENV_EXE_PATH2008"
ExeCommand="/setup" Impersonate="no" Execute="commit" />
+ <CustomAction Id="DevenvSetup2010" Property="DEVENV_EXE_PATH2010"
ExeCommand="/setup" Impersonate="no" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]CSharp2008.zip""
Id="EditBistroProject2008CustomAction" Return="ignore" Execute="commit" />
<CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]FSharp2008.zip""
Id="EditFSharp2008CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]CSharp2010.zip""
Id="EditBistroProject2010CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]FSharp2010.zip""
Id="EditFSharp2010CustomAction" Return="ignore" Execute="commit" />
+
+
+ <CustomAction Id="InstallExtender2010" Property = "VSIX_PATH"
ExeCommand=""[INSTALLDIR]\ProjectExtender2010.vsix""
Return="check" Execute="deferred" />
+ <CustomAction Id="InstallBistroDesigner2010" Property
= "VSIX_PATH"
ExeCommand=""[INSTALLDIR]\BistroDesigner2010.vsix""
Return="check" Execute="deferred"/>
+ <CustomAction Id="SetExtensionDir" Property="EXTENSIONHILL30FILES"
Value="[LocalAppDataFolder]\Microsoft\VisualStudio\10.0\Extensions\Hill30
Inc"/>
+ <CustomAction Id="DeleteExtender2010" Directory = "INSTALLDIR"
ExeCommand=""cmd.exe" /c rmdir /s /q
"[EXTENSIONHILL30FILES]\F# Project System Extender""
Return="ignore"/>
+ <CustomAction Id="DeleteDesigner2010" Directory = "INSTALLDIR"
ExeCommand=""cmd.exe" /c rmdir /s /q
"[EXTENSIONHILL30FILES]\Bistro Designer"" Return="ignore"/>
+ <CustomAction Id="SetVSIXPath" Property="VSIX_PATH"
Value="[ENVDIR_2010]\vsixinstaller.exe"/>
+
<InstallExecuteSequence>
+ <RemoveExistingProducts Before ="InstallInitialize" />
<!--It is important to update templates before calling devenv
/setup-->
- <Custom Action="EditBistroProject2008CustomAction"
After="WriteRegistryValues"><![CDATA[Not Installed OR (Installer AND REMOVE
<> "ALL")]]></Custom>
- <Custom Action="EditFSharp2008CustomAction"
After="EditBistroProject2008CustomAction"><![CDATA[Not Installed OR
(Installer AND REMOVE <> "ALL")]]></Custom>
- <Custom Action="CA_DevenvSetup2008"
After="EditFSharp2008CustomAction" />
+ <Custom Action="EditBistroProject2008CustomAction"
After="WriteRegistryValues"><![CDATA[(Not Installed AND VS2008FOUND <>
NULL) OR (Installer AND REMOVE <> "ALL")]]></Custom>
+ <Custom Action="EditFSharp2008CustomAction"
After="EditBistroProject2008CustomAction"><![CDATA[(Not Installed AND
VS2008FOUND <> NULL) OR (Installer AND REMOVE <> "ALL")]]></Custom>
+ <Custom Action="EditBistroProject2010CustomAction"
After="WriteRegistryValues"><![CDATA[(Not Installed AND VS2010FOUND <>
NULL) OR (Installer AND REMOVE <> "ALL")]]></Custom>
+ <Custom Action="EditFSharp2010CustomAction"
After="EditBistroProject2010CustomAction"><![CDATA[(Not Installed AND
VS2010FOUND <> NULL)OR (Installer AND REMOVE <> "ALL")]]></Custom>
+ <Custom Action="DevenvSetup2008"
Before="InstallFinalize"><![CDATA[(Not Installed AND VS2008FOUND <> NULL)
OR (Installer AND REMOVE <> "ALL") ]]></Custom>
+ <Custom Action="DevenvSetup2010"
Before="InstallFinalize"><![CDATA[(Not Installed AND VS2010FOUND <> NULL)
OR (Installer AND REMOVE <> "ALL")]]></Custom>
+ <!--Run vsixinstaller.exe to install VS2010 extensions
correctly-->
+ <Custom Action="SetVSIXPath"
Before="InstallFinalize"><![CDATA[Not Installed AND VS2010FOUND <>
NULL]]></Custom>
+ <Custom Action="InstallExtender2010"
After="SetVSIXPath"><![CDATA[Not Installed AND VS2010FOUND <>
NULL]]></Custom>
+ <Custom Action="InstallBistroDesigner2010"
After="InstallExtender2010"><![CDATA[Not Installed AND VS2010FOUND <>
NULL]]></Custom>
+ <Custom Action="SetExtensionDir"
After="InstallInitialize"><![CDATA[REMOVE]]></Custom>
+ <Custom Action="DeleteExtender2010"
After="SetExtensionDir"><![CDATA[REMOVE]]></Custom>
+ <Custom Action="DeleteDesigner2010"
After="DeleteExtender2010"><![CDATA[REMOVE]]></Custom>
+ <!--Run NdjangoSetup.msi if the option is chosen-->
<Custom Action="InstallNDjango"
After="InstallFinalize"><![CDATA[(Not Installed OR (Installer AND REMOVE
<> "ALL")) AND NDJANGONEEDED]]></Custom>
- <RemoveExistingProducts
After="InstallFinalize"></RemoveExistingProducts>
</InstallExecuteSequence>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
<!--********UI********-->
@@ -219,8 +329,8 @@
<Control Id="ChangeFolder" Type="PushButton" X="20"
Y="120" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)">
</Control>
<Control Type="CheckBox" Id="NDjangoCheckBox" Width="230"
Height="17" X="22" Y="169" Property="NDJANGONEEDED" CheckBoxValue="Yes"
Text="Install NDjango">
- <Condition Action="enable"><![CDATA[ VS2008FOUND <>
NULL ]]></Condition>
- <Condition Action="disable"><![CDATA[ VS2008FOUND =
NULL ]]></Condition>
+ <!--<Condition Action="enable"><![CDATA[ VS2008FOUND
<> NULL ]]></Condition>
+ <Condition Action="disable"><![CDATA[ VS2008FOUND =
NULL ]]></Condition>-->
</Control>
<Control Type="Text" Id="NDjangoNote" Width="350"
Height="17" X="20" Y="190" Text="NOTE: You will not able to use Bistro
applications with .django views without NDjango" />
</Dialog>
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.dll Fri Apr 30
05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.dll Fri May 14
05:22:05 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.pkgdef Fri Apr 30
05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.pkgdef Fri May 14
05:22:05 2010
@@ -4,16 +4,15 @@
@="#110"
"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
"ProductDetails"="#112"
-"PID"="0.9"
+"PID"="1.0"
"LogoID"="#400"
[$RootKey$\Packages\{40049e67-3a71-47c2-adfa-87b89aa56b50}]
-@="Bistro.Designer.DesignerPackage, Bistro.Designer, Version=0.9.0.0,
Culture=neutral, PublicKeyToken=null"
+@="Bistro.Designer.DesignerPackage, Bistro.Designer, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null"
"InprocServer32"="%windir%\\system32\\mscoree.dll"
"Class"="Bistro.Designer.DesignerPackage"
-"Assembly"="Bistro.Designer, Version=0.9.0.0, Culture=neutral,
PublicKeyToken=null"
-"CodeBase"="[BISTRODIR]Bistro.Designer.dll"
+"Assembly"="Bistro.Designer, Version=1.0.0.0, Culture=neutral,
PublicKeyToken=null"
[$RootKey$\Packages\{40049e67-3a71-47c2-adfa-87b89aa56b50}]
-"ID"=dword:00000001
+"ID"=dword:00000064
"MinEdition"="Standard"
"ProductVersion"="0.9"
"ProductName"="Bistro Designer"
@@ -21,18 +20,11 @@
[$RootKey$\Projects\{94887830-9110-3f61-84ae-beea7891c7e6}]
@="Factory"
"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
-"ProjectTemplatesDir"="[BISTRODIR].\\NullPath"
+"ProjectTemplatesDir"="C:\\AIM\\Bistro\\branches\\WithMethodsEngine\\Bistro.Designer\\bin\\Debug\\.\\NullPath"
"Language(VsTemplate)"="Bistro"
[$RootKey$\NewProjectTemplates\TemplateDirs\{40049e67-3a71-47c2-adfa-87b89aa56b50}\/1]
"SortPriority"=dword:00000064
-"TemplatesDir"="[BISTRODIR].\\NullPath"
-[$RootKey$\Projects\{5b89fcc2-c9f6-49a8-8f8d-eddcc3fdc9e9}]
-@="Factory"
-"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
-"ProjectTemplatesDir"="[BISTRODIR].\\NullPath"
-[$RootKey$\NewProjectTemplates\TemplateDirs\{40049e67-3a71-47c2-adfa-87b89aa56b50}\/1]
-"SortPriority"=dword:00000064
-"TemplatesDir"="[BISTRODIR].\\NullPath"
+"TemplatesDir"="C:\\AIM\\Bistro\\branches\\WithMethodsEngine\\Bistro.Designer\\bin\\Debug\\.\\NullPath"
[$RootKey$\Projects\{c39a00f4-b2a4-478e-a0b2-c3e69b3bd899}]
@="Web Bistro Factory"
"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
Reply all
Reply to author
Forward
0 new messages