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
4 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.VehicleRouting.Views

  • trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.3

    • Property svn:ignore

      •  

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

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

    r5163 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.VehicleRouting.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.VehicleRouting.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.VehicleRouting.Views-3.3.xml</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9194    <Optimize>true</Optimize>
    9295    <DebugType>pdbonly</DebugType>
    … …  
    112115  </ItemGroup>
    113116  <ItemGroup>
     117    <Compile Include="Plugin.cs" />
    114118    <Compile Include="VRPEncodingView.cs">
    115119      <SubType>UserControl</SubType>
    … …  
    118122      <DependentUpon>VRPEncodingView.cs</DependentUpon>
    119123    </Compile>
    120     <Compile Include="HeuristicLabProblemsVehicleRoutingViewsPlugin.cs" />
    121124    <Compile Include="VRPImportDialog.cs">
    122125      <SubType>Form</SubType>
    … …  
    141144  <ItemGroup>
    142145    <None Include="HeuristicLab.snk" />
    143     <None Include="HeuristicLabProblemsVehicleRoutingViewsPlugin.cs.frame" />
    144     <None Include="Properties\AssemblyInfo.frame" />
     146    <None Include="Plugin.cs.frame" />
     147    <None Include="Properties\AssemblyInfo.cs.frame" />
    145148  </ItemGroup>
    146149  <ItemGroup>
    … …  
    148151      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    149152      <Name>HeuristicLab.Collections-3.3</Name>
     153      <Private>False</Private>
    150154    </ProjectReference>
    151155    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    152156      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    153157      <Name>HeuristicLab.Common.Resources-3.3</Name>
     158      <Private>False</Private>
    154159    </ProjectReference>
    155160    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    156161      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    157162      <Name>HeuristicLab.Common-3.3</Name>
     163      <Private>False</Private>
    158164    </ProjectReference>
    159165    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    160166      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    161167      <Name>HeuristicLab.Core.Views-3.3</Name>
     168      <Private>False</Private>
    162169    </ProjectReference>
    163170    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    164171      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    165172      <Name>HeuristicLab.Core-3.3</Name>
     173      <Private>False</Private>
    166174    </ProjectReference>
    167175    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    168176      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    169177      <Name>HeuristicLab.Data.Views-3.3</Name>
     178      <Private>False</Private>
    170179    </ProjectReference>
    171180    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    172181      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    173182      <Name>HeuristicLab.Data-3.3</Name>
     183      <Private>False</Private>
    174184    </ProjectReference>
    175185    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    176186      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    177187      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     188      <Private>False</Private>
    178189    </ProjectReference>
    179190    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    180191      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    181192      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     193      <Private>False</Private>
    182194    </ProjectReference>
    183195    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    184196      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    185197      <Name>HeuristicLab.MainForm-3.3</Name>
     198      <Private>False</Private>
    186199    </ProjectReference>
    187200    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    188201      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    189202      <Name>HeuristicLab.Operators-3.3</Name>
     203      <Private>False</Private>
    190204    </ProjectReference>
    191205    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    192206      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    193207      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     208      <Private>False</Private>
    194209    </ProjectReference>
    195210    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    196211      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    197212      <Name>HeuristicLab.Optimization-3.3</Name>
     213      <Private>False</Private>
    198214    </ProjectReference>
    199215    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    200216      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    201217      <Name>HeuristicLab.Parameters-3.3</Name>
     218      <Private>False</Private>
    202219    </ProjectReference>
    203220    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    204221      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    205222      <Name>HeuristicLab.Persistence-3.3</Name>
     223      <Private>False</Private>
    206224    </ProjectReference>
    207225    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    208226      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    209227      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     228      <Private>False</Private>
    210229    </ProjectReference>
    211230    <ProjectReference Include="..\..\HeuristicLab.Problems.VehicleRouting\3.3\HeuristicLab.Problems.VehicleRouting-3.3.csproj">
    212231      <Project>{6410BDA6-3641-42B2-BABA-AA626E2F6F71}</Project>
    213232      <Name>HeuristicLab.Problems.VehicleRouting-3.3</Name>
     233      <Private>False</Private>
    214234    </ProjectReference>
    215235  </ItemGroup>
    … …  
    246266
    247267call PreBuildEvent.cmd
    248 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsVehicleRoutingViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsVehicleRoutingViewsPlugin.cs"</PreBuildEvent>
     268</PreBuildEvent>
    249269  </PropertyGroup>
    250270</Project>
Note: See TracChangeset for help on using the changeset viewer.