Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/23/10 00:07:58 (14 years ago)
Author:
swagner
Message:

Reintegrated .NET 4.0 migration branch (#1350)

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/sources

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

    r4920 r5163  
    1111    <RootNamespace>HeuristicLab</RootNamespace>
    1212    <AssemblyName>HeuristicLab 3.3</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <SignAssembly>true</SignAssembly>
     
    3838    <UseApplicationTrust>false</UseApplicationTrust>
    3939    <BootstrapperEnabled>true</BootstrapperEnabled>
     40    <TargetFrameworkProfile></TargetFrameworkProfile>
    4041  </PropertyGroup>
    4142  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • trunk/sources/HeuristicLab/3.3/Properties/Resources.Designer.cs

    r4068 r5163  
    1010
    1111namespace HeuristicLab.Properties {
    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   internal class Resources {
    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 Resources() {
     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    internal class Resources {
     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 Resources() {
     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        internal 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.Properties.Resources", typeof(Resources).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        internal static global::System.Globalization.CultureInfo Culture {
     55            get {
     56                return resourceCulture;
     57            }
     58            set {
     59                resourceCulture = value;
     60            }
     61        }
    3262    }
    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     internal 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.Properties.Resources", typeof(Resources).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     internal static global::System.Globalization.CultureInfo Culture {
    54       get {
    55         return resourceCulture;
    56       }
    57       set {
    58         resourceCulture = value;
    59       }
    60     }
    61   }
    6263}
  • trunk/sources/HeuristicLab/3.3/app.config

    r3837 r5163  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0"?>
    22<configuration>
    33  <configSections>
     
    1414    <DbProviderFactories>
    1515      <remove invariant="System.Data.SQLite"/>
    16       <add name="SQLite Data Provider" invariant="System.Data.SQLite"
    17            description=".Net Framework Data Provider for SQLite"
    18            type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
    19       <remove invariant="System.Data.SqlServerCe.3.5" />
    20       <add name="Microsoft SQL Server Compact Data Provider" invariant="System.Data.SqlServerCe.3.5"
    21            description=".NET Framework Data Provider for Microsoft SQL Server Compact"
    22            type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=3.5.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
     16      <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite"/>
     17      <remove invariant="System.Data.SqlServerCe.3.5"/>
     18      <add name="Microsoft SQL Server Compact Data Provider" invariant="System.Data.SqlServerCe.3.5" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=3.5.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
    2319    </DbProviderFactories>
    2420  </system.data>
     21
     22  <startup>
     23    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
     24  </startup>
    2525</configuration>
Note: See TracChangeset for help on using the changeset viewer.