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

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views/3.3/HeuristicLab.Problems.TravelingSalesman.Views-3.3.csproj

    r5832 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.Problems.TravelingSalesman.Views-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>
    71     <DocumentationFile>bin\x86\Release\HeuristicLab.Problems.TravelingSalesman.Views-3.3.xml</DocumentationFile>
     72    <DocumentationFile>
     73    </DocumentationFile>
    7274    <Optimize>true</Optimize>
    7375    <DebugType>pdbonly</DebugType>
    … …  
    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>
    90     <DocumentationFile>bin\x64\Release\HeuristicLab.Problems.TravelingSalesman.Views-3.3.xml</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9194    <Optimize>true</Optimize>
    9295    <DebugType>pdbonly</DebugType>
    … …  
    112115  </ItemGroup>
    113116  <ItemGroup>
    114     <Compile Include="HeuristicLabProblemsTravelingSalesmanViewsPlugin.cs" />
    115117    <Compile Include="PathTSPTourView.cs">
    116118      <SubType>UserControl</SubType>
    … …  
    119121      <DependentUpon>PathTSPTourView.cs</DependentUpon>
    120122    </Compile>
     123    <Compile Include="Plugin.cs" />
    121124    <Compile Include="TravelingSalesmanProblemView.cs">
    122125      <SubType>UserControl</SubType>
    … …  
    135138  <ItemGroup>
    136139    <None Include="HeuristicLab.snk" />
    137     <None Include="HeuristicLabProblemsTravelingSalesmanViewsPlugin.cs.frame" />
    138     <None Include="Properties\AssemblyInfo.frame" />
     140    <None Include="Plugin.cs.frame" />
     141    <None Include="Properties\AssemblyInfo.cs.frame" />
    139142  </ItemGroup>
    140143  <ItemGroup>
    … …  
    142145      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    143146      <Name>HeuristicLab.Collections-3.3</Name>
     147      <Private>False</Private>
    144148    </ProjectReference>
    145149    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    146150      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    147151      <Name>HeuristicLab.Common.Resources-3.3</Name>
     152      <Private>False</Private>
    148153    </ProjectReference>
    149154    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    150155      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    151156      <Name>HeuristicLab.Common-3.3</Name>
     157      <Private>False</Private>
    152158    </ProjectReference>
    153159    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    154160      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    155161      <Name>HeuristicLab.Core.Views-3.3</Name>
     162      <Private>False</Private>
    156163    </ProjectReference>
    157164    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    158165      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    159166      <Name>HeuristicLab.Core-3.3</Name>
     167      <Private>False</Private>
    160168    </ProjectReference>
    161169    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    162170      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    163171      <Name>HeuristicLab.Data-3.3</Name>
     172      <Private>False</Private>
    164173    </ProjectReference>
    165174    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    166175      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    167176      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     177      <Private>False</Private>
    168178    </ProjectReference>
    169179    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    170180      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    171181      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     182      <Private>False</Private>
    172183    </ProjectReference>
    173184    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    174185      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    175186      <Name>HeuristicLab.MainForm-3.3</Name>
     187      <Private>False</Private>
    176188    </ProjectReference>
    177189    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    178190      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    179191      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     192      <Private>False</Private>
    180193    </ProjectReference>
    181194    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    182195      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    183196      <Name>HeuristicLab.Optimization-3.3</Name>
     197      <Private>False</Private>
    184198    </ProjectReference>
    185199    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    186200      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    187201      <Name>HeuristicLab.Parameters-3.3</Name>
     202      <Private>False</Private>
    188203    </ProjectReference>
    189204    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    190205      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    191206      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     207      <Private>False</Private>
    192208    </ProjectReference>
    193209    <ProjectReference Include="..\..\HeuristicLab.Problems.TravelingSalesman\3.3\HeuristicLab.Problems.TravelingSalesman-3.3.csproj">
    194210      <Project>{D767C38D-8014-46B0-9A32-03A3AECCE34A}</Project>
    195211      <Name>HeuristicLab.Problems.TravelingSalesman-3.3</Name>
     212      <Private>False</Private>
    196213    </ProjectReference>
    197214  </ItemGroup>
    … …  
    228245
    229246call PreBuildEvent.cmd
    230 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsTravelingSalesmanViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsTravelingSalesmanViewsPlugin.cs"</PreBuildEvent>
     247</PreBuildEvent>
    231248  </PropertyGroup>
    232249</Project>
Note: See TracChangeset for help on using the changeset viewer.