Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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:
2 deleted
3 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources

    • Property svn:ignore

      •  

        old new  
         1*.docstates
         2*.psess
        13*.resharper
        24*.suo
         5*.vsp
        36Google.ProtocolBuffers-0.9.1.dll
         7HeuristicLab 3.3.5.1.ReSharper.user
         8HeuristicLab 3.3.6.0.ReSharper.user
        49HeuristicLab.4.5.resharper.user
        510HeuristicLab.resharper.user
        … …  
        813_ReSharper.HeuristicLab
        914_ReSharper.HeuristicLab 3.3
         15_ReSharper.HeuristicLab.ExtLibs
         16bin
        1017protoc.exe
        11 HeuristicLab 3.3.5.1.ReSharper.user
        12 *.psess
        13 *.vsp
        14 *.docstates
        15 bin
        16 HeuristicLab 3.3.6.0.ReSharper.user
         18HeuristicLab.ExtLibs.6.0.ReSharper.user
    • Property svn:mergeinfo changed
      /branches/Restructure trunk solution (added)merged: 6828
      /branches/Trunk (added)merged: 6829,​6831-6833,​6842-6848,​6850,​6865

  • trunk/sources/HeuristicLab.CodeEditor/3.3

    • Property svn:ignore

      •  

        old new  
        44*.user
        55*.vs10x
         6Plugin.cs

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

    r5163 r6866  
    99    <ProjectGuid>{489CFE09-FDF7-4C89-BAB5-BD09CADD61AD}</ProjectGuid>
    1010    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    11     <TargetFrameworkProfile></TargetFrameworkProfile>
     11    <TargetFrameworkProfile>
     12    </TargetFrameworkProfile>
    1213    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
    1314    <NoStdLib>False</NoStdLib>
    … …  
    3940  </PropertyGroup>
    4041  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
    41     <OutputPath>bin\Debug\</OutputPath>
     42    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4243    <Optimize>False</Optimize>
    4344    <DefineConstants>DEBUG;TRACE</DefineConstants>
    … …  
    4748  </PropertyGroup>
    4849  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    49     <OutputPath>bin\Release\</OutputPath>
     50    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5051    <Optimize>True</Optimize>
    5152    <DefineConstants>TRACE</DefineConstants>
    … …  
    6364  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6465    <DebugSymbols>true</DebugSymbols>
    65     <OutputPath>bin\x86\Debug\</OutputPath>
     66    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6667    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6768    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
    … …  
    7273  </PropertyGroup>
    7374  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    74     <OutputPath>bin\x86\Release\</OutputPath>
     75    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7576    <DefineConstants>TRACE</DefineConstants>
    7677    <Optimize>true</Optimize>
    … …  
    7879    <DebugType>pdbonly</DebugType>
    7980    <PlatformTarget>x86</PlatformTarget>
    80     <DocumentationFile>bin\x86\Release\HeuristicLab.CodeEditor-3.3.xml</DocumentationFile>
     81    <DocumentationFile>
     82    </DocumentationFile>
    8183    <DebugSymbols>true</DebugSymbols>
    8284    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    … …  
    8486  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8587    <DebugSymbols>true</DebugSymbols>
    86     <OutputPath>bin\x64\Debug\</OutputPath>
     88    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8789    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8890    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
    … …  
    9395  </PropertyGroup>
    9496  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    95     <OutputPath>bin\x64\Release\</OutputPath>
     97    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9698    <DefineConstants>TRACE</DefineConstants>
    9799    <Optimize>true</Optimize>
    … …  
    99101    <DebugType>None</DebugType>
    100102    <PlatformTarget>x64</PlatformTarget>
    101     <DocumentationFile>bin\x64\Release\HeuristicLab.CodeEditor-3.3.xml</DocumentationFile>
     103    <DocumentationFile>
     104    </DocumentationFile>
    102105    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    103106  </PropertyGroup>
    104107  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    105     <DocumentationFile>bin\Release\HeuristicLab.CodeEditor-3.3.xml</DocumentationFile>
     108    <DocumentationFile>
     109    </DocumentationFile>
    106110    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    107111  </PropertyGroup>
    … …  
    151155      <DependentUpon>CodeViewer.cs</DependentUpon>
    152156    </Compile>
    153     <None Include="HeuristicLabCodeEditorPlugin.cs.frame" />
    154     <Compile Include="HeuristicLabCodeEditorPlugin.cs" />
     157    <None Include="Plugin.cs.frame" />
    155158    <Compile Include="ErrorBookmark.cs" />
    156159    <Compile Include="HostCallbackImplementation.cs" />
    … …  
    161164      <DependentUpon>CodeEditor.cs</DependentUpon>
    162165    </Compile>
     166    <Compile Include="Plugin.cs" />
    163167    <Compile Include="Properties\AssemblyInfo.cs" />
    164168    <Compile Include="ToolTipProvider.cs" />
    … …  
    166170  <ItemGroup>
    167171    <None Include="HeuristicLab.snk" />
    168     <None Include="Properties\AssemblyInfo.frame" />
     172    <None Include="Properties\AssemblyInfo.cs.frame" />
    169173  </ItemGroup>
    170174  <ItemGroup>
    … …  
    172176      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    173177      <Name>HeuristicLab.Common.Resources-3.3</Name>
    174     </ProjectReference>
    175     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327\HeuristicLab.SharpDevelop-3.1.1.5327.csproj">
    176       <Project>{4ABA047D-46DD-4608-9E4A-41C5F92FDBB1}</Project>
    177       <Name>HeuristicLab.SharpDevelop-3.1.1.5327</Name>
     178      <Private>False</Private>
    178179    </ProjectReference>
    179180    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    180181      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    181182      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     183      <Private>False</Private>
    182184    </ProjectReference>
    183185  </ItemGroup>
    … …  
    207209
    208210call PreBuildEvent.cmd
    209 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabCodeEditorPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabCodeEditorPlugin.cs"</PreBuildEvent>
     211</PreBuildEvent>
    210212  </PropertyGroup>
    211213</Project>
Note: See TracChangeset for help on using the changeset viewer.