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

    • Property svn:ignore

      •  

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

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

    r5809 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.Data.Views-3.3.XML</DocumentationFile>
     56    <DocumentationFile>
     57    </DocumentationFile>
    5758    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5859  </PropertyGroup>
    5960  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    6061    <DebugSymbols>true</DebugSymbols>
    61     <OutputPath>bin\x64\Debug\</OutputPath>
     62    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6263    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6364    <DebugType>full</DebugType>
    … …  
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    69     <OutputPath>bin\x64\Release\</OutputPath>
     70    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7071    <DefineConstants>TRACE</DefineConstants>
    71     <DocumentationFile>bin\x64\Release\HeuristicLab.Data.Views-3.3.XML</DocumentationFile>
     72    <DocumentationFile>
     73    </DocumentationFile>
    7274    <Optimize>true</Optimize>
    7375    <DebugType>pdbonly</DebugType>
    … …  
    7880  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7981    <DebugSymbols>true</DebugSymbols>
    80     <OutputPath>bin\x86\Debug\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8183    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8284    <DebugType>full</DebugType>
    … …  
    8688  </PropertyGroup>
    8789  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    88     <OutputPath>bin\x86\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8991    <DefineConstants>TRACE</DefineConstants>
    90     <DocumentationFile>bin\x86\Release\HeuristicLab.Data.Views-3.3.XML</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9194    <Optimize>true</Optimize>
    9295    <DebugType>pdbonly</DebugType>
    … …  
    124127      <DependentUpon>IntRangeView.cs</DependentUpon>
    125128    </Compile>
     129    <Compile Include="Plugin.cs" />
    126130    <Compile Include="StringConvertibleValueTupleView.cs">
    127131      <SubType>UserControl</SubType>
    … …  
    130134      <DependentUpon>StringConvertibleValueTupleView.cs</DependentUpon>
    131135    </Compile>
    132     <None Include="HeuristicLabDataViewsPlugin.cs.frame" />
     136    <None Include="Plugin.cs.frame" />
    133137    <Compile Include="BoolValueView.cs">
    134138      <SubType>UserControl</SubType>
    … …  
    149153      <DependentUpon>ComparisonView.cs</DependentUpon>
    150154    </Compile>
    151     <Compile Include="HeuristicLabDataViewsPlugin.cs" />
    152155    <Compile Include="Properties\AssemblyInfo.cs" />
    153156    <Compile Include="StringConvertibleArrayView.cs">
    … …  
    172175  <ItemGroup>
    173176    <None Include="HeuristicLab.snk" />
    174     <None Include="Properties\AssemblyInfo.frame" />
     177    <None Include="Properties\AssemblyInfo.cs.frame" />
    175178  </ItemGroup>
    176179  <ItemGroup>
    … …  
    178181      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    179182      <Name>HeuristicLab.Common-3.3</Name>
     183      <Private>False</Private>
    180184    </ProjectReference>
    181185    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    182186      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    183187      <Name>HeuristicLab.Core.Views-3.3</Name>
     188      <Private>False</Private>
    184189    </ProjectReference>
    185190    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    186191      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    187192      <Name>HeuristicLab.Core-3.3</Name>
     193      <Private>False</Private>
    188194    </ProjectReference>
    189195    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    190196      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    191197      <Name>HeuristicLab.Data-3.3</Name>
     198      <Private>False</Private>
    192199    </ProjectReference>
    193200    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    194201      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    195202      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     203      <Private>False</Private>
    196204    </ProjectReference>
    197205    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    198206      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    199207      <Name>HeuristicLab.MainForm-3.3</Name>
     208      <Private>False</Private>
    200209    </ProjectReference>
    201210    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    202211      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    203212      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     213      <Private>False</Private>
    204214    </ProjectReference>
    205215  </ItemGroup>
    … …  
    236246
    237247call PreBuildEvent.cmd
    238 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabDataViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabDataViewsPlugin.cs"</PreBuildEvent>
     248</PreBuildEvent>
    239249  </PropertyGroup>
    240250</Project>
Note: See TracChangeset for help on using the changeset viewer.