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.Persistence.GUI/3.3

    • Property svn:ignore

      •  

        old new  
        55HeuristicLabPersistenceGUIPlugin.cs
        66*.vs10x
         7Plugin.cs

  • trunk/sources/HeuristicLab.Persistence.GUI/3.3/HeuristicLab.Persistence.GUI-3.3.csproj

    r5163 r6866  
    1212    <AssemblyName>HeuristicLab.Persistence.GUI-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile></TargetFrameworkProfile>
     14    <TargetFrameworkProfile>
     15    </TargetFrameworkProfile>
    1516    <FileAlignment>512</FileAlignment>
    1617    <StartupObject>
    … …  
    4041    <DebugType>full</DebugType>
    4142    <Optimize>false</Optimize>
    42     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4344    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4445    <ErrorReport>prompt</ErrorReport>
    … …  
    4950    <DebugType>pdbonly</DebugType>
    5051    <Optimize>true</Optimize>
    51     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5253    <DefineConstants>TRACE</DefineConstants>
    5354    <ErrorReport>prompt</ErrorReport>
    5455    <WarningLevel>4</WarningLevel>
    55     <DocumentationFile>bin\Release\HeuristicLab.Persistence.GUI-3.3.XML</DocumentationFile>
     56    <DocumentationFile>
     57    </DocumentationFile>
    5658    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5759  </PropertyGroup>
    5860  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5961    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x64\Debug\</OutputPath>
     62    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6163    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6264    <DebugType>full</DebugType>
    … …  
    6668  </PropertyGroup>
    6769  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>bin\x64\Release\</OutputPath>
     70    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6971    <DefineConstants>TRACE</DefineConstants>
    7072    <Optimize>true</Optimize>
    … …  
    7274    <PlatformTarget>x64</PlatformTarget>
    7375    <ErrorReport>prompt</ErrorReport>
    74     <DocumentationFile>bin\x64\Release\HeuristicLab.Persistence.GUI-3.3.XML</DocumentationFile>
     76    <DocumentationFile>
     77    </DocumentationFile>
    7578    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    7679  </PropertyGroup>
    7780  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7881    <DebugSymbols>true</DebugSymbols>
    79     <OutputPath>bin\x86\Debug\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8083    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8184    <DebugType>full</DebugType>
    … …  
    8588  </PropertyGroup>
    8689  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    87     <OutputPath>bin\x86\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8891    <DefineConstants>TRACE</DefineConstants>
    8992    <Optimize>true</Optimize>
    … …  
    9194    <PlatformTarget>x86</PlatformTarget>
    9295    <ErrorReport>prompt</ErrorReport>
    93     <DocumentationFile>bin\x86\Release\HeuristicLab.Persistence.GUI-3.3.XML</DocumentationFile>
     96    <DocumentationFile>
     97    </DocumentationFile>
    9498    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    9599  </PropertyGroup>
    … …  
    106110      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    107111      <Name>HeuristicLab.Common.Resources-3.3</Name>
     112      <Private>False</Private>
    108113    </ProjectReference>
    109114    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    110115      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    111116      <Name>HeuristicLab.Persistence-3.3</Name>
     117      <Private>False</Private>
    112118    </ProjectReference>
    113119    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    114120      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    115121      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     122      <Private>False</Private>
    116123    </ProjectReference>
    117124  </ItemGroup>
    118125  <ItemGroup>
    119     <None Include="HeuristicLabPersistenceGUIPlugin.cs.frame" />
    120     <Compile Include="HeuristicLabPersistenceGUIPlugin.cs" />
     126    <None Include="Plugin.cs.frame" />
    121127    <Compile Include="PersistenceAnalysis.cs" />
    122128    <Compile Include="PersistenceConfigurationForm.cs">
    … …  
    126132      <DependentUpon>PersistenceConfigurationForm.cs</DependentUpon>
    127133    </Compile>
     134    <Compile Include="Plugin.cs" />
    128135    <Compile Include="Properties\AssemblyInfo.cs" />
    129136    <Compile Include="TypeExtensions.cs" />
    … …  
    147154  <ItemGroup>
    148155    <None Include="app.config" />
    149     <None Include="Properties\AssemblyInfo.frame" />
     156    <None Include="Properties\AssemblyInfo.cs.frame" />
    150157  </ItemGroup>
    151158  <ItemGroup>
    … …  
    173180
    174181call PreBuildEvent.cmd
    175 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabPersistenceGUIPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabPersistenceGUIPlugin.cs"</PreBuildEvent>
     182</PreBuildEvent>
    176183  </PropertyGroup>
    177184</Project>
Note: See TracChangeset for help on using the changeset viewer.