Revision: 445
Author:
sasha_...@mail.ru
Date: Sat May 15 03:38:04 2010
Log: complete - just need to fix RenderWith attribute issue
http://code.google.com/p/bistro-framework/source/detail?r=445
Added:
/Bistro/trunk/Bistro.SetupWiX/EditTemplates/versionWriterFull.exe
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.dll
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.pkgdef
Modified:
/Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi
/Bistro/trunk/Bistro.SetupWiX/BistroSetupWiX.wixproj
/Bistro/trunk/Bistro.SetupWiX/Setup.wxs
/Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/EditTemplates/versionWriterFull.exe Sat
May 15 03:38:04 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer2008.dll Sat May 15
03:38:04 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.dll Sat May 15
03:38:04 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.pkgdef Sat May 15
03:38:04 2010
@@ -0,0 +1,67 @@
+ÿþ[ $ R o o t K e y $ \ I n s t a l l e d P r o d u c t s \ P r o j e c t E x t e n d e r P a c k a g e ]
+
+ @ = " # 1 1 0 "
+
+ " P a c k a g e " = " { 5 a 8 f 5 a 4 d - d 1 e b - 4 0 3 e - 8 5 b 3 - 6 3 d f 6 0 7 f a 0 7 c } "
+
+ " P I D " = " 1 . 0 "
+
+ " P r o d u c t D e t a i l s " = " # 1 1 2 "
+
+ " L o g o I D " = " # 4 0 0 "
+
+ [ $ R o o t K e y $ \ P a c k a g e s \ { 5 a 8 f 5 a 4 d - d 1 e b - 4 0 3 e - 8 5 b 3 - 6 3 d f 6 0 7 f a 0 7 c } ]
+
+ @ = " F S h a r p . P r o j e c t E x t e n d e r . P r o j e c t E x t e n d e r P a c k a g e ,
P r o j e c t E x t e n d e r 2 0 1 0 ,
V e r s i o n = 0 . 9 . 1 . 0 ,
C u l t u r e = n e u t r a l ,
P u b l i c K e y T o k e n = 8 8 2 d 0 f 1 4 f e 7 9 6 8 8 d "
+
+ " I n p r o c S e r v e r 3 2 " = " $ W i n D i r $ \ s y s t e m 3 2 \ m s c o r e e . d l l "
+
+ " C l a s s " = " F S h a r p . P r o j e c t E x t e n d e r . P r o j e c t E x t e n d e r P a c k a g e "
+
+ " C o d e B a s e " = " $ P a c k a g e F o l d e r $ \ P r o j e c t E x t e n d e r 2 0 1 0 . d l l "
+
+ [ $ R o o t K e y $ \ P a c k a g e s \ { 5 a 8 f 5 a 4 d - d 1 e b - 4 0 3 e - 8 5 b 3 - 6 3 d f 6 0 7 f a 0 7 c } ]
+
+ " I D " = d w o r d : 0 0 0 0 0 0 6 4
+
+ " M i n E d i t i o n " = " S t a n d a r d "
+
+ " P r o d u c t V e r s i o n " = " 1 . 0 "
+
+ " P r o d u c t N a m e " = " F # P r o j e c t S y s t e m
E x t e n d e r "
+
+ " C o m p a n y N a m e " = " H i l l 3 0 I n c "
+
+ [ $ R o o t K e y $ \ M e n u s ]
+
+ " { 5 a 8 f 5 a 4 d - d 1 e b - 4 0 3 e - 8 5 b 3 - 6 3 d f 6 0 7 f a 0 7 c } " = " ,
1 0 0 0 ,
1 "
+
+ [ $ R o o t K e y $ \ C L S I D \ { a 5 f c 3 b b d - 8 7 9 5 - 4 2 d 0 - a a 5 5 - e 6 5 f e 9 9 2 3 7 8 e } ]
+
+ @ = " F S h a r p . P r o j e c t E x t e n d e r . P a g e "
+
+ " I n p r o c S e r v e r 3 2 " = " $ W i n D i r $ \ s y s t e m 3 2 \ m s c o r e e . d l l "
+
+ " C l a s s " = " F S h a r p . P r o j e c t E x t e n d e r . P a g e "
+
+ " C o d e B a s e " = " $ P a c k a g e F o l d e r $ \ P r o j e c t E x t e n d e r 2 0 1 0 . d l l "
+
+ " T h r e a d i n g M o d e l " = " B o t h "
+
+ [ $ R o o t K e y $ \ P r o j e c t s \ { 5 b 8 9 f c c 2 - c 9 f 6 - 4 9 a 8 - 8 f 8 d - e d d c c 3 f d c 9 e 9 } ]
+
+ @ = " F a c t o r y "
+
+ " D i s p l a y N a m e " = " P r o j e c t E x t e n d e r "
+
+ " P a c k a g e " = " { 5 a 8 f 5 a 4 d - d 1 e b - 4 0 3 e - 8 5 b 3 - 6 3 d f 6 0 7 f a 0 7 c } "
+
+ " P r o j e c t T e m p l a t e s D i r " = " $ P a c k a g e F o l d e r $ \ . \ N u l l P a t h "
+
+ " L a n g u a g e ( V s T e m p l a t e ) " = " F S h a r p "
+
+
+
+
+
+
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Fri May 14
05:22:05 2010
+++ /Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Sat May 15
03:38:04 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.Designer, 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.0.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.Designer, Version=0.9.0.0,
Culture=neutral, PublicKeyToken=null" Type="string" />
- <Registry Name="CodeBase" Value="[INSTALLDIR]Bistro.Designer.dll"
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.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" />
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/BistroSetupWiX.wixproj Fri Apr 30
05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/BistroSetupWiX.wixproj Sat May 15
03:38:04 2010
@@ -7,7 +7,7 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>Bistro</OutputName>
<OutputType>Package</OutputType>
- <WixTargetsPath Condition=" '$(WixTargetsPath)'
== '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
+ <WixTargetsPath Condition=" '$(WixTargetsPath)'
== '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\Wix.targets</WixTargetsPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|
x86' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -25,12 +25,15 @@
<ItemGroup>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+ <Name>WixUtilExtension</Name>
</WixExtension>
<WixExtension Include="WixNetFxExtension">
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+ <Name>WixNetFxExtension</Name>
</WixExtension>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+ <Name>WixUIExtension</Name>
</WixExtension>
</ItemGroup>
<ItemGroup>
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Setup.wxs Sat May 15 01:13:14 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Setup.wxs Sat May 15 03:38:04 2010
@@ -66,8 +66,8 @@
<Directory Id="NDJANGODIR" Name="NDjango">
<Component Id="NDjangoMSI2008"
Guid="05FCB39B-E868-42A4-B508-958EA17050A3">
<Condition><![CDATA[VS2010FOUND =
NULL]]></Condition>
- <RegistryValue Root="HKLM"
Key="Software\Hill30\NDjango\Net40" Name="InstallDir" Type="string"
Value="[NDJANGODIR]\.NET40" />
- <RegistryValue Root="HKLM"
Key="Software\Hill30\NDjango\Net35" Name="InstallDir" Type="string"
Value="[NDJANGODIR]\.NET35" KeyPath="yes" />
+ <RegistryValue Root="HKLM"
Key="Software\Hill30\NDjango\Net40" Name="InstallDir" Type="string"
Value="[NDJANGODIR].NET40" />
+ <RegistryValue Root="HKLM"
Key="Software\Hill30\NDjango\Net35" Name="InstallDir" Type="string"
Value="[NDJANGODIR].NET35" KeyPath="yes" />
<File Id="NDJANGO08" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2008.msi" />
</Component>
<Component Id="NDjangoMSI2010"
Guid="7D7CCB7A-68A4-4E05-AA89-5A985C680559">
@@ -87,7 +87,7 @@
<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="BistroDesigner"
Name="Bistro.Designer.dll" Source="lib\Bistro.Designer.dll" DiskId="1" />
+ <File Id="BistroDesigner"
Name="Bistro.Designer2008.dll" Source="lib\Bistro.Designer2008.dll"
DiskId="1" />
</Component>
<Component Id="Integration08"
Guid="107F0C00-5F85-4F65-BB23-E11B6878E5C6">
<Condition><![CDATA[VS2008FOUND <>
NULL]]></Condition>
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix Sat May 15
01:13:14 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix Sat May 15
03:38:04 2010
Binary file, no diff available.