Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/22/16 14:25:28 (8 years ago)
Author:
gkronber
Message:

#2642: merged r14174,r14177,r14178,r14179 from trunk to stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

    r14162 r14180  
    1919    <DebugType>full</DebugType>
    2020    <Optimize>false</Optimize>
    21     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     21    <OutputPath>..\..\bin\</OutputPath>
    2222    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2323    <ErrorReport>prompt</ErrorReport>
    2424    <WarningLevel>4</WarningLevel>
    25     <Prefer32Bit>false</Prefer32Bit>
    2625  </PropertyGroup>
    2726  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    2827    <DebugType>pdbonly</DebugType>
    2928    <Optimize>true</Optimize>
    30     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     29    <OutputPath>..\..\bin\</OutputPath>
    3130    <DefineConstants>TRACE</DefineConstants>
    3231    <ErrorReport>prompt</ErrorReport>
    3332    <WarningLevel>4</WarningLevel>
    34     <Prefer32Bit>false</Prefer32Bit>
    3533  </PropertyGroup>
    3634  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    3735    <DebugSymbols>true</DebugSymbols>
    38     <OutputPath>bin\x64\Debug\</OutputPath>
     36    <OutputPath>..\..\bin\</OutputPath>
    3937    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4038    <DebugType>full</DebugType>
    4139    <PlatformTarget>x64</PlatformTarget>
    42     <CodeAnalysisLogFile>bin\Debug\HeuristicLab.Problems.BinPacking.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    43     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    44     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    45     <ErrorReport>prompt</ErrorReport>
    46     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    47     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    48     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
    49     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    50     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
    51     <Prefer32Bit>false</Prefer32Bit>
     40    <ErrorReport>prompt</ErrorReport>
    5241  </PropertyGroup>
    5342  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    54     <OutputPath>bin\x64\Release\</OutputPath>
     43    <OutputPath>..\..\bin\</OutputPath>
    5544    <DefineConstants>TRACE</DefineConstants>
    5645    <Optimize>true</Optimize>
    5746    <DebugType>pdbonly</DebugType>
    5847    <PlatformTarget>x64</PlatformTarget>
    59     <CodeAnalysisLogFile>bin\Release\HeuristicLab.Problems.BinPacking.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    60     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    61     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    62     <ErrorReport>prompt</ErrorReport>
    63     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    64     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    65     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
    66     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    67     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     48    <ErrorReport>prompt</ErrorReport>
    6849    <Prefer32Bit>false</Prefer32Bit>
    6950  </PropertyGroup>
    7051  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    7152    <DebugSymbols>true</DebugSymbols>
    72     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     53    <OutputPath>..\..\bin\</OutputPath>
    7354    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7455    <DebugType>full</DebugType>
    7556    <PlatformTarget>x86</PlatformTarget>
    76     <CodeAnalysisLogFile>bin\Debug\HeuristicLab.Problems.BinPacking.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    77     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    78     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    79     <ErrorReport>prompt</ErrorReport>
    80     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    81     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    82     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
    83     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    84     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
    85     <Prefer32Bit>false</Prefer32Bit>
     57    <ErrorReport>prompt</ErrorReport>
    8658  </PropertyGroup>
    8759  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    88     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     60    <OutputPath>..\..\bin\</OutputPath>
    8961    <DefineConstants>TRACE</DefineConstants>
    9062    <Optimize>true</Optimize>
    9163    <DebugType>pdbonly</DebugType>
    9264    <PlatformTarget>x86</PlatformTarget>
    93     <CodeAnalysisLogFile>bin\Release\HeuristicLab.Problems.BinPacking.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    94     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    95     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    96     <ErrorReport>prompt</ErrorReport>
    97     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    98     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    99     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
    100     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    101     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
    102     <Prefer32Bit>false</Prefer32Bit>
     65    <ErrorReport>prompt</ErrorReport>
    10366  </PropertyGroup>
    10467  <PropertyGroup>

  • stable/HeuristicLab.Problems.BinPacking/3.3/Plugin.cs.frame

    r14162 r14180  
    2626  /// Plugin class for HeuristicLab.Problems.BinPacking plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Problems.BinPacking", "3.3.7.$WCREV$")]
     28  [Plugin("HeuristicLab.Problems.BinPacking", "3.3.14.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.BinPacking-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Collections", "3.3")]

  • stable/HeuristicLab.Problems.BinPacking/3.3/Properties/AssemblyInfo.cs.frame

    r14162 r14180  
    4242
    4343// The following GUID is for the ID of the typelib if this project is exposed to COM
    44 [assembly: Guid("5D63ECBE-F92C-40DC-A081-C073323D72FF")]
     44[assembly: Guid("CFB5BBA1-4F23-443C-A71E-0B197398F560")]
    4545
    4646// Version information for an assembly consists of the following four values:
Note: See TracChangeset for help on using the changeset viewer.