Added:
/Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2010.msi
Deleted:
/Bistro/trunk/Bistro.SetupWiX/lib/extensionDesigner.vsixmanifest
Modified:
/Bistro/trunk/Bistro.Core/Properties/AssemblyInfo.cs
/Bistro/trunk/Bistro.Designer/Properties/AssemblyInfo.cs
/Bistro/trunk/Bistro.Extensions/Properties/AssemblyInfo.cs
/Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi
/Bistro/trunk/Bistro.SetupWiX/ExtenderReg.wxi
/Bistro/trunk/Bistro.SetupWiX/Readme.txt
/Bistro/trunk/Bistro.SetupWiX/Setup.wxs
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Core.dll
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Extensions.dll
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.FSharpExtensions.dll
/Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2008.dll
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.vsix
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2010.msi Tue Jun 22
01:39:48 2010
File is too large to display a diff.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/extensionDesigner.vsixmanifest Fri
Apr 16 03:44:25 2010
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Vsix xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.0.0"
xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
- <Identifier Id="BistroDesigner..a711dab5-37eb-48d7-94bf-3fb3c92e9b43">
- <Name>BistroDesigner</Name>
- <Author>Hill30</Author>
- <Version>1.0</Version>
- <Description xml:space="preserve">Bistro Designer provides an easy way
to create and manage Bistro applications.</Description>
- <Locale>1033</Locale>
- <SupportedProducts>
- <VisualStudio Version="10.0">
- <Edition>Pro</Edition>
- </VisualStudio>
- </SupportedProducts>
- <SupportedFrameworkRuntimeEdition MinVersion="3.5" MaxVersion="4.0" />
- </Identifier>
- <References />
- <Content>
- <VsPackage>Bistro.Designer.pkgdef</VsPackage>
- </Content>
-</Vsix>
=======================================
--- /Bistro/trunk/Bistro.Core/Properties/AssemblyInfo.cs Wed Dec 2
09:10:00 2009
+++ /Bistro/trunk/Bistro.Core/Properties/AssemblyInfo.cs Tue Jun 22
01:39:48 2010
@@ -32,4 +32,4 @@
// You can specify all the values or you can default the Revision and
Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("0.9.2.0")]
-[assembly: AssemblyFileVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.3.2")]
=======================================
--- /Bistro/trunk/Bistro.Designer/Properties/AssemblyInfo.cs Thu May 27
10:26:35 2010
+++ /Bistro/trunk/Bistro.Designer/Properties/AssemblyInfo.cs Tue Jun 22
01:39:48 2010
@@ -29,8 +29,8 @@
// You can specify all the values or you can default the Revision and
Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.9.3.1")]
-[assembly: AssemblyFileVersion("0.9.3.1")]
+[assembly: AssemblyVersion("0.9.3.0")]
+[assembly: AssemblyFileVersion("0.9.3.2")]
=======================================
--- /Bistro/trunk/Bistro.Extensions/Properties/AssemblyInfo.cs Wed Dec 2
09:10:00 2009
+++ /Bistro/trunk/Bistro.Extensions/Properties/AssemblyInfo.cs Tue Jun 22
01:39:48 2010
@@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.2.0")]
-[assembly: AssemblyFileVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.3.2")]
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Fri May 21
08:07:52 2010
+++ /Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Tue Jun 22
01:39:48 2010
@@ -11,10 +11,10 @@
<!--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.3.1, 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.0, 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.3.1,
Culture=neutral, PublicKeyToken=null" Type="string" />
+ <Registry Name="Assembly" Value="Bistro.Designer2008, Version=0.9.3.0,
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" />
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/ExtenderReg.wxi Fri May 21 08:07:52 2010
+++ /Bistro/trunk/Bistro.SetupWiX/ExtenderReg.wxi Tue Jun 22 01:39:48 2010
@@ -8,10 +8,10 @@
<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.2.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.3.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.2.0,
Culture=neutral, PublicKeyToken=null" Type="string" />
+ <Registry Name="Assembly" Value="ProjectExtender2008, Version=0.9.3.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" />
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Readme.txt Fri May 21 08:07:52 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Readme.txt Tue Jun 22 01:39:48 2010
@@ -1,9 +1,12 @@
+
Bistro Framework Requirements:
NET Framework 3.5 SP1
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)
-
-
+NOTE: If your OS is Windows Vista (Windows 7) and you use default UAC
settings,you must run setup "As Administrator".
+
+New in 0.9.3.2
+F# Project Extender bug fixes
New in 0.9.3.0
1. Now supports both VS2008 and VS2010.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Setup.wxs Fri May 21 08:07:52 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Setup.wxs Tue Jun 22 01:39:48 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.3.1" ?>
- <?define ProductVersionTitle="0.9.3.1" ?>
+ <?define ProductVersion="0.9.3.2" ?>
+ <?define ProductVersionTitle="0.9.3.2" ?>
<?define VisualStudioRegistryRoot2008
= "Software\Microsoft\VisualStudio\9.0" ?>
<?define VisualStudioRegistryRoot2010
= "Software\Microsoft\VisualStudio\10.0" ?>
<?define UpgradeCode="{E63B2D78-54C6-4d2a-B3EF-219EF3AE8FBC}"?>
- <Product Id="025811B6-BD51-4BAC-90F1-8E42D11D9B90" Name="Bistro
$(var.ProductVersionTitle)" Language="1033" Version="$(var.ProductVersion)"
Manufacturer="Hill30" UpgradeCode="$(var.UpgradeCode)">
+ <Product Id="276C4B07-61C1-4CF8-8638-30AD04ED9828" 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" />
@@ -68,12 +68,12 @@
<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 Id="NDjangoMSI2010"
Guid="7D7CCB7A-68A4-4E05-AA89-5A985C680559">
- <Condition><![CDATA[VS2010FOUND <>
NULL]]></Condition>
+ <Component Id="NDjangoMSI2010"
Guid="05FCB39B-E868-42A4-B508-958EA17050A3">
+ <Condition><![CDATA[VS2008FOUND =
NULL]]></Condition>
+ <File Id="NDJANGO08" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2010.msi" />
+ </Component>
+ <Component Id="NDjangoMSIExtended"
Guid="7D7CCB7A-68A4-4E05-AA89-5A985C680559">
+ <Condition><![CDATA[VS2008FOUND <>
NULL]]></Condition>
<File Id="NDJANGO10" Name="NDjangoSetup.msi"
Source="lib\NDjangoExtended.msi" />
</Component>
<Component Id="BistroAssemblies"
Guid="EA80C8A8-63BE-4D5E-BACB-9FA941CD0C7C">
@@ -225,7 +225,7 @@
</Feature>
<Feature Id="NDjango" Level="1">
- <!--<ComponentRef Id="NDjangoMSI2008"/>-->
+ <ComponentRef Id="NDjangoMSIExtended"/>
<ComponentRef Id="NDjangoMSI2010"/>
</Feature>
@@ -272,7 +272,8 @@
<Custom Action="RunMSI10"
After="InstallFinalize"><![CDATA[(Not Installed OR (Installer AND REMOVE
<> "ALL")) AND NDJANGONEEDED AND VS2010FOUND <> NULL ]]></Custom>-->
</InstallExecuteSequence>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
- <!--********UI********-->
+ <WixVariable Id="WixUICostingPopupOptOut" Value="1"
Overridable="yes" />
+ <!--********UI********-->
<UI>
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12"
/>
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Core.dll Sat May 15 04:18:42
2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Core.dll Tue Jun 22 01:39:48
2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer2008.dll Fri May 21
08:07:52 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer2008.dll Tue Jun 22
01:39:48 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Extensions.dll Fri Apr 30
05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Extensions.dll Tue Jun 22
01:39:48 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.FSharpExtensions.dll Sat May
15 04:18:42 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.FSharpExtensions.dll Tue Jun
22 01:39:48 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix Fri May 21
08:07:52 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix Tue Jun 22
01:39:48 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2008.dll Fri May 21
08:07:52 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2008.dll Tue Jun 22
01:39:48 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.vsix Fri May 21
08:07:52 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.vsix Tue Jun 22
01:39:48 2010
Binary file, no diff available.