Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 12:45:26 (12 years ago)
Author:
mkommend
Message:

#1653: Merged new HL solution into the trunk.

Location:
trunk/sources
Files:
3 edited

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.Problems.ExternalEvaluation.GP.Views/3.3

    • Property svn:ignore
      •  

        old new  
        44HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj.user
        55*.vs10x
         6Plugin.cs
  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.3/HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj

    r5832 r6866  
    2121    <DebugType>full</DebugType>
    2222    <Optimize>false</Optimize>
    23     <OutputPath>bin\Debug\</OutputPath>
     23    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2424    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2525    <ErrorReport>prompt</ErrorReport>
     
    2929    <DebugType>pdbonly</DebugType>
    3030    <Optimize>true</Optimize>
    31     <OutputPath>bin\Release\</OutputPath>
     31    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3232    <DefineConstants>TRACE</DefineConstants>
    3333    <ErrorReport>prompt</ErrorReport>
     
    4242  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    4343    <DebugSymbols>true</DebugSymbols>
    44     <OutputPath>bin\x86\Debug\</OutputPath>
     44    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4545    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4646    <DebugType>full</DebugType>
     
    5757  </PropertyGroup>
    5858  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    59     <OutputPath>bin\x86\Release\</OutputPath>
     59    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6060    <DefineConstants>TRACE</DefineConstants>
    6161    <Optimize>true</Optimize>
    6262    <DebugType>pdbonly</DebugType>
    6363    <PlatformTarget>x86</PlatformTarget>
    64     <CodeAnalysisLogFile>bin\Release\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     64    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    6565    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    6666    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     
    7474  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7575    <DebugSymbols>true</DebugSymbols>
    76     <OutputPath>bin\x64\Debug\</OutputPath>
     76    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7777    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7878    <DebugType>full</DebugType>
     
    8989  </PropertyGroup>
    9090  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    91     <OutputPath>bin\x64\Release\</OutputPath>
     91    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9292    <DefineConstants>TRACE</DefineConstants>
    9393    <Optimize>true</Optimize>
    9494    <DebugType>pdbonly</DebugType>
    9595    <PlatformTarget>x64</PlatformTarget>
    96     <CodeAnalysisLogFile>bin\Release\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     96    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9797    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9898    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     
    115115  </ItemGroup>
    116116  <ItemGroup>
    117     <None Include="Properties\AssemblyInfo.frame" />
     117    <None Include="Properties\AssemblyInfo.cs.frame" />
     118    <Compile Include="Plugin.cs" />
    118119    <Compile Include="VariableSymbolView.cs">
    119120      <SubType>UserControl</SubType>
     
    123124    </Compile>
    124125    <None Include="HeuristicLab.snk" />
    125     <None Include="HeuristicLabProblemsExternalEvaluationGPViewsPlugin.cs.frame" />
    126     <Compile Include="HeuristicLabProblemsExternalEvaluationGPViewsPlugin.cs" />
     126    <None Include="Plugin.cs.frame" />
    127127    <Compile Include="Properties\AssemblyInfo.cs" />
    128128  </ItemGroup>
     
    131131      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    132132      <Name>HeuristicLab.Collections-3.3</Name>
     133      <Private>False</Private>
    133134    </ProjectReference>
    134135    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    135136      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    136137      <Name>HeuristicLab.Common-3.3</Name>
     138      <Private>False</Private>
    137139    </ProjectReference>
    138140    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    139141      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    140142      <Name>HeuristicLab.Core.Views-3.3</Name>
     143      <Private>False</Private>
    141144    </ProjectReference>
    142145    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    143146      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    144147      <Name>HeuristicLab.Core-3.3</Name>
     148      <Private>False</Private>
    145149    </ProjectReference>
    146150    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    147151      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    148152      <Name>HeuristicLab.Data-3.3</Name>
     153      <Private>False</Private>
    149154    </ProjectReference>
    150155    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    151156      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    152157      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     158      <Private>False</Private>
    153159    </ProjectReference>
    154160    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    155161      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    156162      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     163      <Private>False</Private>
    157164    </ProjectReference>
    158165    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    159166      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    160167      <Name>HeuristicLab.MainForm-3.3</Name>
     168      <Private>False</Private>
    161169    </ProjectReference>
    162170    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    163171      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    164172      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     173      <Private>False</Private>
    165174    </ProjectReference>
    166175    <ProjectReference Include="..\..\HeuristicLab.Problems.ExternalEvaluation.GP\3.3\HeuristicLab.Problems.ExternalEvaluation.GP-3.3.csproj">
    167176      <Project>{E86E215D-E3CE-4244-978D-555D4E17AC09}</Project>
    168177      <Name>HeuristicLab.Problems.ExternalEvaluation.GP-3.3</Name>
     178      <Private>False</Private>
    169179    </ProjectReference>
    170180  </ItemGroup>
     
    177187
    178188call PreBuildEvent.cmd
    179 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationGPViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationGPViewsPlugin.cs"</PreBuildEvent>
     189</PreBuildEvent>
    180190  </PropertyGroup>
    181191  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.