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.MainForm.WindowsForms/3.3

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj

    r5463 r6866  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    5555    <WarningLevel>4</WarningLevel>
    56     <DocumentationFile>bin\Release\HeuristicLab.MainForm.WindowsForms-3.3.xml</DocumentationFile>
     56    <DocumentationFile>
     57    </DocumentationFile>
    5758    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5859  </PropertyGroup>
    5960  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    6061    <DebugSymbols>true</DebugSymbols>
    61     <OutputPath>bin\x64\Debug\</OutputPath>
     62    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6263    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6364    <DebugType>full</DebugType>
    … …  
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    69     <OutputPath>bin\x64\Release\</OutputPath>
     70    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7071    <DefineConstants>TRACE</DefineConstants>
    7172    <Optimize>true</Optimize>
    … …  
    7374    <PlatformTarget>x64</PlatformTarget>
    7475    <ErrorReport>prompt</ErrorReport>
    75     <DocumentationFile>bin\x64\Release\HeuristicLab.MainForm.WindowsForms-3.3.xml</DocumentationFile>
     76    <DocumentationFile>
     77    </DocumentationFile>
    7678    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    7779  </PropertyGroup>
    7880  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7981    <DebugSymbols>true</DebugSymbols>
    80     <OutputPath>bin\x86\Debug\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8183    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8284    <DebugType>full</DebugType>
    … …  
    8688  </PropertyGroup>
    8789  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    88     <OutputPath>bin\x86\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8991    <DefineConstants>TRACE</DefineConstants>
    9092    <Optimize>true</Optimize>
    … …  
    9294    <PlatformTarget>x86</PlatformTarget>
    9395    <ErrorReport>prompt</ErrorReport>
    94     <DocumentationFile>bin\x86\Release\HeuristicLab.MainForm.WindowsForms-3.3.xml</DocumentationFile>
     96    <DocumentationFile>
     97    </DocumentationFile>
    9598    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    9699  </PropertyGroup>
    … …  
    110113    <Reference Include="System.Data" />
    111114    <Reference Include="System.Xml" />
     115    <Reference Include="WeifenLuo.WinFormsUI.Docking-2.3.1, Version=2.3.1.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     116      <HintPath>..\..\bin\WeifenLuo.WinFormsUI.Docking-2.3.1.dll</HintPath>
     117    </Reference>
    112118  </ItemGroup>
    113119  <ItemGroup>
    … …  
    119125      <DependentUpon>DragOverTabControl.cs</DependentUpon>
    120126    </Compile>
     127    <Compile Include="Plugin.cs" />
    121128    <Compile Include="Views\AsynchronousContentView.cs">
    122129      <SubType>UserControl</SubType>
    … …  
    131138      <DependentUpon>ContentView.cs</DependentUpon>
    132139    </Compile>
    133     <None Include="HeuristicLabMainFormWindowsFormsPlugin.cs.frame" />
     140    <None Include="Plugin.cs.frame" />
    134141    <Compile Include="Controls\ControlExtensions.cs" />
    135142    <Compile Include="MainForms\DockForm.cs">
    … …  
    157164      <DependentUpon>DocumentForm.cs</DependentUpon>
    158165    </Compile>
    159     <Compile Include="HeuristicLabMainFormWindowsFormsPlugin.cs" />
    160166    <Compile Include="MainForms\MainForm.cs">
    161167      <SubType>Form</SubType>
    … …  
    200206  <ItemGroup>
    201207    <None Include="HeuristicLab.snk" />
    202     <None Include="Properties\AssemblyInfo.frame" />
     208    <None Include="Properties\AssemblyInfo.cs.frame" />
    203209  </ItemGroup>
    204210  <ItemGroup>
    … …  
    206212      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    207213      <Name>HeuristicLab.Common.Resources-3.3</Name>
     214      <Private>False</Private>
    208215    </ProjectReference>
    209216    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    210217      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    211218      <Name>HeuristicLab.Common-3.3</Name>
    212     </ProjectReference>
    213     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\HeuristicLab.WinFormsUI-2.3.1\HeuristicLab.WinFormsUI-2.3.1.csproj">
    214       <Project>{678E2145-8152-4E19-9646-07D439D00301}</Project>
    215       <Name>HeuristicLab.WinFormsUI-2.3.1 %28HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\HeuristicLab.WinFormsUI-2.3.1\HeuristicLab.WinFormsUI-2.3.1%29</Name>
    216     </ProjectReference>
    217     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\WinFormsUI-2.3.1\WinFormsUI-2.3.1.csproj">
    218       <Project>{1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}</Project>
    219       <Name>WinFormsUI-2.3.1</Name>
     219      <Private>False</Private>
    220220    </ProjectReference>
    221221    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    222222      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    223223      <Name>HeuristicLab.MainForm-3.3</Name>
     224      <Private>False</Private>
    224225    </ProjectReference>
    225226    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    226227      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    227228      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     229      <Private>False</Private>
    228230    </ProjectReference>
    229231  </ItemGroup>
    … …  
    260262
    261263call PreBuildEvent.cmd
    262 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabMainFormWindowsFormsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabMainFormWindowsFormsPlugin.cs"</PreBuildEvent>
     264</PreBuildEvent>
    263265  </PropertyGroup>
    264266</Project>
Note: See TracChangeset for help on using the changeset viewer.