[bistro-framework] r458 committed - merge from v0.9.3.1 branch

5 views

Skip to first unread message

codesite...@google.com

unread,

May 21, 2010, 11:09:36 AM5/21/10

to bistro-d...@googlegroups.com

Revision: 458
Author: KirillSkrygan
Date: Fri May 21 08:07:52 2010
Log: merge from v0.9.3.1 branch
http://code.google.com/p/bistro-framework/source/detail?r=458

Added:
/Bistro/trunk/Bistro.Designer/Bistro.Designer2008.csproj
/Bistro/trunk/Bistro.Designer/Bistro.Designer2008.sln
/Bistro/trunk/Bistro.Designer/Bistro.Designer2008.suo
/Bistro/trunk/Bistro.Designer/BistroDesigner2010.csproj
/Bistro/trunk/Bistro.Designer/BistroDesigner2010.sln
/Bistro/trunk/Bistro.Designer/BistroDesigner2010.suo
/Bistro/trunk/Bistro.Designer/source.extension.vsixmanifest
/Bistro/trunk/Bistro.SetupWiX/lib/NDjangoExtended.msi
Deleted:
/Bistro/trunk/Bistro.Designer/Bistro.Designer.csproj
/Bistro/trunk/Bistro.Designer/Bistro.Designer.sln
/Bistro/trunk/Bistro.Designer/Bistro.Designer.suo
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/BistroNHibernate.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/BistroProject.zip
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.dll
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.pkgdef
/Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2008.msi
/Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2010.msi
/Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetupExtended.msi
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.dll
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.pkgdef
Modified:
/Bistro/trunk
/Bistro/trunk/Bistro.Core
/Bistro/trunk/Bistro.Core/Controllers/ControllerHandler.cs
/Bistro/trunk/Bistro.Core/Controllers/Descriptor/Wrappers
/Bistro/trunk/Bistro.Core/Interfaces
/Bistro/trunk/Bistro.Core/MethodsEngine
/Bistro/trunk/Bistro.Core/MethodsEngine/Reflection
/Bistro/trunk/Bistro.Core/MethodsEngine/Subsets
/Bistro/trunk/Bistro.Designer/Bistro.DesignerPackage.cs
/Bistro/trunk/Bistro.Designer/Explorer/ChangesTracker.cs
/Bistro/trunk/Bistro.Designer/Explorer/ExplorerWindow.cs
/Bistro/trunk/Bistro.Designer/Projects/FSharp/ProjectManager.cs
/Bistro/trunk/Bistro.Designer/Properties/AssemblyInfo.cs
/Bistro/trunk/Bistro.Designer/VSPackage.resx
/Bistro/trunk/Bistro.SetupWiX
/Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi
/Bistro/trunk/Bistro.SetupWiX/BistroSetupWiX.wixproj
/Bistro/trunk/Bistro.SetupWiX/EditTemplates/Program.cs
/Bistro/trunk/Bistro.SetupWiX/EditTemplates/versionWriter.exe
/Bistro/trunk/Bistro.SetupWiX/ExtenderReg.wxi
/Bistro/trunk/Bistro.SetupWiX/Readme.txt
/Bistro/trunk/Bistro.SetupWiX/Setup.wxs
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/CSharp.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/FSharp.zip
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
/Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2008.dll
/Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.vsix
/Bistro/trunk/Bistro.SetupWiX/versionWriterFull.exe
/Bistro/trunk/Bistro.UnitTests

=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.Designer/Bistro.Designer2008.csproj Fri May 21
08:07:52 2010
@@ -0,0 +1,477 @@
+<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
ToolsVersion="3.5">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)'
== '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Bistro.Designer</RootNamespace>
+ <AssemblyName>Bistro.Designer2008</AssemblyName>
+ <SignAssembly>False</SignAssembly>
+ <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <ProjectGuid>{7C11A46D-27A6-41F9-A754-0D9F1DA4369D}</ProjectGuid>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|
AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>TRACE;DEBUG;VS2008</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <UseVSHostingProcess>true</UseVSHostingProcess>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|
AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <RunCodeAnalysis>true</RunCodeAnalysis>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Bistro.Core, Version=0.9.2.0, Culture=neutral,
processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\Bistro.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="EnvDTE" />
+ <Reference Include="EnvDTE80" />
+ <Reference Include="FSharp.Core, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\..\..\Program Files
(x86)\FSharp-1.9.9.9\\bin\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.ProjectSystem.Base, Version=2.0.50727.0,
Culture=neutral, PublicKeyToken=a19089b1c74d0809,
processorArchitecture=MSIL" />
+ <Reference Include="Irony, Version=1.0.0.0, Culture=neutral,
PublicKeyToken=ca48ace7223ead47, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\Irony.dll</HintPath>
+ </Reference>
+ <Reference Include="Irony.Samples, Version=1.0.0.0, Culture=neutral,
processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\Irony.Samples.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Build.Engine, Version=3.5.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL">
+ <HintPath>Microsoft.Build.Engine.dll</HintPath>
+ <Name>Microsoft.Build.Engine</Name>
+ <SpecificVersion>Yes</SpecificVersion>
+ <Aliases>global</Aliases>
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="Microsoft.Build.Framework, Version=3.5.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL">
+ <HintPath>Microsoft.Build.Framework.dll</HintPath>
+ <Name>Microsoft.Build.Framework</Name>
+ <SpecificVersion>Yes</SpecificVersion>
+ <Aliases>global</Aliases>
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="Microsoft.Build.Utilities.v3.5, Version=3.5.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL">
+ <HintPath>Microsoft.Build.Utilities.v3.5.dll</HintPath>
+ <Name>Microsoft.Build.Utilities.v3.5</Name>
+ <SpecificVersion>Yes</SpecificVersion>
+ <Aliases>global</Aliases>
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.CommonIDE, Version=9.0.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL" />
+ <Reference Include="Microsoft.VisualStudio.Editors" />
+ <Reference Include="Microsoft.VisualStudio.ManagedInterfaces" />
+ <Reference Include="Microsoft.VisualStudio.ProjectAggregator,
Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL" />
+ <Reference Include="Microsoft.VisualStudio.Shell.Design,
Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL" />
+ <Reference Include="Microsoft.VisualStudio.VSHelp, Version=7.0.3300.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
+ <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
+ <Reference Include="Microsoft.VisualStudio.Shell.9.0" />
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />
+ <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
+ <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0" />
+ <Reference Include="System" />
+ <Reference Include="System.configuration" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="System.Data" />
+ <Reference Include="System.Design" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
+ <Reference Include="VSLangProj" />
+ <Reference Include="VSLangProj80, Version=8.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio
9.0\Common7\IDE\PublicAssemblies\VSLangProj80.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Bistro.DesignerPackage.cs" />
+ <Compile Include="Guids.cs" />
+ <Compile Include="Explorer\Parsers\FSharpParser.cs" />
+ <Compile Include="Projects\FSharp\Factory.cs" />
+ <Compile Include="Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="GlobalSuppressions.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="PkgCmdID.cs" />
+ </ItemGroup>
+ <PropertyGroup>
+
<VSSDKCSharpIncPath>$(VSSDK90Install)VisualStudioIntegration\Common\Source\CSharp</VSSDKCSharpIncPath>
+
<CommonRegAttributes>$(VSSDKCSharpIncPath)\RegistrationAttributes</CommonRegAttributes>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Include="$(CommonRegAttributes)\WebSiteProjectAttribute.cs">
+ <Link>RegistrationAttributes\WebSiteProjectAttribute.cs</Link>
+ </Compile>
+ <Compile
Include="$(CommonRegAttributes)\WebSiteProjectRelatedFilesAttribute.cs">
+
<Link>RegistrationAttributes\WebSiteProjectRelatedFilesAttribute.cs</Link>
+ </Compile>
+ <Compile
Include="$(CommonRegAttributes)\WAProvideLanguagePropertyAttribute.cs">
+
<Link>RegistrationAttributes\WAProvideLanguagePropertyAttribute.cs</Link>
+ </Compile>
+ <Compile
Include="$(CommonRegAttributes)\WAProvideProjectFactoryAttribute.cs">
+
<Link>RegistrationAttributes\WAProvideProjectFactoryAttribute.cs</Link>
+ </Compile>
+ <Compile
Include="$(CommonRegAttributes)\WAProvideProjectFactoryTemplateMappingAttribute.cs">
+
<Link>RegistrationAttributes\WAProvideProjectFactoryTemplateMappingAttribute.cs</Link>
+ </Compile>
+ <Compile
Include="$(CommonRegAttributes)\ProvideMSBuildTargetAttribute.cs">
+ <Link>RegistrationAttributes\ProvideMSBuildTargetAttribute.cs</Link>
+ </Compile>
+ <Compile Include="Explorer\ChangesTracker.cs" />
+ <Compile Include="Explorer\DesignerControl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="Explorer\DesignerControl.Designer.cs">
+ <DependentUpon>DesignerControl.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Explorer\ExplorerWindow.cs" />
+ <Compile Include="Explorer\FileManager.cs" />
+ <Compile Include="Explorer\Notifier.cs" />
+ <Compile Include="Explorer\Parsers\CSharpParser.cs" />
+ <Compile Include="Explorer\Parsers\MetadataParserBase.cs" />
+ <Compile Include="ProjectBase\AssemblyReferenceNode.cs" />
+ <Compile Include="ProjectBase\Attributes.cs" />
+ <Compile Include="ProjectBase\Automation\AutomationScope.cs" />
+ <Compile Include="ProjectBase\Automation\OAFileItem.cs" />
+ <Compile Include="ProjectBase\Automation\OAFolderItem.cs" />
+ <Compile Include="ProjectBase\Automation\OANavigableProjectItems.cs" />
+ <Compile Include="ProjectBase\Automation\OANestedProjectItem.cs" />
+ <Compile Include="ProjectBase\Automation\OANullProperty.cs" />
+ <Compile Include="ProjectBase\Automation\OAProject.cs" />
+ <Compile Include="ProjectBase\Automation\OAProjectItem.cs" />
+ <Compile Include="ProjectBase\Automation\OAProjectItems.cs" />
+ <Compile Include="ProjectBase\Automation\OAProperties.cs" />
+ <Compile Include="ProjectBase\Automation\OAProperty.cs" />
+ <Compile Include="ProjectBase\Automation\OAReferenceFolderItem.cs" />
+ <Compile Include="ProjectBase\Automation\OAReferenceItem.cs" />
+ <Compile Include="ProjectBase\Automation\OASolutionFolder.cs" />
+ <Compile
Include="ProjectBase\Automation\VSProject\OAAssemblyReference.cs" />
+ <Compile Include="ProjectBase\Automation\VSProject\OABuildManager.cs"
/>
+ <Compile Include="ProjectBase\Automation\VSProject\OAComReference.cs"
/>
+ <Compile
Include="ProjectBase\Automation\VSProject\OAProjectReference.cs" />
+ <Compile Include="ProjectBase\Automation\VSProject\OAReferenceBase.cs"
/>
+ <Compile Include="ProjectBase\Automation\VSProject\OAReferences.cs" />
+ <Compile Include="ProjectBase\Automation\VSProject\OAVSProject.cs" />
+ <Compile Include="ProjectBase\Automation\VSProject\OAVSProjectItem.cs"
/>
+ <Compile Include="ProjectBase\BuildDependency.cs" />
+ <Compile Include="ProjectBase\BuildPropertyPage.cs" />
+ <Compile Include="ProjectBase\ComReferenceNode.cs" />
+ <Compile Include="ProjectBase\ConfigProvider.cs" />
+ <Compile Include="ProjectBase\ConfigurationProperties.cs" />
+ <Compile Include="ProjectBase\DataObject.cs" />
+ <Compile Include="ProjectBase\DependentFileNode.cs" />
+ <Compile Include="ProjectBase\DesignPropertyDescriptor.cs" />
+ <Compile Include="ProjectBase\DocumentManager.cs" />
+ <Compile Include="ProjectBase\DontShowAgainDialog.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="ProjectBase\DontShowAgainDialog.Designer.cs">
+ <DependentUpon>DontShowAgainDialog.cs</DependentUpon>
+ </Compile>
+ <Compile Include="ProjectBase\EnumDependencies.cs" />
+ <Compile Include="ProjectBase\FileChangeManager.cs" />
+ <Compile Include="ProjectBase\FileDocumentManager.cs" />
+ <Compile Include="ProjectBase\FileNode.cs" />
+ <Compile Include="ProjectBase\FolderNode.cs" />
+ <Compile Include="ProjectBase\GlobalPropertyHandler.cs" />
+ <Compile Include="ProjectBase\GlobalSuppressions.cs" />
+ <Compile Include="ProjectBase\HierarchyNode.cs" />
+ <Compile Include="ProjectBase\IDEBuildLogger.cs" />
+ <Compile Include="ProjectBase\ImageHandler.cs" />
+ <Compile Include="ProjectBase\Interfaces.cs" />
+ <Compile Include="ProjectBase\LocalizableProperties.cs" />
+ <Compile Include="ProjectBase\Misc\ConnectionPointContainer.cs" />
+ <Compile Include="ProjectBase\Misc\ExternDll.cs" />
+ <Compile Include="ProjectBase\Misc\NativeMethods.cs" />
+ <Compile Include="ProjectBase\Misc\UnsafeNativeMethods.cs" />
+ <Compile Include="ProjectBase\NestedProjectBuildDependency.cs" />
+ <Compile Include="ProjectBase\NestedProjectNode.cs" />
+ <Compile Include="ProjectBase\NodeProperties.cs" />
+ <Compile Include="ProjectBase\OleServiceProvider.cs" />
+ <Compile Include="ProjectBase\Output.cs" />
+ <Compile Include="ProjectBase\OutputGroup.cs" />
+ <Compile Include="ProjectBase\ProjectBase.cs" />
+ <Compile Include="ProjectBase\ProjectConfig.cs" />
+ <Compile Include="ProjectBase\ProjectContainerNode.cs" />
+ <Compile Include="ProjectBase\ProjectDesignerDocumentManager.cs" />
+ <Compile Include="ProjectBase\ProjectDocumentsListener.cs" />
+ <Compile Include="ProjectBase\ProjectElement.cs" />
+ <Compile Include="ProjectBase\ProjectFactory.cs" />
+ <Compile Include="ProjectBase\ProjectFileConstants.cs" />
+ <Compile Include="ProjectBase\ProjectNode.CopyPaste.cs" />
+ <Compile Include="ProjectBase\ProjectNode.cs" />
+ <Compile Include="ProjectBase\ProjectNode.Events.cs" />
+ <Compile Include="ProjectBase\ProjectOptions.cs" />
+ <Compile Include="ProjectBase\ProjectPackage.cs" />
+ <Compile Include="ProjectBase\ProjectReferenceNode.cs" />
+ <Compile Include="ProjectBase\ProjectSecurityChecker.cs" />
+ <Compile Include="ProjectBase\PropertiesEditorLauncher.cs" />
+ <Compile Include="ProjectBase\ReferenceContainerNode.cs" />
+ <Compile Include="ProjectBase\ReferenceNode.cs" />
+ <Compile Include="ProjectBase\RegisteredProjectType.cs" />
+ <Compile Include="ProjectBase\SecurityWarningDialog.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="ProjectBase\SecurityWarningDialog.Designer.cs">
+ <DependentUpon>SecurityWarningDialog.cs</DependentUpon>
+ </Compile>
+ <Compile Include="ProjectBase\SelectionListener.cs" />
+ <Compile Include="ProjectBase\SettingsPage.cs" />
+ <Compile Include="ProjectBase\SingleFileGenerator.cs" />
+ <Compile Include="ProjectBase\SingleFileGeneratorFactory.cs" />
+ <Compile Include="ProjectBase\SolutionListener.cs" />
+ <Compile
Include="ProjectBase\SolutionListenerForBuildDependencyUpdate.cs" />
+ <Compile Include="ProjectBase\SolutionListenerForProjectEvents.cs" />
+ <Compile Include="ProjectBase\SolutionListenerForProjectOpen.cs" />
+ <Compile
Include="ProjectBase\SolutionListenerForProjectReferenceUpdate.cs" />
+ <Compile Include="ProjectBase\StructuresEnums.cs" />
+ <Compile Include="ProjectBase\SuspendFileChanges.cs" />
+ <Compile Include="ProjectBase\TokenProcessor.cs" />
+ <Compile Include="ProjectBase\Tracing.cs" />
+ <Compile Include="ProjectBase\TrackDocumentsHelper.cs" />
+ <Compile Include="ProjectBase\TypeConverters.cs" />
+ <Compile Include="ProjectBase\UpdateSolutionEventsListener.cs" />
+ <Compile Include="ProjectBase\Url.cs" />
+ <Compile Include="ProjectBase\UserProjectSecurityChecker.cs" />
+ <Compile Include="ProjectBase\Utilities.cs" />
+ <Compile Include="ProjectBase\VsCommands.cs" />
+ <Compile Include="ProjectBase\VSShellUtilities.cs" />
+ <Compile Include="Projects\FSharp\ProjectManager.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="VSPackage.resx">
+ <MergeWithCTO>true</MergeWithCTO>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <VSCTCompile Include="Bistro.Designer.vsct">
+ <ResourceName>1000</ResourceName>
+ </VSCTCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Key.snk" />
+ <None Include="ProjectBase\Diagrams\AutomationClasses.cd" />
+ <None Include="ProjectBase\Diagrams\ConfigurationClasses.cd" />
+ <None Include="ProjectBase\Diagrams\DocumentManagerClasses.cd" />
+ <None Include="ProjectBase\Diagrams\HierarchyClasses.cd" />
+ <None Include="ProjectBase\Diagrams\PropertiesClasses.cd" />
+ <None Include="ProjectBase\Diagrams\ReferenceClasses.cd" />
+ <EmbeddedResource Include="Explorer\DesignerControl.resx">
+ <DependentUpon>DesignerControl.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="ProjectBase\DontShowAgainDialog.resx">
+ <DependentUpon>DontShowAgainDialog.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="ProjectBase\ProjectBase.resx">
+ <DependentUpon>ProjectBase.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="ProjectBase\SecurityWarningDialog.resx">
+ <DependentUpon>SecurityWarningDialog.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\Images_32bit.bmp" />
+ <EmbeddedResource Include="Resources\Images_24bit.bmp" />
+ <EmbeddedResource Include="Resources\Root.bmp" />
+ <EmbeddedResource Include="Resources\imagelis.bmp">
+ <Visible>true</Visible>
+ <LogicalName>Resources.imagelis.bmp</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\alert.png" />
+ <EmbeddedResource Include="Resources\bullet.png" />
+ <EmbeddedResource Include="Resources\green_star.png" />
+ <EmbeddedResource Include="Resources\lock.gif" />
+ <EmbeddedResource Include="Resources\mechanic.gif" />
+ <Content Include="Resources\Package.ico" />
+ <EmbeddedResource Include="Resources\white.PNG" />
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem
Include="Templates\ProjectItems\BrowserFile\BrowserFile.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem
Include="Templates\ProjectItems\BrowserFile\BrowserFile.Browser">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem Include="Templates\ProjectItems\JScript\JScript.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\JScript\JScript.js">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem
Include="Templates\ProjectItems\StyleSheet\StyleSheet.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\StyleSheet\StyleSheet.css">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem
Include="Templates\ProjectItems\WebConfig\WebConfig.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\WebConfig\Web.Config">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem
Include="Templates\ProjectItems\WebHTMLPage\WebHTMLPage.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\WebHTMLPage\HTMLPage.htm">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem Include="Templates\ProjectItems\NDjango\NDjango.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\NDjango\NDjango.django">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\NDjango\NDjango.ico">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem Include="Templates\ProjectItems\Text\Text.ico">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\Text\TextFile.txt">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\Text\TextFile.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem
Include="Templates\ProjectItems\FSharpControllers\CodeFile.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem
Include="Templates\ProjectItems\FSharpControllers\CodeFile.fs">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ <ItemGroup>
+ <ZipProject Include="Templates\Projects\FSharp\base.django">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\Controllers.fs">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\FSharpProject.fsproj">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\home.django">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\Web.config">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\Bistro.Core.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\Bistro.Core.pdb">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\Bistro.Extensions.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\Bistro.Extensions.pdb">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject
Include="Templates\Projects\FSharp\Bistro.FSharpExtensions.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject
Include="Templates\Projects\FSharp\Bistro.FSharpExtensions.pdb">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\default.htm">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\FSharpProject.ico">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject
Include="Templates\Projects\FSharp\FSharpProject.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject
Include="Templates\Projects\FSharp\NDjango.BistroIntegration.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject
Include="Templates\Projects\FSharp\NDjango.BistroIntegration.pdb">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\NDjango.Core.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\NDjango.Core.pdb">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\NDjango.Filters.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\NDjango.Filters.pdb">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\StructureMap.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ </ItemGroup>
+ <PropertyGroup>
+ 
+ <RegisterOutputPackage>true</RegisterOutputPackage>
+ <RegisterWithCodebase>true</RegisterWithCodebase>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <Import
Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets"
/>
+ 
+</Project>
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.Designer/Bistro.Designer2008.sln Fri May 21
08:07:52 2010
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}")
= "Bistro.Designer2008", "Bistro.Designer2008.csproj", "{7C11A46D-27A6-41F9-A754-0D9F1DA4369D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}")
= "ProjectExtender", "..\ProjectExtender\ProjectExtender.csproj", "{C085BF9A-0393-4D2C-8EAE-7BA0ED1EEB09}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {7C11A46D-27A6-41F9-A754-0D9F1DA4369D}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
+ {7C11A46D-27A6-41F9-A754-0D9F1DA4369D}.Debug|Any CPU.Build.0 = Debug|Any
CPU
+ {7C11A46D-27A6-41F9-A754-0D9F1DA4369D}.Release|Any CPU.ActiveCfg =
Release|Any CPU
+ {7C11A46D-27A6-41F9-A754-0D9F1DA4369D}.Release|Any CPU.Build.0 = Release|
Any CPU
+ {C085BF9A-0393-4D2C-8EAE-7BA0ED1EEB09}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
+ {C085BF9A-0393-4D2C-8EAE-7BA0ED1EEB09}.Debug|Any CPU.Build.0 = Debug|Any
CPU
+ {C085BF9A-0393-4D2C-8EAE-7BA0ED1EEB09}.Release|Any CPU.ActiveCfg =
Release|Any CPU
+ {C085BF9A-0393-4D2C-8EAE-7BA0ED1EEB09}.Release|Any CPU.Build.0 = Release|
Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.Designer/Bistro.Designer2008.suo Fri May 21
08:07:52 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.Designer/BistroDesigner2010.csproj Fri May 21
08:07:52 2010
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
ToolsVersion="4.0">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)'
== '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{6DAA8F30-4623-49C0-B98E-5BA486C1F944}</ProjectGuid>
+
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Hill30Inc.BistroDesigner2010</RootNamespace>
+ <AssemblyName>BistroDesigner2010</AssemblyName>
+ <SignAssembly>false</SignAssembly>
+ <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|
AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>TRACE;DEBUG;VS2010</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|
AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <RunCodeAnalysis>true</RunCodeAnalysis>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Bistro.Core, Version=0.9.2.0, Culture=neutral,
processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\Bistro.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ <Reference Include="FSharp.ProjectSystem.Base, Version=4.0.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL">
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </Reference>
+ <Reference Include="FSharp.ProjectSystem.FSharp, Version=1.9.9.9,
Culture=neutral, PublicKeyToken=a19089b1c74d0809,
processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+
<HintPath>..\..\..\..\..\WINDOWS\Microsoft.NET\assembly\GAC_MSIL\FSharp.ProjectSystem.FSharp\v4.0_4.0.0.0__b03f5f7f11d50a3a\FSharp.ProjectSystem.FSharp.dll</HintPath>
+ </Reference>
+ <Reference Include="Irony, Version=1.0.0.0, Culture=neutral,
PublicKeyToken=ca48ace7223ead47, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\Irony.dll</HintPath>
+ </Reference>
+ <Reference Include="Irony.Samples, Version=1.0.0.0, Culture=neutral,
processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\Irony.Samples.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />
+ <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
+ <Reference Include="Microsoft.VisualStudio.Shell.10.0">
+ <Private>false</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Design" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <COMReference Include="EnvDTE">
+ <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
+ <VersionMajor>8</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>primary</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </COMReference>
+ <COMReference Include="EnvDTE100">
+ <Guid>{26AD1324-4B7C-44BC-84F8-B86AED45729F}</Guid>
+ <VersionMajor>10</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>primary</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </COMReference>
+ <COMReference Include="EnvDTE80">
+ <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
+ <VersionMajor>8</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>primary</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </COMReference>
+ <COMReference Include="EnvDTE90">
+ <Guid>{2CE2370E-D744-4936-A090-3FFFE667B0E1}</Guid>
+ <VersionMajor>9</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>primary</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </COMReference>
+ <COMReference Include="Microsoft.VisualStudio.CommandBars">
+ <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>
+ <VersionMajor>8</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>primary</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </COMReference>
+ <COMReference Include="stdole">
+ <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
+ <VersionMajor>2</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>primary</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
+ </COMReference>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="source.extension.vsixmanifest">
+ <SubType>Designer</SubType>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Bistro.DesignerPackage.cs" />
+ <Compile Include="Guids.cs" />
+ <Compile Include="Explorer\Parsers\FSharpParser.cs" />
+ <Compile Include="Projects\FSharp\Factory.cs" />
+ <Compile Include="Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="GlobalSuppressions.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="PkgCmdID.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="C:\Program Files\Microsoft Visual Studio 2010
SDK\VisualStudioIntegration\Common\Source\CSharp\RegistrationAttributes\WebSiteProjectAttribute.cs">
+ <Link>RegistrationAttributes\WebSiteProjectAttribute.cs</Link>
+ </Compile>
+ <Compile Include="C:\Program Files\Microsoft Visual Studio 2010
SDK\VisualStudioIntegration\Common\Source\CSharp\RegistrationAttributes\WebSiteProjectRelatedFilesAttribute.cs">
+
<Link>RegistrationAttributes\WebSiteProjectRelatedFilesAttribute.cs</Link>
+ </Compile>
+ <Compile Include="C:\Program Files\Microsoft Visual Studio 2010
SDK\VisualStudioIntegration\Common\Source\CSharp\RegistrationAttributes\WAProvideLanguagePropertyAttribute.cs">
+
<Link>RegistrationAttributes\WAProvideLanguagePropertyAttribute.cs</Link>
+ </Compile>
+ <Compile Include="C:\Program Files\Microsoft Visual Studio 2010
SDK\VisualStudioIntegration\Common\Source\CSharp\RegistrationAttributes\WAProvideProjectFactoryAttribute.cs">
+
<Link>RegistrationAttributes\WAProvideProjectFactoryAttribute.cs</Link>
+ </Compile>
+ <Compile Include="C:\Program Files\Microsoft Visual Studio 2010
SDK\VisualStudioIntegration\Common\Source\CSharp\RegistrationAttributes\WAProvideProjectFactoryTemplateMappingAttribute.cs">
+
<Link>RegistrationAttributes\WAProvideProjectFactoryTemplateMappingAttribute.cs</Link>
+ </Compile>
+ <Compile Include="C:\Program Files\Microsoft Visual Studio 2010
SDK\VisualStudioIntegration\Common\Source\CSharp\RegistrationAttributes\ProvideMSBuildTargetAttribute.cs">
+ <Link>RegistrationAttributes\ProvideMSBuildTargetAttribute.cs</Link>
+ </Compile>
+ <Compile Include="Explorer\ChangesTracker.cs" />
+ <Compile Include="Explorer\DesignerControl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="Explorer\DesignerControl.Designer.cs">
+ <DependentUpon>DesignerControl.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Explorer\ExplorerWindow.cs" />
+ <Compile Include="Explorer\FileManager.cs" />
+ <Compile Include="Explorer\Notifier.cs" />
+ <Compile Include="Explorer\Parsers\CSharpParser.cs" />
+ <Compile Include="Explorer\Parsers\MetadataParserBase.cs" />
+ <Compile Include="Projects\FSharp\ProjectManager.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="VSPackage.resx">
+ <MergeWithCTO>true</MergeWithCTO>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <VSCTCompile Include="Bistro.Designer.vsct">
+ <ResourceName>1000</ResourceName>
+ </VSCTCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Key.snk" />
+ <EmbeddedResource Include="Explorer\DesignerControl.resx">
+ <DependentUpon>DesignerControl.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\Images_32bit.bmp" />
+ <EmbeddedResource Include="Resources\Images_24bit.bmp" />
+ <EmbeddedResource Include="Resources\Root.bmp" />
+ <EmbeddedResource Include="Resources\imagelis.bmp">
+ <Visible>true</Visible>
+ <LogicalName>Resources.imagelis.bmp</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\alert.png" />
+ <EmbeddedResource Include="Resources\bullet.png" />
+ <EmbeddedResource Include="Resources\green_star.png" />
+ <EmbeddedResource Include="Resources\lock.gif" />
+ <EmbeddedResource Include="Resources\mechanic.gif" />
+ <Content Include="Resources\Package.ico" />
+ <EmbeddedResource Include="Resources\white.PNG" />
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem
Include="Templates\ProjectItems\BrowserFile\BrowserFile.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem
Include="Templates\ProjectItems\BrowserFile\BrowserFile.Browser">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem Include="Templates\ProjectItems\JScript\JScript.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\JScript\JScript.js">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem
Include="Templates\ProjectItems\StyleSheet\StyleSheet.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\StyleSheet\StyleSheet.css">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem
Include="Templates\ProjectItems\WebConfig\WebConfig.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\WebConfig\Web.Config">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem
Include="Templates\ProjectItems\WebHTMLPage\WebHTMLPage.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\WebHTMLPage\HTMLPage.htm">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem Include="Templates\ProjectItems\NDjango\NDjango.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\NDjango\NDjango.django">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\NDjango\NDjango.ico">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem Include="Templates\ProjectItems\Text\Text.ico">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\Text\TextFile.txt">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem Include="Templates\ProjectItems\Text\TextFile.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ 
+ <ItemGroup>
+ <ZipItem
Include="Templates\ProjectItems\FSharpControllers\CodeFile.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ <ZipItem
Include="Templates\ProjectItems\FSharpControllers\CodeFile.fs">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipItem>
+ </ItemGroup>
+ <ItemGroup>
+ <ZipProject Include="Templates\Projects\FSharp\base.django">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\Controllers.fs">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\FSharpProject.fsproj">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\home.django">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\Web.config">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\Bistro.Core.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\Bistro.Core.pdb">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\Bistro.Extensions.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\Bistro.Extensions.pdb">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject
Include="Templates\Projects\FSharp\Bistro.FSharpExtensions.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject
Include="Templates\Projects\FSharp\Bistro.FSharpExtensions.pdb">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\default.htm">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\FSharpProject.ico">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject
Include="Templates\Projects\FSharp\FSharpProject.vstemplate">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject
Include="Templates\Projects\FSharp\NDjango.BistroIntegration.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject
Include="Templates\Projects\FSharp\NDjango.BistroIntegration.pdb">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\NDjango.Core.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\NDjango.Core.pdb">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\NDjango.Filters.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\NDjango.Filters.pdb">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ <ZipProject Include="Templates\Projects\FSharp\StructureMap.dll">
+ <OutputSubPath>Bistro</OutputSubPath>
+ </ZipProject>
+ </ItemGroup>
+ <PropertyGroup>
+ <UseCodebase>true</UseCodebase>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <Import
Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets"
/>
+ 
+</Project>
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.Designer/BistroDesigner2010.sln Fri May 21
08:07:52 2010
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}")
= "BistroDesigner2010", "BistroDesigner2010.csproj", "{6DAA8F30-4623-49C0-B98E-5BA486C1F944}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {6DAA8F30-4623-49C0-B98E-5BA486C1F944}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
+ {6DAA8F30-4623-49C0-B98E-5BA486C1F944}.Debug|Any CPU.Build.0 = Debug|Any
CPU
+ {6DAA8F30-4623-49C0-B98E-5BA486C1F944}.Release|Any CPU.ActiveCfg =
Release|Any CPU
+ {6DAA8F30-4623-49C0-B98E-5BA486C1F944}.Release|Any CPU.Build.0 = Release|
Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.Designer/BistroDesigner2010.suo Fri May 21
08:07:52 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.Designer/source.extension.vsixmanifest Fri May 21
08:07:52 2010
@@ -0,0 +1,25 @@
+<?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="3b4ee8e6-12ea-46f4-bb2a-c8e5e855d62d">
+ <Name>Bistro Designer</Name>
+ <Author>Hill30 Inc</Author>
+ <Version>0.9</Version>
+ <Description xml:space="preserve">Allows developing Bistro
applications with controllers written in F# </Description>
+ <Locale>1033</Locale>
+ <InstalledByMsi>false</InstalledByMsi>
+ <SupportedProducts>
+ <VisualStudio Version="10.0">
+ <Edition>Pro</Edition>
+ </VisualStudio>
+ </SupportedProducts>
+ <SupportedFrameworkRuntimeEdition MinVersion="4.0"
MaxVersion="4.0" />
+ </Identifier>
+ <References>
+ <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">
+ <Name>Visual Studio MPF</Name>
+ </Reference>
+ </References>
+ <Content>
+ <VsPackage>Bistro.Designer2010.pkgdef</VsPackage>
+ </Content>
+</Vsix>
=======================================
--- /dev/null
+++ /Bistro/trunk/Bistro.SetupWiX/lib/NDjangoExtended.msi Fri May 21
08:07:52 2010
File is too large to display a diff.
=======================================
--- /Bistro/trunk/Bistro.Designer/Bistro.Designer.csproj Sat May 15
05:04:03 2010
+++ /dev/null
@@ -1,461 +0,0 @@
-<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
ToolsVersion="3.5">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)'
== '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Bistro.Designer</RootNamespace>
- <AssemblyName>Bistro.Designer</AssemblyName>
- <SignAssembly>False</SignAssembly>
- <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- <ProjectGuid>{7C11A46D-27A6-41F9-A754-0D9F1DA4369D}</ProjectGuid>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|
AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <RegisterForComInterop>false</RegisterForComInterop>
- <UseVSHostingProcess>true</UseVSHostingProcess>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|
AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <RunCodeAnalysis>true</RunCodeAnalysis>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Bistro.Core, Version=0.9.2.0, Culture=neutral,
processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\Bistro.Core.dll</HintPath>
- </Reference>
- <Reference Include="EnvDTE" />
- <Reference Include="EnvDTE80" />
- <Reference Include="FSharp.Core, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\..\..\Program Files
(x86)\FSharp-1.9.9.9\\bin\FSharp.Core.dll</HintPath>
- </Reference>
- <Reference Include="FSharp.ProjectSystem.Base, Version=2.0.50727.0,
Culture=neutral, PublicKeyToken=a19089b1c74d0809,
processorArchitecture=MSIL" />
- <Reference Include="Irony, Version=1.0.0.0, Culture=neutral,
PublicKeyToken=ca48ace7223ead47, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\Irony.dll</HintPath>
- </Reference>
- <Reference Include="Irony.Samples, Version=1.0.0.0, Culture=neutral,
processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\Irony.Samples.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.Build.Engine, Version=3.5.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL">
- <HintPath>Microsoft.Build.Engine.dll</HintPath>
- <Name>Microsoft.Build.Engine</Name>
- <SpecificVersion>Yes</SpecificVersion>
- <Aliases>global</Aliases>
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="Microsoft.Build.Framework, Version=3.5.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL">
- <HintPath>Microsoft.Build.Framework.dll</HintPath>
- <Name>Microsoft.Build.Framework</Name>
- <SpecificVersion>Yes</SpecificVersion>
- <Aliases>global</Aliases>
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="Microsoft.Build.Utilities.v3.5, Version=3.5.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL">
- <HintPath>Microsoft.Build.Utilities.v3.5.dll</HintPath>
- <Name>Microsoft.Build.Utilities.v3.5</Name>
- <SpecificVersion>Yes</SpecificVersion>
- <Aliases>global</Aliases>
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.CommonIDE, Version=9.0.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL" />
- <Reference Include="Microsoft.VisualStudio.Editors" />
- <Reference Include="Microsoft.VisualStudio.ManagedInterfaces" />
- <Reference Include="Microsoft.VisualStudio.ProjectAggregator,
Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL" />
- <Reference Include="Microsoft.VisualStudio.Shell.Design,
Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a,
processorArchitecture=MSIL" />
- <Reference Include="Microsoft.VisualStudio.VSHelp, Version=7.0.3300.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
- <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
- <Reference Include="Microsoft.VisualStudio.Shell.9.0" />
- <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
- <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />
- <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />
- <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
- <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0" />
- <Reference Include="System" />
- <Reference Include="System.configuration" />
- <Reference Include="System.Core">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="System.Data" />
- <Reference Include="System.Design" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- <Reference Include="VSLangProj" />
- <Reference Include="VSLangProj80, Version=8.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio
9.0\Common7\IDE\PublicAssemblies\VSLangProj80.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Bistro.DesignerPackage.cs" />
- <Compile Include="Guids.cs" />
- <Compile Include="Projects\FSharp\Factory.cs" />
- <Compile Include="Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <Compile Include="GlobalSuppressions.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="PkgCmdID.cs" />
- </ItemGroup>
- <PropertyGroup>
-
<VSSDKCSharpIncPath>$(VSSDK90Install)VisualStudioIntegration\Common\Source\CSharp</VSSDKCSharpIncPath>
-
<CommonRegAttributes>$(VSSDKCSharpIncPath)\RegistrationAttributes</CommonRegAttributes>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="$(CommonRegAttributes)\WebSiteProjectAttribute.cs">
- <Link>RegistrationAttributes\WebSiteProjectAttribute.cs</Link>
- </Compile>
- <Compile
Include="$(CommonRegAttributes)\WebSiteProjectRelatedFilesAttribute.cs">
-
<Link>RegistrationAttributes\WebSiteProjectRelatedFilesAttribute.cs</Link>
- </Compile>
- <Compile
Include="$(CommonRegAttributes)\WAProvideLanguagePropertyAttribute.cs">
-
<Link>RegistrationAttributes\WAProvideLanguagePropertyAttribute.cs</Link>
- </Compile>
- <Compile
Include="$(CommonRegAttributes)\WAProvideProjectFactoryAttribute.cs">
-
<Link>RegistrationAttributes\WAProvideProjectFactoryAttribute.cs</Link>
- </Compile>
- <Compile
Include="$(CommonRegAttributes)\WAProvideProjectFactoryTemplateMappingAttribute.cs">
-
<Link>RegistrationAttributes\WAProvideProjectFactoryTemplateMappingAttribute.cs</Link>
- </Compile>
- <Compile
Include="$(CommonRegAttributes)\ProvideMSBuildTargetAttribute.cs">
- <Link>RegistrationAttributes\ProvideMSBuildTargetAttribute.cs</Link>
- </Compile>
- <Compile Include="ProjectBase\AssemblyReferenceNode.cs" />
- <Compile Include="ProjectBase\Attributes.cs" />
- <Compile Include="ProjectBase\Automation\AutomationScope.cs" />
- <Compile Include="ProjectBase\Automation\OAFileItem.cs" />
- <Compile Include="ProjectBase\Automation\OAFolderItem.cs" />
- <Compile Include="ProjectBase\Automation\OANavigableProjectItems.cs" />
- <Compile Include="ProjectBase\Automation\OANestedProjectItem.cs" />
- <Compile Include="ProjectBase\Automation\OANullProperty.cs" />
- <Compile Include="ProjectBase\Automation\OAProject.cs" />
- <Compile Include="ProjectBase\Automation\OAProjectItem.cs" />
- <Compile Include="ProjectBase\Automation\OAProjectItems.cs" />
- <Compile Include="ProjectBase\Automation\OAProperties.cs" />
- <Compile Include="ProjectBase\Automation\OAProperty.cs" />
- <Compile Include="ProjectBase\Automation\OAReferenceFolderItem.cs" />
- <Compile Include="ProjectBase\Automation\OAReferenceItem.cs" />
- <Compile Include="ProjectBase\Automation\OASolutionFolder.cs" />
- <Compile
Include="ProjectBase\Automation\VSProject\OAAssemblyReference.cs" />
- <Compile Include="ProjectBase\Automation\VSProject\OABuildManager.cs"
/>
- <Compile Include="ProjectBase\Automation\VSProject\OAComReference.cs"
/>
- <Compile
Include="ProjectBase\Automation\VSProject\OAProjectReference.cs" />
- <Compile Include="ProjectBase\Automation\VSProject\OAReferenceBase.cs"
/>
- <Compile Include="ProjectBase\Automation\VSProject\OAReferences.cs" />
- <Compile Include="ProjectBase\Automation\VSProject\OAVSProject.cs" />
- <Compile Include="ProjectBase\Automation\VSProject\OAVSProjectItem.cs"
/>
- <Compile Include="ProjectBase\BuildDependency.cs" />
- <Compile Include="ProjectBase\BuildPropertyPage.cs" />
- <Compile Include="ProjectBase\ComReferenceNode.cs" />
- <Compile Include="ProjectBase\ConfigProvider.cs" />
- <Compile Include="ProjectBase\ConfigurationProperties.cs" />
- <Compile Include="ProjectBase\DataObject.cs" />
- <Compile Include="ProjectBase\DependentFileNode.cs" />
- <Compile Include="ProjectBase\DesignPropertyDescriptor.cs" />
- <Compile Include="ProjectBase\DocumentManager.cs" />
- <Compile Include="ProjectBase\DontShowAgainDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="ProjectBase\DontShowAgainDialog.Designer.cs">
- <DependentUpon>DontShowAgainDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="ProjectBase\EnumDependencies.cs" />
- <Compile Include="ProjectBase\FileChangeManager.cs" />
- <Compile Include="ProjectBase\FileDocumentManager.cs" />
- <Compile Include="ProjectBase\FileNode.cs" />
- <Compile Include="ProjectBase\FolderNode.cs" />
- <Compile Include="ProjectBase\GlobalPropertyHandler.cs" />
- <Compile Include="ProjectBase\GlobalSuppressions.cs" />
- <Compile Include="ProjectBase\HierarchyNode.cs" />
- <Compile Include="ProjectBase\IDEBuildLogger.cs" />
- <Compile Include="ProjectBase\ImageHandler.cs" />
- <Compile Include="ProjectBase\Interfaces.cs" />
- <Compile Include="ProjectBase\LocalizableProperties.cs" />
- <Compile Include="ProjectBase\Misc\ConnectionPointContainer.cs" />
- <Compile Include="ProjectBase\Misc\ExternDll.cs" />
- <Compile Include="ProjectBase\Misc\NativeMethods.cs" />
- <Compile Include="ProjectBase\Misc\UnsafeNativeMethods.cs" />
- <Compile Include="ProjectBase\NestedProjectBuildDependency.cs" />
- <Compile Include="ProjectBase\NestedProjectNode.cs" />
- <Compile Include="ProjectBase\NodeProperties.cs" />
- <Compile Include="ProjectBase\OleServiceProvider.cs" />
- <Compile Include="ProjectBase\Output.cs" />
- <Compile Include="ProjectBase\OutputGroup.cs" />
- <Compile Include="ProjectBase\ProjectBase.cs" />
- <Compile Include="ProjectBase\ProjectConfig.cs" />
- <Compile Include="ProjectBase\ProjectContainerNode.cs" />
- <Compile Include="ProjectBase\ProjectDesignerDocumentManager.cs" />
- <Compile Include="ProjectBase\ProjectDocumentsListener.cs" />
- <Compile Include="ProjectBase\ProjectElement.cs" />
- <Compile Include="ProjectBase\ProjectFactory.cs" />
- <Compile Include="ProjectBase\ProjectFileConstants.cs" />
- <Compile Include="ProjectBase\ProjectNode.CopyPaste.cs" />
- <Compile Include="ProjectBase\ProjectNode.cs" />
- <Compile Include="ProjectBase\ProjectNode.Events.cs" />
- <Compile Include="ProjectBase\ProjectOptions.cs" />
- <Compile Include="ProjectBase\ProjectPackage.cs" />
- <Compile Include="ProjectBase\ProjectReferenceNode.cs" />
- <Compile Include="ProjectBase\ProjectSecurityChecker.cs" />
- <Compile Include="ProjectBase\PropertiesEditorLauncher.cs" />
- <Compile Include="ProjectBase\ReferenceContainerNode.cs" />
- <Compile Include="ProjectBase\ReferenceNode.cs" />
- <Compile Include="ProjectBase\RegisteredProjectType.cs" />
- <Compile Include="ProjectBase\SecurityWarningDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="ProjectBase\SecurityWarningDialog.Designer.cs">
- <DependentUpon>SecurityWarningDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="ProjectBase\SelectionListener.cs" />
- <Compile Include="ProjectBase\SettingsPage.cs" />
- <Compile Include="ProjectBase\SingleFileGenerator.cs" />
- <Compile Include="ProjectBase\SingleFileGeneratorFactory.cs" />
- <Compile Include="ProjectBase\SolutionListener.cs" />
- <Compile
Include="ProjectBase\SolutionListenerForBuildDependencyUpdate.cs" />
- <Compile Include="ProjectBase\SolutionListenerForProjectEvents.cs" />
- <Compile Include="ProjectBase\SolutionListenerForProjectOpen.cs" />
- <Compile
Include="ProjectBase\SolutionListenerForProjectReferenceUpdate.cs" />
- <Compile Include="ProjectBase\StructuresEnums.cs" />
- <Compile Include="ProjectBase\SuspendFileChanges.cs" />
- <Compile Include="ProjectBase\TokenProcessor.cs" />
- <Compile Include="ProjectBase\Tracing.cs" />
- <Compile Include="ProjectBase\TrackDocumentsHelper.cs" />
- <Compile Include="ProjectBase\TypeConverters.cs" />
- <Compile Include="ProjectBase\UpdateSolutionEventsListener.cs" />
- <Compile Include="ProjectBase\Url.cs" />
- <Compile Include="ProjectBase\UserProjectSecurityChecker.cs" />
- <Compile Include="ProjectBase\Utilities.cs" />
- <Compile Include="ProjectBase\VsCommands.cs" />
- <Compile Include="ProjectBase\VSShellUtilities.cs" />
- <Compile Include="Projects\FSharp\ProjectManager.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="VSPackage.resx">
- <MergeWithCTO>true</MergeWithCTO>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <VSCTCompile Include="Bistro.Designer.vsct">
- <ResourceName>1000</ResourceName>
- </VSCTCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="Key.snk" />
- <None Include="ProjectBase\Diagrams\AutomationClasses.cd" />
- <None Include="ProjectBase\Diagrams\ConfigurationClasses.cd" />
- <None Include="ProjectBase\Diagrams\DocumentManagerClasses.cd" />
- <None Include="ProjectBase\Diagrams\HierarchyClasses.cd" />
- <None Include="ProjectBase\Diagrams\PropertiesClasses.cd" />
- <None Include="ProjectBase\Diagrams\ReferenceClasses.cd" />
- <EmbeddedResource Include="ProjectBase\DontShowAgainDialog.resx">
- <DependentUpon>DontShowAgainDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="ProjectBase\ProjectBase.resx">
- <DependentUpon>ProjectBase.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="ProjectBase\SecurityWarningDialog.resx">
- <DependentUpon>SecurityWarningDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\Images_32bit.bmp" />
- <EmbeddedResource Include="Resources\Images_24bit.bmp" />
- <EmbeddedResource Include="Resources\Root.bmp" />
- <EmbeddedResource Include="Resources\imagelis.bmp">
- <Visible>true</Visible>
- <LogicalName>Resources.imagelis.bmp</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\alert.png" />
- <EmbeddedResource Include="Resources\bullet.png" />
- <EmbeddedResource Include="Resources\green_star.png" />
- <EmbeddedResource Include="Resources\lock.gif" />
- <EmbeddedResource Include="Resources\mechanic.gif" />
- <Content Include="Resources\Package.ico" />
- <EmbeddedResource Include="Resources\white.PNG" />
- </ItemGroup>
- 
- <ItemGroup>
- <ZipItem
Include="Templates\ProjectItems\BrowserFile\BrowserFile.vstemplate">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- <ZipItem
Include="Templates\ProjectItems\BrowserFile\BrowserFile.Browser">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- </ItemGroup>
- 
- <ItemGroup>
- <ZipItem Include="Templates\ProjectItems\JScript\JScript.vstemplate">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- <ZipItem Include="Templates\ProjectItems\JScript\JScript.js">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- </ItemGroup>
- 
- <ItemGroup>
- <ZipItem
Include="Templates\ProjectItems\StyleSheet\StyleSheet.vstemplate">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- <ZipItem Include="Templates\ProjectItems\StyleSheet\StyleSheet.css">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- </ItemGroup>
- 
- <ItemGroup>
- <ZipItem
Include="Templates\ProjectItems\WebConfig\WebConfig.vstemplate">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- <ZipItem Include="Templates\ProjectItems\WebConfig\Web.Config">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- </ItemGroup>
- 
- <ItemGroup>
- <ZipItem
Include="Templates\ProjectItems\WebHTMLPage\WebHTMLPage.vstemplate">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- <ZipItem Include="Templates\ProjectItems\WebHTMLPage\HTMLPage.htm">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- </ItemGroup>
- 
- <ItemGroup>
- <ZipItem Include="Templates\ProjectItems\NDjango\NDjango.vstemplate">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- <ZipItem Include="Templates\ProjectItems\NDjango\NDjango.django">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- <ZipItem Include="Templates\ProjectItems\NDjango\NDjango.ico">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- </ItemGroup>
- 
- <ItemGroup>
- <ZipItem Include="Templates\ProjectItems\Text\Text.ico">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- <ZipItem Include="Templates\ProjectItems\Text\TextFile.txt">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- <ZipItem Include="Templates\ProjectItems\Text\TextFile.vstemplate">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- </ItemGroup>
- 
- <ItemGroup>
- <ZipItem
Include="Templates\ProjectItems\FSharpControllers\CodeFile.vstemplate">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- <ZipItem
Include="Templates\ProjectItems\FSharpControllers\CodeFile.fs">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipItem>
- </ItemGroup>
- <ItemGroup>
- <ZipProject Include="Templates\Projects\FSharp\base.django">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\Controllers.fs">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\FSharpProject.fsproj">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\home.django">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\Web.config">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\Bistro.Core.dll">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\Bistro.Core.pdb">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\Bistro.Extensions.dll">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\Bistro.Extensions.pdb">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject
Include="Templates\Projects\FSharp\Bistro.FSharpExtensions.dll">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject
Include="Templates\Projects\FSharp\Bistro.FSharpExtensions.pdb">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\default.htm">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\FSharpProject.ico">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject
Include="Templates\Projects\FSharp\FSharpProject.vstemplate">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject
Include="Templates\Projects\FSharp\NDjango.BistroIntegration.dll">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject
Include="Templates\Projects\FSharp\NDjango.BistroIntegration.pdb">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\NDjango.Core.dll">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\NDjango.Core.pdb">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\NDjango.Filters.dll">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\NDjango.Filters.pdb">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- <ZipProject Include="Templates\Projects\FSharp\StructureMap.dll">
- <OutputSubPath>Bistro</OutputSubPath>
- </ZipProject>
- </ItemGroup>
- <PropertyGroup>
- 
- <RegisterOutputPackage>true</RegisterOutputPackage>
- <RegisterWithCodebase>true</RegisterWithCodebase>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <Import
Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets"
/>
- 
-</Project>
=======================================
--- /Bistro/trunk/Bistro.Designer/Bistro.Designer.sln Sat May 15 05:04:03
2010
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}")
= "Bistro.Designer", "Bistro.Designer.csproj", "{7C11A46D-27A6-41F9-A754-0D9F1DA4369D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}")
= "ProjectExtender", "..\ProjectExtender\ProjectExtender.csproj", "{C085BF9A-0393-4D2C-8EAE-7BA0ED1EEB09}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {7C11A46D-27A6-41F9-A754-0D9F1DA4369D}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
- {7C11A46D-27A6-41F9-A754-0D9F1DA4369D}.Debug|Any CPU.Build.0 = Debug|Any
CPU
- {7C11A46D-27A6-41F9-A754-0D9F1DA4369D}.Release|Any CPU.ActiveCfg =
Release|Any CPU
- {7C11A46D-27A6-41F9-A754-0D9F1DA4369D}.Release|Any CPU.Build.0 = Release|
Any CPU
- {C085BF9A-0393-4D2C-8EAE-7BA0ED1EEB09}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
- {C085BF9A-0393-4D2C-8EAE-7BA0ED1EEB09}.Debug|Any CPU.Build.0 = Debug|Any
CPU
- {C085BF9A-0393-4D2C-8EAE-7BA0ED1EEB09}.Release|Any CPU.ActiveCfg =
Release|Any CPU
- {C085BF9A-0393-4D2C-8EAE-7BA0ED1EEB09}.Release|Any CPU.Build.0 = Release|
Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
=======================================
--- /Bistro/trunk/Bistro.Designer/Bistro.Designer.suo Sat May 15 05:04:03
2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/BistroNHibernate.zip Fri
Apr 16 03:44:25 2010
+++ /dev/null
File is too large to display a diff.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/BistroProject.zip Fri
Apr 16 03:44:25 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.dll Sat May 15
01:13:14 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.pkgdef Fri May 14
05:22:05 2010
+++ /dev/null
@@ -1,36 +0,0 @@
-Windows Registry Editor Version 5.00
-
-[$RootKey$\InstalledProducts\DesignerPackage]
-@="#110"
-"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
-"ProductDetails"="#112"
-"PID"="1.0"
-"LogoID"="#400"
-[$RootKey$\Packages\{40049e67-3a71-47c2-adfa-87b89aa56b50}]
-@="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=1.0.0.0, Culture=neutral,
PublicKeyToken=null"
-[$RootKey$\Packages\{40049e67-3a71-47c2-adfa-87b89aa56b50}]
-"ID"=dword:00000064
-"MinEdition"="Standard"
-"ProductVersion"="0.9"
-"ProductName"="Bistro Designer"
-"CompanyName"="Hill30 Inc"
-[$RootKey$\Projects\{94887830-9110-3f61-84ae-beea7891c7e6}]
-@="Factory"
-"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
-"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"="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}"
-"Language(VsTemplate)"="Bistro"
-"ShowOnlySpecifiedTemplates(VsTemplate)"=dword:00000000
-"TemplateGroupIDs(VsTemplate)"="Web"
-[$RootKey$\Projects\{349c5851-65df-11da-9384-00065b846f21}\LanguageTemplates]
-"{f2a71f9b-5d33-465a-a702-920d77279786}"="{c39a00f4-b2a4-478e-a0b2-c3e69b3bd899}"
-
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2008.msi Fri May 14
05:22:05 2010
+++ /dev/null
File is too large to display a diff.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetup2010.msi Fri May 14
05:22:05 2010
+++ /dev/null
File is too large to display a diff.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/NDjangoSetupExtended.msi Fri Apr 30
05:13:47 2010
+++ /dev/null
File is too large to display a diff.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.dll Sat May 15
03:38:04 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.pkgdef Sat May 15
03:38:04 2010
+++ /dev/null
@@ -1,67 +0,0 @@
-ÿþ[ $ 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.Core/Controllers/ControllerHandler.cs Sat May 15
05:04:03 2010
+++ /Bistro/trunk/Bistro.Core/Controllers/ControllerHandler.cs Fri May 21
08:07:52 2010
@@ -32,6 +32,7 @@
using Bistro.Controllers.Descriptor.Data;
using Bistro.Entity;
using Bistro.Interfaces;
+using System.Globalization;

namespace Bistro.Controllers
{
=======================================
--- /Bistro/trunk/Bistro.Designer/Bistro.DesignerPackage.cs Sat May 15
05:04:03 2010
+++ /Bistro/trunk/Bistro.Designer/Bistro.DesignerPackage.cs Fri May 21
08:07:52 2010
@@ -36,7 +36,12 @@
[DefaultRegistryRoot("Software\\Microsoft\\VisualStudio\\9.0")]
// This attribute is used to register the informations needed to show
the this package
// in the Help/About dialog of Visual Studio.
- [InstalledProductRegistration(false, "#110", "#112", "1.0",
IconResourceID = 400)]
+#if VS2008
+ [InstalledProductRegistration(false, "#110", "#112", "0.9",
IconResourceID = 400)]
+#endif
+#if VS2010
+ [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
// http://msdn.microsoft.com/vstudio/extend/). This attributes tells
the shell that this
=======================================
--- /Bistro/trunk/Bistro.Designer/Explorer/ChangesTracker.cs Sat May 15
05:04:03 2010
+++ /Bistro/trunk/Bistro.Designer/Explorer/ChangesTracker.cs Fri May 21
08:07:52 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/trunk/Bistro.Designer/Explorer/ExplorerWindow.cs Sat May 15
05:04:03 2010
+++ /Bistro/trunk/Bistro.Designer/Explorer/ExplorerWindow.cs Fri May 21
08:07:52 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/trunk/Bistro.Designer/Projects/FSharp/ProjectManager.cs Sat May
15 05:04:03 2010
+++ /Bistro/trunk/Bistro.Designer/Projects/FSharp/ProjectManager.cs Fri May
21 08:07:52 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/trunk/Bistro.Designer/Properties/AssemblyInfo.cs Sat May 15
05:04:03 2010
+++ /Bistro/trunk/Bistro.Designer/Properties/AssemblyInfo.cs Fri May 21
08:07:52 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/trunk/Bistro.Designer/VSPackage.resx Sat May 15 05:04:03 2010
+++ /Bistro/trunk/Bistro.Designer/VSPackage.resx Fri May 21 08:07:52 2010
@@ -112,18 +112,18 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="110" xml:space="preserve">
<value>Bistro Designer</value>
</data>
<data name="112" xml:space="preserve">
- <value>Information about my package</value>
+ <value>Allows developing Bistro applications with controllers written
in F# </value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="400" type="System.Resources.ResXFileRef,
System.Windows.Forms">
<value>Resources\Package.ico;System.Drawing.Icon, System.Drawing,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Sat May 15
03:38:04 2010
+++ /Bistro/trunk/Bistro.SetupWiX/BistroDesigner2008Reg.wxi Fri May 21
08:07:52 2010
@@ -11,10 +11,10 @@


- <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="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" />
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/BistroSetupWiX.wixproj Sat May 15
03:38:04 2010
+++ /Bistro/trunk/Bistro.SetupWiX/BistroSetupWiX.wixproj Fri May 21
08:07:52 2010
@@ -46,14 +46,9 @@
<ItemGroup>
<Content Include="ExtenderReg.wxi" />
<Content Include="lib\Bistro.Core.dll" />
- <Content Include="lib\Bistro.Designer.dll" />
- <Content Include="lib\Bistro.Designer.pkgdef" />
<Content Include="lib\Bistro.Extensions.dll" />
<Content Include="lib\Bistro.FSharpExtensions.dll" />
- <Content Include="lib\extension.vsixmanifest" />
- <Content Include="lib\NDjangoSetupExtended.msi" />
<Content Include="BistroDesigner2008Reg.wxi" />
- <Content Include="lib\ProjectExtender.dll" />
</ItemGroup>
<ItemGroup>
<Folder Include="lib\" />
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/EditTemplates/Program.cs Sat May 15
01:13:14 2010
+++ /Bistro/trunk/Bistro.SetupWiX/EditTemplates/Program.cs Fri May 21
08:07:52 2010
@@ -1,3 +1,4 @@
+
using System;
using System.Collections.Generic;
using System.Text;
@@ -20,20 +21,28 @@

/// <summary>
- /// The program search through the registry for specified value to
get the corresponding installation path
+ /// If defined regkeys The program search through the registry for
specified value to get the corresponding installation path
/// Once found, it replaces the special values like [BISTRODIR] in
project files with retrieved paths.
/// </summary>
- /// <param name="args">only one argument - template path</param>
+ /// <param name="args">0 - template path,1-BISTRO,2-NDJANGO
2008,3-NDJANGO 2010,4 - F# Project Extender</param>
static void Main(string[] args)
{
try
{
- String FILE_PATH = args[0];
-
- String bistroPath =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\Bistro").GetValue("InstallDir");
- String ndjangoPath35 =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\NDjango\Net35").GetValue("InstallDir");
- String ndjangoPath40 =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\NDjango\Net40").GetValue("InstallDir");
- String extenderPath =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\ProjectExtender").GetValue("InstallDir");
+ String FILE_PATH; //= args[0];
+ String bistroPath ;//=
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\Bistro").GetValue("InstallDir");
+ String ndjangoPath35;// =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\NDjango\Net35").GetValue("InstallDir");
+ String ndjangoPath40;// =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\NDjango\Net40").GetValue("InstallDir");
+ String extenderPath;// =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\ProjectExtender").GetValue("InstallDir");
+ if (args.Length == 5)
+ {
+ FILE_PATH = args[0];
+ bistroPath = args[1];
+ ndjangoPath35 = args[2];
+ ndjangoPath40 = args[3];
+ extenderPath = args[4];
+ }
+ else return;

FILE_PATH = FILE_PATH.Replace("\"", "");

=======================================
--- /Bistro/trunk/Bistro.SetupWiX/EditTemplates/versionWriter.exe Sat May
15 01:13:14 2010
+++ /Bistro/trunk/Bistro.SetupWiX/EditTemplates/versionWriter.exe Fri May
21 08:07:52 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/ExtenderReg.wxi Fri May 14 05:22:05 2010
+++ /Bistro/trunk/Bistro.SetupWiX/ExtenderReg.wxi Fri May 21 08:07:52 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.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="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" />
@@ -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/trunk/Bistro.SetupWiX/Readme.txt Fri Apr 30 05:13:47 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Readme.txt Fri May 21 08:07:52 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/trunk/Bistro.SetupWiX/Setup.wxs Sat May 15 03:38:04 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Setup.wxs Fri May 21 08:07:52 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" ?>
- <?define ProductVersionTitle="0.9.3.0" ?>
+ <?define ProductVersion="0.9.3.1" ?>
+ <?define ProductVersionTitle="0.9.3.1" ?>
<?define VisualStudioRegistryRoot2008
= "Software\Microsoft\VisualStudio\9.0" ?>
<?define VisualStudioRegistryRoot2010
= "Software\Microsoft\VisualStudio\10.0" ?>
<?define UpgradeCode="{E63B2D78-54C6-4d2a-B3EF-219EF3AE8FBC}"?>
- <Product Id="B0655900-8078-4342-8CA0-AB5A8583C5A3" Name="Bistro
$(var.ProductVersionTitle)" Language="1033" Version="$(var.ProductVersion)"
Manufacturer="Hill30" UpgradeCode="$(var.UpgradeCode)">
+ <Product Id="025811B6-BD51-4BAC-90F1-8E42D11D9B90" Name="Bistro
$(var.ProductVersionTitle)" Language="1033" Version="$(var.ProductVersion)"
Manufacturer="Hill30" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="200" Compressed="yes" />

<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
@@ -27,7 +27,7 @@
<RegistrySearch Id="RL_EnvironmentDir_2010" Root="HKLM"
Key="SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS"
Name="EnvironmentDirectory" Type="directory" />
</Property>
<Property Id="EXTENSIONSHILL30FILES">
- <DirectorySearch Id="hill30filessearch"
Path="[LocalAppDataFolder]\Microsoft\VisualStudio\10.0\Extensions\Hill 30\"
/>
+ 
</Property>
<Property Id="VS2008FOUND">
<RegistrySearch Id="VS2008found" Type="raw" Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0" Name="InstallDir" />
@@ -54,6 +54,9 @@
<RegistrySearch Id="RegSearch_DevenvExe_Path2010" Root="HKLM"
Key="$(var.VisualStudioRegistryRoot2010)\Setup\VS" Name="EnvironmentPath"
Type="raw" />
</Property>
<Property Id="VSIX_PATH"/>
+ <Property Id="MVCFOUND">
+ <RegistrySearch Id="MVCfound" Type="raw" Root="HKLM"
Key="SOFTWARE\Microsoft\ASP.NET MVC 2\Runtime" Name="InstallPath" />
+ </Property>

<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>
@@ -62,26 +65,20 @@
<WixVariable Id="WixUIDialogBmp" Value="bitmaps\dlgbmp.bmp" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="PFiles">
- <Directory Id="HILL30FILES" Name="Hill30">
- <Directory Id="NDJANGODIR" Name="NDjango">
- <Component Id="NDjangoMSI2008"
Guid="05FCB39B-E868-42A4-B508-958EA17050A3">
+ <Directory Id="Hill30" Name="Hill30">
+
+ <Directory Id="INSTALLDIR" Name="Bistro">
+ 
<Component Id="NDjangoMSI2010"
Guid="7D7CCB7A-68A4-4E05-AA89-5A985C680559">
<Condition><![CDATA[VS2010FOUND <>
NULL]]></Condition>
- <RegistryValue Root="HKLM"
Key="Software\Hill30\NDjango\Net35" Name="InstallDir" Type="string"
Value="[NDJANGODIR]\.NET35" />
- <RegistryValue Root="HKLM"
Key="Software\Hill30\NDjango\Net40" Name="InstallDir" Type="string"
Value="[NDJANGODIR]\.NET40" KeyPath="no" />
- <File Id="NDJANGO10" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2010.msi" />
+ <File Id="NDJANGO10" Name="NDjangoSetup.msi"
Source="lib\NDjangoExtended.msi" />
</Component>
-
- </Directory>
- <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"
/>
@@ -228,25 +225,27 @@

</Feature>
<Feature Id="NDjango" Level="1">
- <ComponentRef Id="NDjangoMSI2008"/>
+ 
<ComponentRef Id="NDjangoMSI2010"/>
</Feature>

- <Binary Id="EditTemplates" SourceFile="versionWriterFull.exe" />
- <Property Id="WixShellExecTarget"
Value="[NDJANGODIR]\NDjangoSetup.msi"/>
<Property Id="NDJANGONEEDED" Value="1" />
+ <Binary Id="EditTemplates" SourceFile="versionWriterFull.exe" />
+ <Property Id="WixShellExecTarget"
Value="[INSTALLDIR]NDjangoSetup.msi"/>
<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 BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]CSharp2008.zip"
"[INSTALLDIR]\" "[Hill30]NDjango\.NET35"
"[Hill30]NDjango\.NET40" "[INSTALLDIR]\""
Id="EditBistroProject2008CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]FSharp2008.zip"
"[INSTALLDIR]\" "[Hill30]NDjango\.NET35"
"[Hill30]NDjango\.NET40" "[INSTALLDIR]\""
Id="EditFSharp2008CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]CSharp2010.zip"
"[INSTALLDIR]\" "[Hill30]NDjango\.NET35"
"[Hill30]NDjango\.NET40" "[INSTALLDIR]\""
Id="EditBistroProject2010CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]FSharp2010.zip"
"[INSTALLDIR]\" "[Hill30]NDjango\.NET35"
"[Hill30]NDjango\.NET40" "[INSTALLDIR]\""
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="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"/>
@@ -269,6 +268,8 @@
<Custom Action="DeleteDesigner2010"
After="DeleteExtender2010"><![CDATA[REMOVE]]></Custom>

<Custom Action="InstallNDjango"
After="InstallFinalize"><![CDATA[(Not Installed OR (Installer AND REMOVE
<> "ALL")) AND NDJANGONEEDED]]></Custom>
+ 
</InstallExecuteSequence>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />

@@ -301,6 +302,7 @@
<Publish Dialog="InstallDirDlgCustom" Control="Next"
Event="NewDialog" Value="VerifyReadyDlg"
Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID="1"]]></Publish>
<Publish Dialog="InstallDirDlgCustom" Control="ChangeFolder"
Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
<Publish Dialog="InstallDirDlgCustom" Control="ChangeFolder"
Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+
<Publish Dialog="VerifyReadyDlg" Control="Back"
Event="NewDialog" Value="InstallDirDlgCustom" Order="1">NOT
Installed</Publish>
<Publish Dialog="VerifyReadyDlg" Control="Back"
Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed</Publish>
<Publish Dialog="MaintenanceWelcomeDlg" Control="Next"
Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
@@ -336,10 +338,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">
- 
</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/trunk/Bistro.SetupWiX/Templates/VS2010/CSharp.zip Sat May 15
01:13:14 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/CSharp.zip Fri May 21
08:07:52 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/FSharp.zip Sat May 15
01:13:14 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/FSharp.zip Fri May 21
08:07:52 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer2008.dll Sat May 15
03:38:04 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer2008.dll Fri May 21
08:07:52 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix Sat May 15
03:38:04 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix Fri May 21
08:07:52 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2008.dll Fri May 14
05:22:05 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2008.dll Fri May 21
08:07:52 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.vsix Fri May 14
05:22:05 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/ProjectExtender2010.vsix Fri May 21
08:07:52 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/versionWriterFull.exe Sat May 15 01:13:14
2010
+++ /Bistro/trunk/Bistro.SetupWiX/versionWriterFull.exe Fri May 21 08:07:52
2010
Binary file, no diff available.

Reply all

Reply to author

Forward

0 new messages