Changeset 6866 for trunk/sources/HeuristicLab.CodeEditor

Timestamp:

10/05/11 12:45:26 (13 years ago)

Author:

mkommend

Message:

#1653: Merged new HL solution into the trunk.

Location:

trunk/sources

Files:

• . (modified) (2 props)
• HeuristicLab.CodeEditor/3.3 (modified) (1 prop)
• HeuristicLab.CodeEditor/3.3/HeuristicLab.CodeEditor-3.3.csproj (modified) (14 diffs)
• HeuristicLab.CodeEditor/3.3/HeuristicLabCodeEditorPlugin.cs.frame (deleted)
• HeuristicLab.CodeEditor/3.3/Plugin.cs.frame (copied) (copied from branches/Trunk/HeuristicLab.CodeEditor/3.3/Plugin.cs.frame)
• HeuristicLab.CodeEditor/3.3/Properties/AssemblyInfo.cs.frame (copied) (copied from branches/Trunk/HeuristicLab.CodeEditor/3.3/Properties/AssemblyInfo.cs.frame)
• HeuristicLab.CodeEditor/3.3/Properties/AssemblyInfo.frame (deleted)

trunk/sources ¶

@@ +1 @@
+*.docstates
+*.psess
 *.resharper
 *.suo
+*.vsp
 Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.resharper.user
@@ -8 +13 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab.ExtLibs
+bin
 protoc.exe
-HeuristicLab 3.3.5.1.ReSharper.user
-*.psess
-*.vsp
-*.docstates
-bin
-HeuristicLab 3.3.6.0.ReSharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user

@@ +1 @@
+*.docstates
+*.psess
 *.resharper
 *.suo
+*.vsp
 Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.resharper.user
@@ -8 +13 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab.ExtLibs
+bin
 protoc.exe
-HeuristicLab 3.3.5.1.ReSharper.user
-*.psess
-*.vsp
-*.docstates
-bin
-HeuristicLab 3.3.6.0.ReSharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user

trunk/sources/HeuristicLab.CodeEditor/3.3 ¶

@@ -4 +4 @@
 *.user
 *.vs10x
+Plugin.cs

@@ -4 +4 @@
 *.user
 *.vs10x
+Plugin.cs

trunk/sources/HeuristicLab.CodeEditor/3.3/HeuristicLab.CodeEditor-3.3.csproj ¶

@@ -9 +9 @@
     <ProjectGuid>{489CFE09-FDF7-4C89-BAB5-BD09CADD61AD}</ProjectGuid>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <NoStdLib>False</NoStdLib>
@@ -39 +40 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     <Optimize>False</Optimize>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -47 +48 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     <Optimize>True</Optimize>
     <DefineConstants>TRACE</DefineConstants>
@@ -63 +64 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
+    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
@@ -72 +73 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\x86\Release\</OutputPath>
+    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -78 +79 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
-    <DocumentationFile>bin\x86\Release\HeuristicLab.CodeEditor-3.3.xml</DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -84 +86 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
+    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
@@ -93 +95 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>bin\x64\Release\</OutputPath>
+    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -99 +101 @@
     <DebugType>None</DebugType>
     <PlatformTarget>x64</PlatformTarget>
-    <DocumentationFile>bin\x64\Release\HeuristicLab.CodeEditor-3.3.xml</DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DocumentationFile>bin\Release\HeuristicLab.CodeEditor-3.3.xml</DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
@@ -151 +155 @@
       <DependentUpon>CodeViewer.cs</DependentUpon>
     </Compile>
-    <None Include="HeuristicLabCodeEditorPlugin.cs.frame" />
-    <Compile Include="HeuristicLabCodeEditorPlugin.cs" />
+    <None Include="Plugin.cs.frame" />
     <Compile Include="ErrorBookmark.cs" />
     <Compile Include="HostCallbackImplementation.cs" />
@@ -161 +164 @@
       <DependentUpon>CodeEditor.cs</DependentUpon>
     </Compile>
+    <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ToolTipProvider.cs" />
@@ -166 +170 @@
   <ItemGroup>
     <None Include="HeuristicLab.snk" />
-    <None Include="Properties\AssemblyInfo.frame" />
+    <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
   <ItemGroup>
@@ -172 +176 @@
       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
       <Name>HeuristicLab.Common.Resources-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327\HeuristicLab.SharpDevelop-3.1.1.5327.csproj">
-      <Project>{4ABA047D-46DD-4608-9E4A-41C5F92FDBB1}</Project>
-      <Name>HeuristicLab.SharpDevelop-3.1.1.5327</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
@@ -207 +209 @@
 
 call PreBuildEvent.cmd
-SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabCodeEditorPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabCodeEditorPlugin.cs"</PreBuildEvent>
+</PreBuildEvent>
   </PropertyGroup>
 </Project>

@@ +1 @@
+*.docstates
+*.psess
 *.resharper
 *.suo
+*.vsp
 Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.resharper.user
@@ -8 +13 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab.ExtLibs
+bin
 protoc.exe
-HeuristicLab 3.3.5.1.ReSharper.user
-*.psess
-*.vsp
-*.docstates
-bin
-HeuristicLab 3.3.6.0.ReSharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user

@@ -4 +4 @@
 *.user
 *.vs10x
+Plugin.cs