[bistro-framework] r456 committed - 0.9.3.1
1 view
Skip to first unread message
codesite...@google.com
May 21, 2010, 6:51:27 AM5/21/10
to bistro-d...@googlegroups.com
Revision: 456
Author: KirillSkrygan
Date: Fri May 21 03:50:28 2010
Log: 0.9.3.1
http://code.google.com/p/bistro-framework/source/detail?r=456
Added:
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/NDjango2008Extended.msi
Modified:
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroDesigner2008Reg.wxi
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/ExtenderReg.wxi
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Readme.txt
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Setup.wxs
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/CSharp.zip
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/FSharp.zip
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2008.dll
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2010.vsix
=======================================
--- /dev/null
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/NDjango2008Extended.msi
Fri May 21 03:50:28 2010
File is too large to display a diff.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Thu
May 20 22:53:32 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Fri
May 21 03:50:28 2010
@@ -11,11 +11,11 @@
<!--Some of this registry information reflects the data indicated inside
ProvideLoadKey attribute
CodeBase added manually-->
- <Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\Packages\{40049e67-3a71-47c2-adfa-87b89aa56b50}"
Value="Bistro.Designer.DesignerPackage, Bistro.Designer2008,
Version=0.9.0.0, Culture=neutral, PublicKeyToken=null" Type="string">
+ <Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\Packages\{40049e67-3a71-47c2-adfa-87b89aa56b50}"
Value="Bistro.Designer.DesignerPackage, Bistro.Designer2008,
Version=0.9.3.1, Culture=neutral, PublicKeyToken=null" Type="string">
<Registry Name="InprocServer32" Value="[SystemFolder]mscoree.dll"
Type="string" />
<Registry Name="Class" Value="Bistro.Designer.DesignerPackage"
Type="string" />
- <Registry Name="Assembly" Value="Bistro.Designer2008, Version=0.9.0.0,
Culture=neutral, PublicKeyToken=null" Type="string" />
- <Registry Name="CodeBase"
Value="[INSTALLDIR]Bistro\Bistro.Designer2008.dll" Type="string" />
+ <Registry Name="Assembly" Value="Bistro.Designer2008, Version=0.9.3.1,
Culture=neutral, PublicKeyToken=null" Type="string" />
+ <Registry Name="CodeBase" Value="[INSTALLDIR]Bistro.Designer2008.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" />
@@ -25,7 +25,7 @@
<Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\Projects\{94887830-9110-3f61-84ae-beea7891c7e6}"
Value="Factory" Type="string">
<Registry Name="Package"
Value="{40049e67-3a71-47c2-adfa-87b89aa56b50}" Type="string" />
- <Registry Name="ProjectTemplatesDir"
Value="[INSTALLDIR]Bistro.\NullPath" Type="string" />
+ <Registry Name="ProjectTemplatesDir" Value="[INSTALLDIR].\NullPath"
Type="string" />
<Registry Name="Language(VsTemplate)" Value="Bistro" Type="string" />
</Registry>
@@ -44,7 +44,7 @@
<RegistryKey Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\NewProjectTemplates\TemplateDirs\{40049e67-3a71-47c2-adfa-87b89aa56b50}\/1">
<RegistryValue Name="SortPriority" Value="100" Type="integer" />
- <RegistryValue Name="TemplatesDir"
Value="[INSTALLDIR]Bistro.\NullPath" Type="string" />
+ <RegistryValue Name="TemplatesDir" Value="[INSTALLDIR].\NullPath"
Type="string" />
</RegistryKey>
<!--Non generated part-->
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/ExtenderReg.wxi Thu May 20
22:53:32 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/ExtenderReg.wxi Fri May 21
03:50:28 2010
@@ -8,11 +8,11 @@
<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, ProjectExtender2008,
Version=0.9.1.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.2.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="ProjectExtender2008, Version=0.9.1.0,
Culture=neutral, PublicKeyToken=null" Type="string" />
- <Registry Name="CodeBase"
Value="[INSTALLDIR]Bistro\ProjectExtender2008.dll" Type="string" />
+ <Registry Name="Assembly" Value="ProjectExtender2008, Version=0.9.2.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="1.0" Type="string" />
@@ -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]Bistro\ProjectExtender2008.dll" Type="string" />
+ <Registry Name="CodeBase" Value="[INSTALLDIR]ProjectExtender2008.dll"
Type="string" />
<Registry Name="ThreadingModel" Value="Both" Type="string" />
</Registry>
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Readme.txt Fri Apr 30
05:13:47 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Readme.txt Fri May 21
03:50:28 2010
@@ -3,6 +3,10 @@
Visual Studio 2008
F# CTP v.1.9.9.9 (You can download it from:
http://www.microsoft.com/downloads/details.aspx?FamilyID=ba52e650-4e77-4b0b-b987-9f9ecd3bab3b&displaylang=en)
+
+New in 0.9.3.0
+1. Now supports both VS2008 and VS2010.
+
New in 0.9.2.0
1. Added Bistro Designer with F# and C# installed project templates
2. Added NDjango.BistroIntegration.dll assembly
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Setup.wxs Wed May 19 10:01:36
2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Setup.wxs Fri May 21 03:50:28
2010
@@ -65,16 +65,16 @@
<WixVariable Id="WixUIDialogBmp" Value="bitmaps\dlgbmp.bmp" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="PFiles">
- <Directory Id="INSTALLDIR" Name="Hill30">
-
- <Directory Id="BistroDir" Name="Bistro">
- <Component Id="NDjangoMSI2008"
Guid="05FCB39B-E868-42A4-B508-958EA17050A3">
+ <Directory Id="Hill30" Name="Hill30">
+
+ <Directory Id="INSTALLDIR" Name="Bistro">
+ <!--<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>-->
<Component Id="NDjangoMSI2010"
Guid="7D7CCB7A-68A4-4E05-AA89-5A985C680559">
<Condition><![CDATA[VS2010FOUND <>
NULL]]></Condition>
- <File Id="NDJANGO10" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2010.msi" />
+ <File Id="NDJANGO10" Name="NDjangoSetup.msi"
Source="lib\NDjango2008Extended.msi" />
</Component>
<Component Id="BistroAssemblies"
Guid="EA80C8A8-63BE-4D5E-BACB-9FA941CD0C7C">
<RemoveFolder Id="RemoveMain"
Directory="INSTALLDIR" On="uninstall" />
@@ -225,27 +225,27 @@
</Feature>
<Feature Id="NDjango" Level="1">
- <ComponentRef Id="NDjangoMSI2008"/>
+ <!--<ComponentRef Id="NDjangoMSI2008"/>-->
<ComponentRef Id="NDjangoMSI2010"/>
</Feature>
<Property Id="NDJANGONEEDED" Value="1" />
<Binary Id="EditTemplates" SourceFile="versionWriterFull.exe" />
- <Property Id="WixShellExecTarget"
Value="[INSTALLDIR]Bistro\NDjangoSetup.msi"/>
+ <Property Id="WixShellExecTarget"
Value="[INSTALLDIR]NDjangoSetup.msi"/>
<CustomAction Id="InstallNDjango" BinaryKey="WixCA"
DllEntry="WixShellExec" Impersonate="yes"/>
<!--<CustomAction Id="RunMSI08" Directory="INSTALLDIR"
ExeCommand=""msiexec.exe" /passive /i
"[INSTALLDIR]Bistro\NDjangoSetup.msi"
AGREETOLICENSE="1"
INSTALLDIR="[INSTALLDIR]NDjango\NET35"
TEMPLATESNEEDED="0" DESIGNERNEEDED="1"" Return="ignore"
/>
<CustomAction Id="RunMSI10" Directory="INSTALLDIR"
ExeCommand=""msiexec.exe" /i
"[INSTALLDIR]Bistro\NDjangoSetup.msi"
AGREETOLICENSE="1"
INSTALLDIR="[INSTALLDIR]NDjango\NET40"" Return="ignore"/>-->
<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"
"[INSTALLDIR]Bistro" "[INSTALLDIR]NDjango\.NET35"
"[INSTALLDIR]NDjango\.NET40"
"[INSTALLDIR]ProjectExtender""
Id="EditBistroProject2008CustomAction" Return="ignore" Execute="commit" />
- <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]FSharp2008.zip"
"[INSTALLDIR]Bistro" "[INSTALLDIR]NDjango\.NET35"
"[INSTALLDIR]NDjango\.NET40"
"[INSTALLDIR]ProjectExtender"" Id="EditFSharp2008CustomAction"
Return="ignore" Execute="commit" />
- <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]CSharp2010.zip"
"[INSTALLDIR]Bistro" "[INSTALLDIR]NDjango\.NET35"
"[INSTALLDIR]NDjango\.NET40"
"[INSTALLDIR]ProjectExtender""
Id="EditBistroProject2010CustomAction" Return="ignore" Execute="commit" />
- <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]FSharp2010.zip"
"[INSTALLDIR]Bistro" "[INSTALLDIR]NDjango\.NET35"
"[INSTALLDIR]NDjango\.NET40"
"[INSTALLDIR]ProjectExtender"" Id="EditFSharp2010CustomAction"
Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]CSharp2008.zip"
"[Hill30]Bistro" "[Hill30]NDjango\.NET35"
"[Hill30]NDjango\.NET40" "[Hill30]ProjectExtender""
Id="EditBistroProject2008CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]FSharp2008.zip"
"[Hill30]Bistro" "[Hill30]NDjango\.NET35"
"[Hill30]NDjango\.NET40" "[Hill30]ProjectExtender""
Id="EditFSharp2008CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]CSharp2010.zip"
"[Hill30]Bistro" "[Hill30]NDjango\.NET35"
"[Hill30]NDjango\.NET40" "[Hill30]ProjectExtender""
Id="EditBistroProject2010CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]FSharp2010.zip"
"[Hill30]Bistro" "[Hill30]NDjango\.NET35"
"[Hill30]NDjango\.NET40" "[Hill30]ProjectExtender""
Id="EditFSharp2010CustomAction" Return="ignore" Execute="commit" />
- <CustomAction Id="InstallExtender2010" Property = "VSIX_PATH"
ExeCommand="/q "[INSTALLDIR]Bistro\ProjectExtender2010.vsix""
Return="ignore" Execute="deferred" />
- <CustomAction Id="InstallBistroDesigner2010" Property
= "VSIX_PATH" ExeCommand="/q
"[INSTALLDIR]Bistro\BistroDesigner2010.vsix"" Return="ignore"
Execute="deferred"/>
- <CustomAction Id="SetExtensionDir" Property="EXTENSIONHILL30FILES"
Value="[LocalAppDataFolder]\Microsoft\VisualStudio\10.0\Extensions\Hill30
Inc"/>
+ <CustomAction Id="InstallExtender2010" Property = "VSIX_PATH"
ExeCommand=""[INSTALLDIR]ProjectExtender2010.vsix" /q"
Return="ignore" Execute="deferred" />
+ <CustomAction Id="InstallBistroDesigner2010" Property
= "VSIX_PATH" ExeCommand=""[INSTALLDIR]BistroDesigner2010.vsix"
/q" Return="ignore" Execute="deferred"/>
+ <CustomAction Id="SetExtensionDir" Property="EXTENSIONHILL30FILES"
Value="[LocalAppDataFolder]\Microsoft\VisualStudio\10.0\Extensions\Hill30"/>
<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"/>
@@ -339,7 +339,7 @@
</Control>
<Control Type="CheckBox" Id="NDjangoCheckBox" Width="230"
Height="17" X="22" Y="169" Property="NDJANGONEEDED" CheckBoxValue="Yes"
Text="Install NDjango">
</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" />
+ <Control Type="Text" Id="NDjangoNote" Width="350"
Height="17" X="20" Y="190" Text="NOTE: You will not be able to use Bistro
applications with .django views without NDjango" />
</Dialog>
<InstallUISequence>
<Show Dialog="WelcomeDlgCustom" Before="ProgressDlg">NOT
Installed</Show>
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/CSharp.zip
Wed May 19 10:01:36 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/CSharp.zip
Fri May 21 03:50:28 2010
Binary file, no diff available.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/FSharp.zip
Wed May 19 10:01:36 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/FSharp.zip
Fri May 21 03:50:28 2010
Binary file, no diff available.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
Thu May 20 22:53:32 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
Fri May 21 03:50:28 2010
Binary file, no diff available.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2008.dll
Fri May 14 05:22:05 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2008.dll
Fri May 21 03:50:28 2010
Binary file, no diff available.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2010.vsix
Thu May 20 00:33:42 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2010.vsix
Fri May 21 03:50:28 2010
Binary file, no diff available.
Author: KirillSkrygan
Date: Fri May 21 03:50:28 2010
Log: 0.9.3.1
http://code.google.com/p/bistro-framework/source/detail?r=456
Added:
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/NDjango2008Extended.msi
Modified:
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroDesigner2008Reg.wxi
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/ExtenderReg.wxi
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Readme.txt
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Setup.wxs
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/CSharp.zip
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/FSharp.zip
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2008.dll
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2010.vsix
=======================================
--- /dev/null
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/NDjango2008Extended.msi
Fri May 21 03:50:28 2010
File is too large to display a diff.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Thu
May 20 22:53:32 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Fri
May 21 03:50:28 2010
@@ -11,11 +11,11 @@
<!--Some of this registry information reflects the data indicated inside
ProvideLoadKey attribute
CodeBase added manually-->
- <Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\Packages\{40049e67-3a71-47c2-adfa-87b89aa56b50}"
Value="Bistro.Designer.DesignerPackage, Bistro.Designer2008,
Version=0.9.0.0, Culture=neutral, PublicKeyToken=null" Type="string">
+ <Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\Packages\{40049e67-3a71-47c2-adfa-87b89aa56b50}"
Value="Bistro.Designer.DesignerPackage, Bistro.Designer2008,
Version=0.9.3.1, Culture=neutral, PublicKeyToken=null" Type="string">
<Registry Name="InprocServer32" Value="[SystemFolder]mscoree.dll"
Type="string" />
<Registry Name="Class" Value="Bistro.Designer.DesignerPackage"
Type="string" />
- <Registry Name="Assembly" Value="Bistro.Designer2008, Version=0.9.0.0,
Culture=neutral, PublicKeyToken=null" Type="string" />
- <Registry Name="CodeBase"
Value="[INSTALLDIR]Bistro\Bistro.Designer2008.dll" Type="string" />
+ <Registry Name="Assembly" Value="Bistro.Designer2008, Version=0.9.3.1,
Culture=neutral, PublicKeyToken=null" Type="string" />
+ <Registry Name="CodeBase" Value="[INSTALLDIR]Bistro.Designer2008.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" />
@@ -25,7 +25,7 @@
<Registry Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\Projects\{94887830-9110-3f61-84ae-beea7891c7e6}"
Value="Factory" Type="string">
<Registry Name="Package"
Value="{40049e67-3a71-47c2-adfa-87b89aa56b50}" Type="string" />
- <Registry Name="ProjectTemplatesDir"
Value="[INSTALLDIR]Bistro.\NullPath" Type="string" />
+ <Registry Name="ProjectTemplatesDir" Value="[INSTALLDIR].\NullPath"
Type="string" />
<Registry Name="Language(VsTemplate)" Value="Bistro" Type="string" />
</Registry>
@@ -44,7 +44,7 @@
<RegistryKey Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0\NewProjectTemplates\TemplateDirs\{40049e67-3a71-47c2-adfa-87b89aa56b50}\/1">
<RegistryValue Name="SortPriority" Value="100" Type="integer" />
- <RegistryValue Name="TemplatesDir"
Value="[INSTALLDIR]Bistro.\NullPath" Type="string" />
+ <RegistryValue Name="TemplatesDir" Value="[INSTALLDIR].\NullPath"
Type="string" />
</RegistryKey>
<!--Non generated part-->
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/ExtenderReg.wxi Thu May 20
22:53:32 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/ExtenderReg.wxi Fri May 21
03:50:28 2010
@@ -8,11 +8,11 @@
<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, ProjectExtender2008,
Version=0.9.1.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.2.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="ProjectExtender2008, Version=0.9.1.0,
Culture=neutral, PublicKeyToken=null" Type="string" />
- <Registry Name="CodeBase"
Value="[INSTALLDIR]Bistro\ProjectExtender2008.dll" Type="string" />
+ <Registry Name="Assembly" Value="ProjectExtender2008, Version=0.9.2.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="1.0" Type="string" />
@@ -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]Bistro\ProjectExtender2008.dll" Type="string" />
+ <Registry Name="CodeBase" Value="[INSTALLDIR]ProjectExtender2008.dll"
Type="string" />
<Registry Name="ThreadingModel" Value="Both" Type="string" />
</Registry>
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Readme.txt Fri Apr 30
05:13:47 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Readme.txt Fri May 21
03:50:28 2010
@@ -3,6 +3,10 @@
Visual Studio 2008
F# CTP v.1.9.9.9 (You can download it from:
http://www.microsoft.com/downloads/details.aspx?FamilyID=ba52e650-4e77-4b0b-b987-9f9ecd3bab3b&displaylang=en)
+
+New in 0.9.3.0
+1. Now supports both VS2008 and VS2010.
+
New in 0.9.2.0
1. Added Bistro Designer with F# and C# installed project templates
2. Added NDjango.BistroIntegration.dll assembly
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Setup.wxs Wed May 19 10:01:36
2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Setup.wxs Fri May 21 03:50:28
2010
@@ -65,16 +65,16 @@
<WixVariable Id="WixUIDialogBmp" Value="bitmaps\dlgbmp.bmp" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="PFiles">
- <Directory Id="INSTALLDIR" Name="Hill30">
-
- <Directory Id="BistroDir" Name="Bistro">
- <Component Id="NDjangoMSI2008"
Guid="05FCB39B-E868-42A4-B508-958EA17050A3">
+ <Directory Id="Hill30" Name="Hill30">
+
+ <Directory Id="INSTALLDIR" Name="Bistro">
+ <!--<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>-->
<Component Id="NDjangoMSI2010"
Guid="7D7CCB7A-68A4-4E05-AA89-5A985C680559">
<Condition><![CDATA[VS2010FOUND <>
NULL]]></Condition>
- <File Id="NDJANGO10" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2010.msi" />
+ <File Id="NDJANGO10" Name="NDjangoSetup.msi"
Source="lib\NDjango2008Extended.msi" />
</Component>
<Component Id="BistroAssemblies"
Guid="EA80C8A8-63BE-4D5E-BACB-9FA941CD0C7C">
<RemoveFolder Id="RemoveMain"
Directory="INSTALLDIR" On="uninstall" />
@@ -225,27 +225,27 @@
</Feature>
<Feature Id="NDjango" Level="1">
- <ComponentRef Id="NDjangoMSI2008"/>
+ <!--<ComponentRef Id="NDjangoMSI2008"/>-->
<ComponentRef Id="NDjangoMSI2010"/>
</Feature>
<Property Id="NDJANGONEEDED" Value="1" />
<Binary Id="EditTemplates" SourceFile="versionWriterFull.exe" />
- <Property Id="WixShellExecTarget"
Value="[INSTALLDIR]Bistro\NDjangoSetup.msi"/>
+ <Property Id="WixShellExecTarget"
Value="[INSTALLDIR]NDjangoSetup.msi"/>
<CustomAction Id="InstallNDjango" BinaryKey="WixCA"
DllEntry="WixShellExec" Impersonate="yes"/>
<!--<CustomAction Id="RunMSI08" Directory="INSTALLDIR"
ExeCommand=""msiexec.exe" /passive /i
"[INSTALLDIR]Bistro\NDjangoSetup.msi"
AGREETOLICENSE="1"
INSTALLDIR="[INSTALLDIR]NDjango\NET35"
TEMPLATESNEEDED="0" DESIGNERNEEDED="1"" Return="ignore"
/>
<CustomAction Id="RunMSI10" Directory="INSTALLDIR"
ExeCommand=""msiexec.exe" /i
"[INSTALLDIR]Bistro\NDjangoSetup.msi"
AGREETOLICENSE="1"
INSTALLDIR="[INSTALLDIR]NDjango\NET40"" Return="ignore"/>-->
<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"
"[INSTALLDIR]Bistro" "[INSTALLDIR]NDjango\.NET35"
"[INSTALLDIR]NDjango\.NET40"
"[INSTALLDIR]ProjectExtender""
Id="EditBistroProject2008CustomAction" Return="ignore" Execute="commit" />
- <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]FSharp2008.zip"
"[INSTALLDIR]Bistro" "[INSTALLDIR]NDjango\.NET35"
"[INSTALLDIR]NDjango\.NET40"
"[INSTALLDIR]ProjectExtender"" Id="EditFSharp2008CustomAction"
Return="ignore" Execute="commit" />
- <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]CSharp2010.zip"
"[INSTALLDIR]Bistro" "[INSTALLDIR]NDjango\.NET35"
"[INSTALLDIR]NDjango\.NET40"
"[INSTALLDIR]ProjectExtender""
Id="EditBistroProject2010CustomAction" Return="ignore" Execute="commit" />
- <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]FSharp2010.zip"
"[INSTALLDIR]Bistro" "[INSTALLDIR]NDjango\.NET35"
"[INSTALLDIR]NDjango\.NET40"
"[INSTALLDIR]ProjectExtender"" Id="EditFSharp2010CustomAction"
Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]CSharp2008.zip"
"[Hill30]Bistro" "[Hill30]NDjango\.NET35"
"[Hill30]NDjango\.NET40" "[Hill30]ProjectExtender""
Id="EditBistroProject2008CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]FSharp2008.zip"
"[Hill30]Bistro" "[Hill30]NDjango\.NET35"
"[Hill30]NDjango\.NET40" "[Hill30]ProjectExtender""
Id="EditFSharp2008CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]CSharp2010.zip"
"[Hill30]Bistro" "[Hill30]NDjango\.NET35"
"[Hill30]NDjango\.NET40" "[Hill30]ProjectExtender""
Id="EditBistroProject2010CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]FSharp2010.zip"
"[Hill30]Bistro" "[Hill30]NDjango\.NET35"
"[Hill30]NDjango\.NET40" "[Hill30]ProjectExtender""
Id="EditFSharp2010CustomAction" Return="ignore" Execute="commit" />
- <CustomAction Id="InstallExtender2010" Property = "VSIX_PATH"
ExeCommand="/q "[INSTALLDIR]Bistro\ProjectExtender2010.vsix""
Return="ignore" Execute="deferred" />
- <CustomAction Id="InstallBistroDesigner2010" Property
= "VSIX_PATH" ExeCommand="/q
"[INSTALLDIR]Bistro\BistroDesigner2010.vsix"" Return="ignore"
Execute="deferred"/>
- <CustomAction Id="SetExtensionDir" Property="EXTENSIONHILL30FILES"
Value="[LocalAppDataFolder]\Microsoft\VisualStudio\10.0\Extensions\Hill30
Inc"/>
+ <CustomAction Id="InstallExtender2010" Property = "VSIX_PATH"
ExeCommand=""[INSTALLDIR]ProjectExtender2010.vsix" /q"
Return="ignore" Execute="deferred" />
+ <CustomAction Id="InstallBistroDesigner2010" Property
= "VSIX_PATH" ExeCommand=""[INSTALLDIR]BistroDesigner2010.vsix"
/q" Return="ignore" Execute="deferred"/>
+ <CustomAction Id="SetExtensionDir" Property="EXTENSIONHILL30FILES"
Value="[LocalAppDataFolder]\Microsoft\VisualStudio\10.0\Extensions\Hill30"/>
<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"/>
@@ -339,7 +339,7 @@
</Control>
<Control Type="CheckBox" Id="NDjangoCheckBox" Width="230"
Height="17" X="22" Y="169" Property="NDJANGONEEDED" CheckBoxValue="Yes"
Text="Install NDjango">
</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" />
+ <Control Type="Text" Id="NDjangoNote" Width="350"
Height="17" X="20" Y="190" Text="NOTE: You will not be able to use Bistro
applications with .django views without NDjango" />
</Dialog>
<InstallUISequence>
<Show Dialog="WelcomeDlgCustom" Before="ProgressDlg">NOT
Installed</Show>
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/CSharp.zip
Wed May 19 10:01:36 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/CSharp.zip
Fri May 21 03:50:28 2010
Binary file, no diff available.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/FSharp.zip
Wed May 19 10:01:36 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/FSharp.zip
Fri May 21 03:50:28 2010
Binary file, no diff available.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
Thu May 20 22:53:32 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
Fri May 21 03:50:28 2010
Binary file, no diff available.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2008.dll
Fri May 14 05:22:05 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2008.dll
Fri May 21 03:50:28 2010
Binary file, no diff available.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2010.vsix
Thu May 20 00:33:42 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2010.vsix
Fri May 21 03:50:28 2010
Binary file, no diff available.
Reply all
Reply to author
Forward
0 new messages