Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/20/15 16:41:14 (9 years ago)
Author:
dglaser
Message:

#2388 merged trunk into hive statistics branch

Location:
branches/HiveStatistics/sources
Files:
7 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources

  • branches/HiveStatistics/sources/HeuristicLab.Common.Resources/3.3/HeuristicLab.Common.Resources-3.3.csproj

    r9079 r12395  
    1111    <RootNamespace>HeuristicLab.Common.Resources</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Common.Resources-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
    … …  
    4646    <WarningLevel>4</WarningLevel>
    4747    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     48    <Prefer32Bit>false</Prefer32Bit>
    4849  </PropertyGroup>
    4950  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    5556    <WarningLevel>4</WarningLevel>
    5657    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     58    <Prefer32Bit>false</Prefer32Bit>
    5759  </PropertyGroup>
    5860  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    … …  
    6466    <ErrorReport>prompt</ErrorReport>
    6567    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     68    <Prefer32Bit>false</Prefer32Bit>
    6669  </PropertyGroup>
    6770  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    … …  
    7376    <ErrorReport>prompt</ErrorReport>
    7477    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     78    <Prefer32Bit>false</Prefer32Bit>
    7579  </PropertyGroup>
    7680  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    … …  
    8286    <ErrorReport>prompt</ErrorReport>
    8387    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     88    <Prefer32Bit>false</Prefer32Bit>
    8489  </PropertyGroup>
    8590  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    … …  
    9196    <ErrorReport>prompt</ErrorReport>
    9297    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     98    <Prefer32Bit>false</Prefer32Bit>
    9399  </PropertyGroup>
    94100  <ItemGroup>
    … …  
    438444    <None Include="Resources\VS2010ImageLibrary\VS2010ImageLibrary_Objects_Monitor_Large.png" />
    439445    <None Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_DisplayInColor_Vertical.png" />
     446    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Annotations_Default.png" />
    440447    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Paused.png" />
    441448    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Prepared.png" />

  • branches/HiveStatistics/sources/HeuristicLab.Common.Resources/3.3/HeuristicLab.Designer.cs

    r4068 r12395  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.1
     4//     Runtime Version:4.0.30319.34014
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    1010
    1111namespace HeuristicLab.Common.Resources {
    12 
    13 
    14   /// <summary>
    15   ///   A strongly-typed resource class, for looking up localized strings, etc.
    16   /// </summary>
    17   // This class was auto-generated by the StronglyTypedResourceBuilder
    18   // class via a tool like ResGen or Visual Studio.
    19   // To add or remove a member, edit your .ResX file then rerun ResGen
    20   // with the /str option, or rebuild your VS project.
    21   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    22   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    23   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    24   public class HeuristicLab {
    25 
    26     private static global::System.Resources.ResourceManager resourceMan;
    27 
    28     private static global::System.Globalization.CultureInfo resourceCulture;
    29 
    30     [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
    31     internal HeuristicLab() {
     12    using System;
     13   
     14   
     15    /// <summary>
     16    ///   A strongly-typed resource class, for looking up localized strings, etc.
     17    /// </summary>
     18    // This class was auto-generated by the StronglyTypedResourceBuilder
     19    // class via a tool like ResGen or Visual Studio.
     20    // To add or remove a member, edit your .ResX file then rerun ResGen
     21    // with the /str option, or rebuild your VS project.
     22    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     23    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     24    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     25    public class HeuristicLab {
     26       
     27        private static global::System.Resources.ResourceManager resourceMan;
     28       
     29        private static global::System.Globalization.CultureInfo resourceCulture;
     30       
     31        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
     32        internal HeuristicLab() {
     33        }
     34       
     35        /// <summary>
     36        ///   Returns the cached ResourceManager instance used by this class.
     37        /// </summary>
     38        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
     39        public static global::System.Resources.ResourceManager ResourceManager {
     40            get {
     41                if (object.ReferenceEquals(resourceMan, null)) {
     42                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab.Common.Resources.HeuristicLab", typeof(HeuristicLab).Assembly);
     43                    resourceMan = temp;
     44                }
     45                return resourceMan;
     46            }
     47        }
     48       
     49        /// <summary>
     50        ///   Overrides the current thread's CurrentUICulture property for all
     51        ///   resource lookups using this strongly typed resource class.
     52        /// </summary>
     53        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
     54        public static global::System.Globalization.CultureInfo Culture {
     55            get {
     56                return resourceCulture;
     57            }
     58            set {
     59                resourceCulture = value;
     60            }
     61        }
     62       
     63        /// <summary>
     64        ///   Looks up a localized resource of type System.Drawing.Bitmap.
     65        /// </summary>
     66        public static System.Drawing.Bitmap HeuristicLabBanner {
     67            get {
     68                object obj = ResourceManager.GetObject("HeuristicLabBanner", resourceCulture);
     69                return ((System.Drawing.Bitmap)(obj));
     70            }
     71        }
     72       
     73        /// <summary>
     74        ///   Looks up a localized resource of type System.Drawing.Bitmap.
     75        /// </summary>
     76        public static System.Drawing.Bitmap HeuristicLabLogo {
     77            get {
     78                object obj = ResourceManager.GetObject("HeuristicLabLogo", resourceCulture);
     79                return ((System.Drawing.Bitmap)(obj));
     80            }
     81        }
     82       
     83        /// <summary>
     84        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
     85        /// </summary>
     86        public static System.Drawing.Icon Icon {
     87            get {
     88                object obj = ResourceManager.GetObject("Icon", resourceCulture);
     89                return ((System.Drawing.Icon)(obj));
     90            }
     91        }
    3292    }
    33 
    34     /// <summary>
    35     ///   Returns the cached ResourceManager instance used by this class.
    36     /// </summary>
    37     [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
    38     public static global::System.Resources.ResourceManager ResourceManager {
    39       get {
    40         if (object.ReferenceEquals(resourceMan, null)) {
    41           global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab.Common.Resources.HeuristicLab", typeof(HeuristicLab).Assembly);
    42           resourceMan = temp;
    43         }
    44         return resourceMan;
    45       }
    46     }
    47 
    48     /// <summary>
    49     ///   Overrides the current thread's CurrentUICulture property for all
    50     ///   resource lookups using this strongly typed resource class.
    51     /// </summary>
    52     [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
    53     public static global::System.Globalization.CultureInfo Culture {
    54       get {
    55         return resourceCulture;
    56       }
    57       set {
    58         resourceCulture = value;
    59       }
    60     }
    61 
    62     public static System.Drawing.Bitmap HeuristicLabBanner {
    63       get {
    64         object obj = ResourceManager.GetObject("HeuristicLabBanner", resourceCulture);
    65         return ((System.Drawing.Bitmap)(obj));
    66       }
    67     }
    68 
    69     public static System.Drawing.Bitmap HeuristicLabLogo {
    70       get {
    71         object obj = ResourceManager.GetObject("HeuristicLabLogo", resourceCulture);
    72         return ((System.Drawing.Bitmap)(obj));
    73       }
    74     }
    75 
    76     public static System.Drawing.Icon Icon {
    77       get {
    78         object obj = ResourceManager.GetObject("Icon", resourceCulture);
    79         return ((System.Drawing.Icon)(obj));
    80       }
    81     }
    82   }
    8393}

  • branches/HiveStatistics/sources/HeuristicLab.Common.Resources/3.3/Plugin.cs.frame

    r11205 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626
    2727namespace HeuristicLab.Common.Resources {
    28   [Plugin("HeuristicLab.Common.Resources", "3.3.10.$WCREV$")]
     28  [Plugin("HeuristicLab.Common.Resources", "3.3.11.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Common.Resources-3.3.dll", PluginFileType.Assembly)]
    3030  public class HeuristicLabCommonResourcesPlugin : PluginBase {

  • branches/HiveStatistics/sources/HeuristicLab.Common.Resources/3.3/Properties/AssemblyInfo.cs.frame

    r11205 r12395  
    1111[assembly: AssemblyCompany("")]
    1212[assembly: AssemblyProduct("HeuristicLab")]
    13 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
     13[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
    1414[assembly: AssemblyTrademark("")]
    1515[assembly: AssemblyCulture("")]
    … …  
    3131//
    3232[assembly: AssemblyVersion("3.3.0.0")]
    33 [assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
     33[assembly: AssemblyFileVersion("3.3.11.$WCREV$")]

  • branches/HiveStatistics/sources/HeuristicLab.Common.Resources/3.3/VSImageLibrary.Designer.cs

    r9079 r12395  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.17929
     4//     Runtime Version:4.0.30319.34014
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    324324        ///   Looks up a localized resource of type System.Drawing.Bitmap.
    325325        /// </summary>
     326        public static System.Drawing.Bitmap Default {
     327            get {
     328                object obj = ResourceManager.GetObject("Default", resourceCulture);
     329                return ((System.Drawing.Bitmap)(obj));
     330            }
     331        }
     332       
     333        /// <summary>
     334        ///   Looks up a localized resource of type System.Drawing.Bitmap.
     335        /// </summary>
    326336        public static System.Drawing.Bitmap Delegate {
    327337            get {

  • branches/HiveStatistics/sources/HeuristicLab.Common.Resources/3.3/VSImageLibrary.resx

    r9079 r12395  
    524524    <value>Resources\VS2010ImageLibrary\camera.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    525525  </data>
     526  <data name="Default" type="System.Resources.ResXFileRef, System.Windows.Forms">
     527    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Annotations_Default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     528  </data>
    526529</root>
Note: See TracChangeset for help on using the changeset viewer.