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:
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.Analysis.Views/3.3

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

    r6353 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.Analysis.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.Analysis.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.Analysis.Views-3.3.XML</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9194    <Optimize>true</Optimize>
    9295    <DebugType>pdbonly</DebugType>
    … …  
    113116  </ItemGroup>
    114117  <ItemGroup>
    115     <None Include="HeuristicLabAnalysisViewsPlugin.cs.frame" />
     118    <None Include="Plugin.cs.frame" />
    116119    <Compile Include="AlleleFrequencyCollectionView.cs">
    117120      <SubType>UserControl</SubType>
    … …  
    156159      <DependentUpon>HeatMapView.cs</DependentUpon>
    157160    </Compile>
    158     <Compile Include="HeuristicLabAnalysisViewsPlugin.cs" />
    159161    <Compile Include="AlleleFrequencyView.cs">
    160162      <SubType>UserControl</SubType>
    … …  
    169171      <DependentUpon>AlleleFrequencyCollectionHistoryView.cs</DependentUpon>
    170172    </Compile>
     173    <Compile Include="Plugin.cs" />
    171174    <Compile Include="Properties\AssemblyInfo.cs" />
    172175    <Compile Include="DataTableView.cs">
    … …  
    179182  <ItemGroup>
    180183    <None Include="HeuristicLab.snk" />
    181     <None Include="Properties\AssemblyInfo.frame" />
     184    <None Include="Properties\AssemblyInfo.cs.frame" />
    182185  </ItemGroup>
    183186  <ItemGroup>
    … …  
    185188      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    186189      <Name>HeuristicLab.Analysis-3.3</Name>
     190      <Private>False</Private>
    187191    </ProjectReference>
    188192    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    189193      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    190194      <Name>HeuristicLab.Collections-3.3</Name>
     195      <Private>False</Private>
    191196    </ProjectReference>
    192197    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    193198      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    194199      <Name>HeuristicLab.Common.Resources-3.3</Name>
     200      <Private>False</Private>
    195201    </ProjectReference>
    196202    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    197203      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    198204      <Name>HeuristicLab.Common-3.3</Name>
     205      <Private>False</Private>
    199206    </ProjectReference>
    200207    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    201208      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    202209      <Name>HeuristicLab.Core.Views-3.3</Name>
     210      <Private>False</Private>
    203211    </ProjectReference>
    204212    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    205213      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    206214      <Name>HeuristicLab.Core-3.3</Name>
     215      <Private>False</Private>
    207216    </ProjectReference>
    208217    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    209218      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    210219      <Name>HeuristicLab.Data.Views-3.3</Name>
     220      <Private>False</Private>
    211221    </ProjectReference>
    212222    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    213223      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    214224      <Name>HeuristicLab.Data-3.3</Name>
     225      <Private>False</Private>
    215226    </ProjectReference>
    216227    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    217228      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    218229      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     230      <Private>False</Private>
    219231    </ProjectReference>
    220232    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    221233      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    222234      <Name>HeuristicLab.MainForm-3.3</Name>
     235      <Private>False</Private>
    223236    </ProjectReference>
    224237    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    225238      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    226239      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     240      <Private>False</Private>
    227241    </ProjectReference>
    228242    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    229243      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    230244      <Name>HeuristicLab.Optimization-3.3</Name>
     245      <Private>False</Private>
    231246    </ProjectReference>
    232247    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    233248      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    234249      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     250      <Private>False</Private>
    235251    </ProjectReference>
    236252    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    237253      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    238254      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     255      <Private>False</Private>
    239256    </ProjectReference>
    240257  </ItemGroup>
    … …  
    276293
    277294call PreBuildEvent.cmd
    278 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAnalysisViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAnalysisViewsPlugin.cs"</PreBuildEvent>
     295</PreBuildEvent>
    279296  </PropertyGroup>
    280297</Project>
Note: See TracChangeset for help on using the changeset viewer.