[bistro-framework] r455 committed - [INSTALLDIR]Bistro is path to the folder where Bistro will be installe...

[codesite...@google.com]

Revision: 455
Author: sasha_...@mail.ru
Date: Thu May 20 22:53:32 2010
Log: [INSTALLDIR]Bistro is path to the folder where Bistro will be installed
http://code.google.com/p/bistro-framework/source/detail?r=455

Modified:
/Bistro/branches/v9.3.0.1/Bistro.Designer/Bistro.Designer2008.suo
/Bistro/branches/v9.3.0.1/Bistro.Designer/Bistro.DesignerPackage.cs
/Bistro/branches/v9.3.0.1/Bistro.Designer/BistroDesigner2010.suo
/Bistro/branches/v9.3.0.1/Bistro.Designer/Explorer/ChangesTracker.cs
/Bistro/branches/v9.3.0.1/Bistro.Designer/Explorer/ExplorerWindow.cs
/Bistro/branches/v9.3.0.1/Bistro.Designer/Projects/FSharp/ProjectManager.cs
/Bistro/branches/v9.3.0.1/Bistro.Designer/Properties/AssemblyInfo.cs
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroDesigner2008Reg.wxi
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroSetupWiX.wixproj
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/ExtenderReg.wxi
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/BistroDesigner2010.vsix

=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.Designer/Bistro.Designer2008.suo Wed
May 19 11:16:27 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.Designer/Bistro.Designer2008.suo Thu
May 20 22:53:32 2010
Binary file, no diff available.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.Designer/Bistro.DesignerPackage.cs Wed
May 19 11:16:27 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.Designer/Bistro.DesignerPackage.cs Thu
May 20 22:53:32 2010
@@ -37,10 +37,10 @@
// This attribute is used to register the informations needed to show
the this package
// in the Help/About dialog of Visual Studio.
#if VS2008
- [InstalledProductRegistration(false, "#110", "#112", "1.0",
IconResourceID = 400)]
+ [InstalledProductRegistration(false, "#110", "#112", "0.9",
IconResourceID = 400)]
#endif
#if VS2010
- [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID =
400)]
+ [InstalledProductRegistration("#110", "#112", "0.9", IconResourceID =
400)]
#endif
// In order be loaded inside Visual Studio in a machine that has not
the VS SDK installed,
// package needs to have a valid load key (it can be requested at
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.Designer/BistroDesigner2010.suo Wed
May 19 11:16:27 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.Designer/BistroDesigner2010.suo Thu
May 20 22:53:32 2010
Binary file, no diff available.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.Designer/Explorer/ChangesTracker.cs
Sat May 15 05:04:03 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.Designer/Explorer/ChangesTracker.cs
Thu May 20 22:53:32 2010
@@ -20,7 +20,6 @@
namespace Bistro.Designer.Explorer
{
using ControllersTable = Dictionary<string, Dictionary<string,
List<string>>>;
- using Microsoft.Build.BuildEngine;
public delegate void UpdateTreeDelegate(object sender, UpdateEventArgs
e);
public struct Node
{
@@ -44,10 +43,10 @@
internal ChangesTracker(string parserType)
{

- SectionHandler sh = new SectionHandler();
- sh.Application = "Bistro.Application";
- sh.LoggerFactory = "Bistro.Logging.DefaultLoggerFactory";
- Bistro.Application.Initialize(sh);
+ //SectionHandler sh = new SectionHandler();
+ //sh.Application = "Bistro.Application";
+ //sh.LoggerFactory = "Bistro.Logging.DefaultLoggerFactory";
+ //Bistro.Application.Initialize(sh);
this.engine = new
Bistro.MethodsEngine.EngineControllerDispatcher(Bistro.Application.Instance);
this.projExt = parserType;
if (parserType == "csproj")
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.Designer/Explorer/ExplorerWindow.cs
Sat May 15 05:04:03 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.Designer/Explorer/ExplorerWindow.cs
Thu May 20 22:53:32 2010
@@ -11,7 +11,6 @@
using Microsoft.VisualStudio.Shell.Interop;
using Microsoft.VisualStudio.Shell;
using Microsoft.VisualStudio.Shell.Flavor;
-using Microsoft.Build.BuildEngine;

using Bistro;
using Bistro.Configuration;
=======================================
---
/Bistro/branches/v9.3.0.1/Bistro.Designer/Projects/FSharp/ProjectManager.cs
Sat May 15 05:04:03 2010
+++
/Bistro/branches/v9.3.0.1/Bistro.Designer/Projects/FSharp/ProjectManager.cs
Thu May 20 22:53:32 2010
@@ -8,7 +8,6 @@
using Microsoft.VisualStudio.Shell;
using Microsoft.VisualStudio;
using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.Build.BuildEngine;

using Bistro.Configuration;

=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.Designer/Properties/AssemblyInfo.cs
Sat May 15 05:04:03 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.Designer/Properties/AssemblyInfo.cs
Thu May 20 22:53:32 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.9.3.0")]
+[assembly: AssemblyFileVersion("0.9.3.1")]



=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Sat
May 15 03:38:04 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Thu
May 20 22:53:32 2010
@@ -15,7 +15,7 @@
<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.Designer2008.dll"
Type="string" />
+ <Registry Name="CodeBase"
Value="[INSTALLDIR]Bistro\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].\NullPath"
Type="string" />
+ <Registry Name="ProjectTemplatesDir"
Value="[INSTALLDIR]Bistro.\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].\NullPath"
Type="string" />
+ <RegistryValue Name="TemplatesDir"
Value="[INSTALLDIR]Bistro.\NullPath" Type="string" />
</RegistryKey>

<!--Non generated part-->
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroSetupWiX.wixproj Thu
May 20 01:19:27 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroSetupWiX.wixproj Thu
May 20 22:53:32 2010
@@ -70,7 +70,5 @@
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
</PropertyGroup>
</Project>
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/ExtenderReg.wxi Fri May 14
05:22:05 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/ExtenderReg.wxi Thu May 20
22:53:32 2010
@@ -12,7 +12,7 @@
<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]ProjectExtender2008.dll"
Type="string" />
+ <Registry Name="CodeBase"
Value="[INSTALLDIR]Bistro\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]ProjectExtender2008.dll"
Type="string" />
+ <Registry Name="CodeBase"
Value="[INSTALLDIR]Bistro\ProjectExtender2008.dll" Type="string" />
<Registry Name="ThreadingModel" Value="Both" Type="string" />
</Registry>

@@ -43,7 +43,7 @@
</Registry>

<RegistryKey Root="HKLM" Key="Software\Hill30\ProjectExtender" >
- <RegistryValue Name="InstallDir" Type="string" Value="[INSTALLDIR]" />
+ <RegistryValue Name="InstallDir" Type="string"
Value="[INSTALLDIR]Bistro" />
</RegistryKey>

</Include>
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
Wed May 19 10:01:36 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
Thu May 20 22:53:32 2010
Binary file, no diff available.
=======================================
--- /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/BistroDesigner2010.vsix
Wed May 19 10:01:36 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/BistroDesigner2010.vsix
Thu May 20 22:53:32 2010
Binary file, no diff available.