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
2 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.Operators.Views.GraphVisualization/3.3/HeuristicLab.Operators.Views.GraphVisualization-3.3.csproj

    r6036 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.Operators.Views.GraphVisualization-3.3.XML</DocumentationFile>
     56    <DocumentationFile>
     57    </DocumentationFile>
    5758    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5859  </PropertyGroup>
    5960  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6061    <DebugSymbols>true</DebugSymbols>
    61     <OutputPath>bin\x86\Debug\</OutputPath>
     62    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6263    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6364    <DebugType>full</DebugType>
    … …  
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    69     <OutputPath>bin\x86\Release\</OutputPath>
     70    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7071    <DefineConstants>TRACE</DefineConstants>
    7172    <Optimize>true</Optimize>
    … …  
    7374    <PlatformTarget>x86</PlatformTarget>
    7475    <ErrorReport>prompt</ErrorReport>
    75     <DocumentationFile>bin\x86\Release\HeuristicLab.Operators.Views.GraphVisualization-3.3.XML</DocumentationFile>
     76    <DocumentationFile>
     77    </DocumentationFile>
    7678    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    7779  </PropertyGroup>
    7880  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7981    <DebugSymbols>true</DebugSymbols>
    80     <OutputPath>bin\x64\Debug\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8183    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8284    <DebugType>full</DebugType>
    … …  
    8688  </PropertyGroup>
    8789  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    88     <OutputPath>bin\x64\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8991    <DefineConstants>TRACE</DefineConstants>
    9092    <Optimize>true</Optimize>
    … …  
    9294    <PlatformTarget>x64</PlatformTarget>
    9395    <ErrorReport>prompt</ErrorReport>
    94     <DocumentationFile>bin\x64\Release\HeuristicLab.Operators.Views.GraphVisualization-3.3.XML</DocumentationFile>
     96    <DocumentationFile>
     97    </DocumentationFile>
    9598    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    9699  </PropertyGroup>
    … …  
    112115  </ItemGroup>
    113116  <ItemGroup>
    114     <Compile Include="HeuristicLabOperatorsViewsGraphVisualizationPlugin.cs" />
    115117    <Compile Include="OperatorGraphVisualization\OperatorShape.cs" />
    116118    <Compile Include="OperatorGraphVisualization\OperatorShapeInfoFactory.cs" />
     119    <Compile Include="Plugin.cs" />
    117120    <Compile Include="Properties\AssemblyInfo.cs" />
    118121  </ItemGroup>
    119122  <ItemGroup>
    120123    <None Include="HeuristicLab.snk" />
    121     <None Include="HeuristicLabOperatorsViewsGraphVisualizationPlugin.cs.frame" />
    122     <None Include="Properties\AssemblyInfo.frame" />
     124    <None Include="Plugin.cs.frame" />
     125    <None Include="Properties\AssemblyInfo.cs.frame" />
    123126    <Compile Include="General\GraphVisualizationInfo.cs" />
    124127    <Compile Include="General\ConnectionInfo.cs" />
    … …  
    140143      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    141144      <Name>HeuristicLab.Collections-3.3</Name>
     145      <Private>False</Private>
    142146    </ProjectReference>
    143147    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    144148      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    145149      <Name>HeuristicLab.Common-3.3</Name>
     150      <Private>False</Private>
    146151    </ProjectReference>
    147152    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    148153      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    149154      <Name>HeuristicLab.Core-3.3</Name>
     155      <Private>False</Private>
    150156    </ProjectReference>
    151157    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    152158      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    153159      <Name>HeuristicLab.Operators-3.3</Name>
     160      <Private>False</Private>
    154161    </ProjectReference>
    155162    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    156163      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    157164      <Name>HeuristicLab.Persistence-3.3</Name>
     165      <Private>False</Private>
    158166    </ProjectReference>
    159167    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    160168      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    161169      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     170      <Private>False</Private>
    162171    </ProjectReference>
    163172  </ItemGroup>
    … …  
    194203
    195204call PreBuildEvent.cmd
    196 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabOperatorsViewsGraphVisualizationPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabOperatorsViewsGraphVisualizationPlugin.cs"</PreBuildEvent>
     205</PreBuildEvent>
    197206  </PropertyGroup>
    198207</Project>
Note: See TracChangeset for help on using the changeset viewer.