Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5264


Ignore:
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
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/HeuristicLab.Clients.Hive.Slave.Views-3.4.csproj

    r5043 r5264  
    1111    <RootNamespace>HeuristicLab.Clients.Hive.Slave.Views</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Clients.Hive.Slave.Views-3.4</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <TargetFrameworkProfile />
    1516  </PropertyGroup>
    1617  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj

    r5156 r5264  
    1111    <RootNamespace>HeuristicLab.Clients.Hive.Slave</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Clients.Hive.Slave-3.4</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <TargetFrameworkProfile />
    1516  </PropertyGroup>
    1617  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app.config

    r5156 r5264  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0"?>
    22<configuration>
    33    <configSections>
    4         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5             <section name="HeuristicLab.Clients.Hive.Slave.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     4        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     5            <section name="HeuristicLab.Clients.Hive.Slave.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
    66        </sectionGroup>
    77    </configSections>
    … …  
    1717    <services>
    1818      <service name="HeuristicLab.Clients.Hive.Slave.SlaveCommunicationService">       
    19         <endpoint address="net.pipe://localhost/HeuristicLabSlaveCom"
    20                   binding="netNamedPipeBinding"
    21                   contract="HeuristicLab.Clients.Hive.Slave.ServiceContracts.ISlaveCommunication"                 
    22                    />
     19        <endpoint address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.Slave.ServiceContracts.ISlaveCommunication"/>
    2320      </service>
    2421    </services>
    2522  </system.serviceModel>
    2623
    27 </configuration>
     24<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/HeuristicLab.Clients.Hive.Views-3.4.csproj

    r5043 r5264  
    1111    <RootNamespace>HeuristicLab.Clients.Hive.Views</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Clients.Hive.Views-3.4</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <TargetFrameworkProfile />
    1516  </PropertyGroup>
    1617  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

    r5062 r5264  
    1111    <RootNamespace>HeuristicLab.Clients.Hive</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Clients.Hive-3.4</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <TargetFrameworkProfile />
    1516  </PropertyGroup>
    1617  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/app.config

    r5078 r5264  
    1 <?xml version="1.0" encoding="utf-8"?>
     1<?xml version="1.0"?>
    22<configuration>
    33    <system.serviceModel>
    … …  
    2222        </client>
    2323    </system.serviceModel>
    24 </configuration>
     24<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln

    r5156 r5264  
    187187    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|x86.ActiveCfg = Debug|x86
    188188    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|x86.Build.0 = Debug|x86
    189     {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|Any CPU.ActiveCfg = Release|x86
     189    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|Any CPU.ActiveCfg = Release|Any CPU
     190    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|Any CPU.Build.0 = Release|Any CPU
    190191    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|Mixed Platforms.ActiveCfg = Release|x86
    191192    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|Mixed Platforms.Build.0 = Release|x86

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive/3.4/HeuristicLab.Hive-3.4.csproj

    r5043 r5264  
    1111    <RootNamespace>HeuristicLab.Hive</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Hive-3.4</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/HeuristicLab.Services.Hive.Common-3.4.csproj

    r5106 r5264  
    1111    <RootNamespace>HeuristicLab.Services.Hive.Common</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Services.Hive.Common-3.4</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <TargetFrameworkProfile />
    1516  </PropertyGroup>
    1617  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

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

    r5106 r5264  
    1111    <RootNamespace>HeuristicLab.Services.Hive.DataAccess</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Services.Hive.DataAccess-3.4</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <TargetFrameworkProfile />
    1516  </PropertyGroup>
    1617  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

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

    r5106 r5264  
    695695    private EntitySet<AssignedResource> _AssignedResources;
    696696   
     697    private EntitySet<Resource> _ChildResources;
     698   
    697699    private EntitySet<UptimeCalendar> _UptimeCalendars;
    698    
    699     private EntitySet<Resource> _ChildResources;
    700700   
    701701    private EntityRef<Resource> _ParentResource;
    … …  
    718718    {
    719719      this._AssignedResources = new EntitySet<AssignedResource>(new Action<AssignedResource>(this.attach_AssignedResources), new Action<AssignedResource>(this.detach_AssignedResources));
     720      this._ChildResources = new EntitySet<Resource>(new Action<Resource>(this.attach_ChildResources), new Action<Resource>(this.detach_ChildResources));
    720721      this._UptimeCalendars = new EntitySet<UptimeCalendar>(new Action<UptimeCalendar>(this.attach_UptimeCalendars), new Action<UptimeCalendar>(this.detach_UptimeCalendars));
    721       this._ChildResources = new EntitySet<Resource>(new Action<Resource>(this.attach_ChildResources), new Action<Resource>(this.detach_ChildResources));
    722722      this._ParentResource = default(EntityRef<Resource>);
    723723      OnCreated();
    … …  
    821821    }
    822822   
     823    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_Resource", Storage="_ChildResources", ThisKey="ResourceId", OtherKey="ParentResourceId")]
     824    public EntitySet<Resource> ChildResources
     825    {
     826      get
     827      {
     828        return this._ChildResources;
     829      }
     830      set
     831      {
     832        this._ChildResources.Assign(value);
     833      }
     834    }
     835   
    823836    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_UptimeCalendar", Storage="_UptimeCalendars", ThisKey="ResourceId", OtherKey="ResourceId")]
    824837    public EntitySet<UptimeCalendar> UptimeCalendars
    … …  
    831844      {
    832845        this._UptimeCalendars.Assign(value);
    833       }
    834     }
    835    
    836     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_Resource", Storage="_ChildResources", ThisKey="ResourceId", OtherKey="ParentResourceId")]
    837     public EntitySet<Resource> ChildResources
    838     {
    839       get
    840       {
    841         return this._ChildResources;
    842       }
    843       set
    844       {
    845         this._ChildResources.Assign(value);
    846846      }
    847847    }
    … …  
    913913    }
    914914   
     915    private void attach_ChildResources(Resource entity)
     916    {
     917      this.SendPropertyChanging();
     918      entity.ParentResource = this;
     919    }
     920   
     921    private void detach_ChildResources(Resource entity)
     922    {
     923      this.SendPropertyChanging();
     924      entity.ParentResource = null;
     925    }
     926   
    915927    private void attach_UptimeCalendars(UptimeCalendar entity)
    916928    {
    … …  
    923935      this.SendPropertyChanging();
    924936      entity.Resource = null;
    925     }
    926    
    927     private void attach_ChildResources(Resource entity)
    928     {
    929       this.SendPropertyChanging();
    930       entity.ParentResource = this;
    931     }
    932    
    933     private void detach_ChildResources(Resource entity)
    934     {
    935       this.SendPropertyChanging();
    936       entity.ParentResource = null;
    937937    }
    938938  }

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

    r5106 r5264  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0"?>
    22<configuration>
    33  <configSections>
    44  </configSections>
    55  <connectionStrings>
    6     <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString"
    7       connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;"
    8       providerName="System.Data.SqlClient" />
     6    <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"/>
    97  </connectionStrings>
    10 </configuration>
     8<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/AuthorizationManager.cs

    r5028 r5264  
    4040      }
    4141    }
    42    
     42
    4343    private bool IsAuthorizedForJobs(params Guid[] jobIds) {
    4444      return ServiceLocator.Instance.HiveDao.IsUserAuthorizedForJobs(UserId, jobIds);

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

    r5095 r5264  
    1212    <AssemblyName>HeuristicLab.Services.Hive-3.4</AssemblyName>
    1313    <ProjectTypeGuids>{3D9AD99F-2412-4246-B90B-4EAA41C64699};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    14     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     14    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1515    <FileAlignment>512</FileAlignment>
     16    <TargetFrameworkProfile />
    1617  </PropertyGroup>
    1718  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    6970    <Reference Include="System.Transactions" />
    7071    <Reference Include="System.Web" />
     72    <Reference Include="System.Web.ApplicationServices" />
    7173    <Reference Include="System.Windows.Forms" />
    7274    <Reference Include="System.Xml.Linq" />

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

    r5095 r5264  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0"?>
    22<configuration>
    3   <system.diagnostics />
     3  <system.diagnostics/>
    44  <connectionStrings>
    55    <add name="HeuristicLab.Authentication" connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
    … …  
    1010      <providers>
    1111        <clear/>
    12         <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication"
    13              enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false"
    14              maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10"
    15              applicationName="HeuristicLab.Authentication" />
     12        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="HeuristicLab.Authentication"/>
    1613      </providers>
    1714    </membership>
    … …  
    2017      <providers>
    2118        <clear/>
    22         <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication" />
     19        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication"/>
    2320      </providers>
    2421    </roleManager>
    … …  
    2724  <system.serviceModel>
    2825    <diagnostics>
    29       <messageLogging logEntireMessage="true" logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true" maxMessagesToLog="3000" />
     26      <messageLogging logEntireMessage="true" logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true" maxMessagesToLog="3000"/>
    3027    </diagnostics>
    3128    <bindings>
    3229      <wsHttpBinding>
    33         <binding name="WSHttpBinding_IHiveService" receiveTimeout="00:10:00"
    34           sendTimeout="00:10:00" maxBufferPoolSize="104857600" maxReceivedMessageSize="104857600">
    35           <readerQuotas maxStringContentLength="104857600" maxArrayLength="104857600" />
     30        <binding name="WSHttpBinding_IHiveService" receiveTimeout="00:10:00" sendTimeout="00:10:00" maxBufferPoolSize="104857600" maxReceivedMessageSize="104857600">
     31          <readerQuotas maxStringContentLength="104857600" maxArrayLength="104857600"/>
    3632          <security mode="Message">
    3733            <transport clientCredentialType="Certificate"/>
    38             <message clientCredentialType="UserName" />
     34            <message clientCredentialType="UserName"/>
    3935          </security>
    4036        </binding>
    … …  
    4440      <serviceBehaviors>
    4541        <behavior name="ServiceBehaviour_IHiveService">
    46           <serviceMetadata httpGetEnabled="true" httpsGetEnabled="false" />
    47           <serviceDebug httpHelpPageEnabled="true" includeExceptionDetailInFaults="true" />
    48           <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider" />
     42          <serviceMetadata httpGetEnabled="true" httpsGetEnabled="false"/>
     43          <serviceDebug httpHelpPageEnabled="true" includeExceptionDetailInFaults="true"/>
     44          <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider"/>
    4945          <serviceCredentials>
    50             <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
    51             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider" />
     46            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName"/>
     47            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider"/>
    5248          </serviceCredentials>
    53           <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false" messageAuthenticationAuditLevel="SuccessOrFailure" />
    54           <serviceThrottling maxConcurrentCalls="100" />
     49          <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false" messageAuthenticationAuditLevel="SuccessOrFailure"/>
     50          <serviceThrottling maxConcurrentCalls="100"/>
    5551        </behavior>
    5652      </serviceBehaviors>
    … …  
    5854    <services>
    5955      <service behaviorConfiguration="ServiceBehaviour_IHiveService" name="HeuristicLab.Services.Hive.HiveService">
    60         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="MexEndpoint" contract="IMetadataExchange" />
    61         <endpoint binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.Common.ServiceContracts.IHiveService" />
     56        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="MexEndpoint" contract="IMetadataExchange"/>
     57        <endpoint binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.Common.ServiceContracts.IHiveService"/>
    6258        <host>
    6359          <baseAddresses>
    64             <add baseAddress="http://localhost:9000/Hive-3.4" />
     60            <add baseAddress="http://localhost:9000/Hive-3.4"/>
    6561          </baseAddresses>
    6662        </host>
    … …  
    7066  </system.serviceModel>
    7167
    72 </configuration>
     68<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
Note: See TracChangeset for help on using the changeset viewer.