Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 12:45:26 (12 years ago)
Author:
mkommend
Message:

#1653: Merged new HL solution into the trunk.

Location:
trunk/sources
Files:
4 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.Operators.Programmable/3.3

    • Property svn:ignore
      •  

        old new  
        44obj
        55*.vs10x
         6Plugin.cs
  • trunk/sources/HeuristicLab.Operators.Programmable/3.3/HeuristicLab.Operators.Programmable-3.3.csproj

    r5832 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.Operators.Programmable-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\Release\HeuristicLab.Operators.Programmable-3.2.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\Release\HeuristicLab.Operators.Programmable-3.2.XML</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9194    <Optimize>true</Optimize>
    9295    <DebugType>pdbonly</DebugType>
     
    109112  </ItemGroup>
    110113  <ItemGroup>
    111     <None Include="HeuristicLabOperatorsProgrammablePlugin.cs.frame" />
    112     <Compile Include="HeuristicLabOperatorsProgrammablePlugin.cs" />
     114    <None Include="Plugin.cs.frame" />
     115    <Compile Include="Plugin.cs" />
    113116    <Compile Include="ProgrammableOperator.cs" />
    114117    <Compile Include="ProgrammableOperatorView.cs">
     
    120123    <Compile Include="ProgrammableSingleSuccessorOperator.cs" />
    121124    <Compile Include="Properties\AssemblyInfo.cs" />
    122     <Compile Include="Properties\Resources.Designer.cs">
    123       <AutoGen>True</AutoGen>
    124       <DesignTime>True</DesignTime>
    125       <DependentUpon>Resources.resx</DependentUpon>
    126     </Compile>
    127125  </ItemGroup>
    128126  <ItemGroup>
    129127    <None Include="HeuristicLab.snk" />
    130     <None Include="Properties\AssemblyInfo.frame" />
     128    <None Include="Properties\AssemblyInfo.cs.frame" />
    131129  </ItemGroup>
    132130  <ItemGroup>
     
    134132      <Project>{489CFE09-FDF7-4C89-BAB5-BD09CADD61AD}</Project>
    135133      <Name>HeuristicLab.CodeEditor-3.3</Name>
     134      <Private>False</Private>
    136135    </ProjectReference>
    137136    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    138137      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    139138      <Name>HeuristicLab.Collections-3.3</Name>
     139      <Private>False</Private>
    140140    </ProjectReference>
    141141    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    142142      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    143143      <Name>HeuristicLab.Common.Resources-3.3</Name>
     144      <Private>False</Private>
    144145    </ProjectReference>
    145146    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    146147      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    147148      <Name>HeuristicLab.Common-3.3</Name>
     149      <Private>False</Private>
    148150    </ProjectReference>
    149151    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    150152      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    151153      <Name>HeuristicLab.Core.Views-3.3</Name>
     154      <Private>False</Private>
    152155    </ProjectReference>
    153156    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    154157      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    155158      <Name>HeuristicLab.Core-3.3</Name>
     159      <Private>False</Private>
    156160    </ProjectReference>
    157161    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    158162      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    159163      <Name>HeuristicLab.Data-3.3</Name>
     164      <Private>False</Private>
    160165    </ProjectReference>
    161166    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    162167      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    163168      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     169      <Private>False</Private>
    164170    </ProjectReference>
    165171    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    166172      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    167173      <Name>HeuristicLab.MainForm-3.3</Name>
     174      <Private>False</Private>
    168175    </ProjectReference>
    169176    <ProjectReference Include="..\..\HeuristicLab.Operators.Views\3.3\HeuristicLab.Operators.Views-3.3.csproj">
    170177      <Project>{C49CB749-8B24-4628-8003-E86475749410}</Project>
    171178      <Name>HeuristicLab.Operators.Views-3.3</Name>
     179      <Private>False</Private>
    172180    </ProjectReference>
    173181    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    174182      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    175183      <Name>HeuristicLab.Operators-3.3</Name>
     184      <Private>False</Private>
    176185    </ProjectReference>
    177186    <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">
    178187      <Project>{AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}</Project>
    179188      <Name>HeuristicLab.Parameters.Views-3.3</Name>
     189      <Private>False</Private>
    180190    </ProjectReference>
    181191    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    182192      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    183193      <Name>HeuristicLab.Parameters-3.3</Name>
     194      <Private>False</Private>
    184195    </ProjectReference>
    185196    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    186197      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    187198      <Name>HeuristicLab.Persistence-3.3</Name>
     199      <Private>False</Private>
    188200    </ProjectReference>
    189201    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    190202      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    191203      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    192     </ProjectReference>
    193   </ItemGroup>
    194   <ItemGroup>
    195     <EmbeddedResource Include="Properties\Resources.resx">
    196       <Generator>ResXFileCodeGenerator</Generator>
    197       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    198     </EmbeddedResource>
     204      <Private>False</Private>
     205    </ProjectReference>
    199206  </ItemGroup>
    200207  <ItemGroup>
     
    230237
    231238call PreBuildEvent.cmd
    232 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabOperatorsProgrammablePlugin.cs.frame" "%25ProjectDir%25\HeuristicLabOperatorsProgrammablePlugin.cs"</PreBuildEvent>
     239</PreBuildEvent>
    233240  </PropertyGroup>
    234241</Project>
Note: See TracChangeset for help on using the changeset viewer.