Changeset 5264 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4

Timestamp:

01/10/11 09:25:15 (14 years ago)

Author:

ascheibe

Message:

#1233 switch to .NET 4

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4

Files:

• HeuristicLab.Services.Hive.DataAccess-3.4.csproj (modified) (1 diff)
• HiveDataContext.designer.cs (modified) (6 diffs)
• app.config (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HeuristicLab.Services.Hive.DataAccess-3.4.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.Services.Hive.DataAccess</RootNamespace>
     <AssemblyName>HeuristicLab.Services.Hive.DataAccess-3.4</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.designer.cs

@@ -695 +695 @@
     private EntitySet<AssignedResource> _AssignedResources;
     
+    private EntitySet<Resource> _ChildResources;
+    
     private EntitySet<UptimeCalendar> _UptimeCalendars;
-    
-    private EntitySet<Resource> _ChildResources;
     
     private EntityRef<Resource> _ParentResource;
@@ -718 +718 @@
     {
       this._AssignedResources = new EntitySet<AssignedResource>(new Action<AssignedResource>(this.attach_AssignedResources), new Action<AssignedResource>(this.detach_AssignedResources));
+      this._ChildResources = new EntitySet<Resource>(new Action<Resource>(this.attach_ChildResources), new Action<Resource>(this.detach_ChildResources));
       this._UptimeCalendars = new EntitySet<UptimeCalendar>(new Action<UptimeCalendar>(this.attach_UptimeCalendars), new Action<UptimeCalendar>(this.detach_UptimeCalendars));
-      this._ChildResources = new EntitySet<Resource>(new Action<Resource>(this.attach_ChildResources), new Action<Resource>(this.detach_ChildResources));
       this._ParentResource = default(EntityRef<Resource>);
       OnCreated();
@@ -821 +821 @@
     }
     
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_Resource", Storage="_ChildResources", ThisKey="ResourceId", OtherKey="ParentResourceId")]
+    public EntitySet<Resource> ChildResources
+    {
+      get
+      {
+        return this._ChildResources;
+      }
+      set
+      {
+        this._ChildResources.Assign(value);
+      }
+    }
+    
     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_UptimeCalendar", Storage="_UptimeCalendars", ThisKey="ResourceId", OtherKey="ResourceId")]
     public EntitySet<UptimeCalendar> UptimeCalendars
@@ -831 +844 @@
       {
         this._UptimeCalendars.Assign(value);
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_Resource", Storage="_ChildResources", ThisKey="ResourceId", OtherKey="ParentResourceId")]
-    public EntitySet<Resource> ChildResources
-    {
-      get
-      {
-        return this._ChildResources;
-      }
-      set
-      {
-        this._ChildResources.Assign(value);
       }
     }
@@ -913 +913 @@
     }
     
+    private void attach_ChildResources(Resource entity)
+    {
+      this.SendPropertyChanging();
+      entity.ParentResource = this;
+    }
+    
+    private void detach_ChildResources(Resource entity)
+    {
+      this.SendPropertyChanging();
+      entity.ParentResource = null;
+    }
+    
     private void attach_UptimeCalendars(UptimeCalendar entity)
     {
@@ -923 +935 @@
       this.SendPropertyChanging();
       entity.Resource = null;
-    }
-    
-    private void attach_ChildResources(Resource entity)
-    {
-      this.SendPropertyChanging();
-      entity.ParentResource = this;
-    }
-    
-    private void detach_ChildResources(Resource entity)
-    {
-      this.SendPropertyChanging();
-      entity.ParentResource = null;
     }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/app.config

@@ -1 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
   <configSections>
   </configSections>
   <connectionStrings>
-    <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString"
-      connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;"
-      providerName="System.Data.SqlClient" />
+    <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;" providerName="System.Data.SqlClient"/>
   </connectionStrings>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>