Ignore:
Timestamp:
10/05/11 12:45:26 (10 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.Encodings.PermutationEncoding.Views/3.3

    • Property svn:ignore
      •  

        old new  
        44HeuristicLabEncodingsPermutationEncodingViewsPlugin.cs
        55*.vs10x
         6Plugin.cs
  • trunk/sources/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/HeuristicLab.Encodings.PermutationEncoding.Views-3.3.csproj

    r6628 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>
     
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x86\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
     
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    68     <OutputPath>bin\x86\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
     
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x64\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
     
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    86     <OutputPath>bin\x64\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
     
    120120      <DependentUpon>PermutationTypeView.cs</DependentUpon>
    121121    </Compile>
    122     <Compile Include="HeuristicLabEncodingsPermutationEncodingViewsPlugin.cs" />
    123122    <Compile Include="PermutationView.cs">
    124123      <SubType>UserControl</SubType>
     
    127126      <DependentUpon>PermutationView.cs</DependentUpon>
    128127    </Compile>
     128    <Compile Include="Plugin.cs" />
    129129    <Compile Include="Properties\AssemblyInfo.cs" />
    130130  </ItemGroup>
    131131  <ItemGroup>
    132132    <None Include="HeuristicLab.snk" />
    133     <None Include="HeuristicLabEncodingsPermutationEncodingViewsPlugin.cs.frame" />
    134     <None Include="Properties\AssemblyInfo.frame" />
     133    <None Include="Plugin.cs.frame" />
     134    <None Include="Properties\AssemblyInfo.cs.frame" />
    135135  </ItemGroup>
    136136  <ItemGroup>
     
    138138      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    139139      <Name>HeuristicLab.Common-3.3</Name>
     140      <Private>False</Private>
    140141    </ProjectReference>
    141142    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    142143      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    143144      <Name>HeuristicLab.Core.Views-3.3</Name>
     145      <Private>False</Private>
    144146    </ProjectReference>
    145147    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    146148      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    147149      <Name>HeuristicLab.Core-3.3</Name>
     150      <Private>False</Private>
    148151    </ProjectReference>
    149152    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    150153      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    151154      <Name>HeuristicLab.Data.Views-3.3</Name>
     155      <Private>False</Private>
    152156    </ProjectReference>
    153157    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    154158      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    155159      <Name>HeuristicLab.Data-3.3</Name>
     160      <Private>False</Private>
    156161    </ProjectReference>
    157162    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    158163      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    159164      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     165      <Private>False</Private>
    160166    </ProjectReference>
    161167    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    162168      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    163169      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     170      <Private>False</Private>
    164171    </ProjectReference>
    165172    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    166173      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    167174      <Name>HeuristicLab.MainForm-3.3</Name>
     175      <Private>False</Private>
    168176    </ProjectReference>
    169177    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    170178      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    171179      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     180      <Private>False</Private>
    172181    </ProjectReference>
    173182    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    174183      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    175184      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     185      <Private>False</Private>
    176186    </ProjectReference>
    177187  </ItemGroup>
     
    208218
    209219call PreBuildEvent.cmd
    210 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabEncodingsPermutationEncodingViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabEncodingsPermutationEncodingViewsPlugin.cs"</PreBuildEvent>
     220</PreBuildEvent>
    211221  </PropertyGroup>
    212222</Project>
Note: See TracChangeset for help on using the changeset viewer.