Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/10/14 10:31:41 (10 years ago)
Author:
pfleck
Message:

#2269 Merged trunk. Updated .net version of ALPS plugin.

Location:
branches/ALPS
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • branches/ALPS

  • branches/ALPS/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj

    r8600 r11677  
    1111    <RootNamespace>HeuristicLab.Clients.Hive.SlaveCore</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Clients.Hive.SlaveCore-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />
    … …  
    2424    <WarningLevel>4</WarningLevel>
    2525    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     26    <Prefer32Bit>false</Prefer32Bit>
    2627  </PropertyGroup>
    2728  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    3536    </DocumentationFile>
    3637    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     38    <Prefer32Bit>false</Prefer32Bit>
    3739  </PropertyGroup>
    3840  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    … …  
    4446    <ErrorReport>prompt</ErrorReport>
    4547    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     48    <Prefer32Bit>false</Prefer32Bit>
    4649  </PropertyGroup>
    4750  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    … …  
    5558    <ErrorReport>prompt</ErrorReport>
    5659    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     60    <Prefer32Bit>false</Prefer32Bit>
    5761  </PropertyGroup>
    5862  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    … …  
    6468    <ErrorReport>prompt</ErrorReport>
    6569    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     70    <Prefer32Bit>false</Prefer32Bit>
    6671  </PropertyGroup>
    6772  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    … …  
    7580    <ErrorReport>prompt</ErrorReport>
    7681    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     82    <Prefer32Bit>false</Prefer32Bit>
    7783  </PropertyGroup>
    7884  <PropertyGroup>
    … …  
    177183    <None Include="HeuristicLab.snk" />
    178184  </ItemGroup>
    179   <ItemGroup>
    180     <Content Include="ICSharpCode.SharpZipLib License.txt">
    181       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    182     </Content>
    183   </ItemGroup>
    184185  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    185186  <PropertyGroup>
    … …  
    188189  </PropertyGroup>
    189190  <PropertyGroup>
    190    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     191    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    191192set ProjectDir=$(ProjectDir)
    192193set SolutionDir=$(SolutionDir)
    … …  
    194195
    195196call PreBuildEvent.cmd</PreBuildEvent>
    196 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     197    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    197198export ProjectDir=$(ProjectDir)
    198199export SolutionDir=$(SolutionDir)

  • branches/ALPS/HeuristicLab.Clients.Hive.Slave/3.3/Manager/PluginManager.cs

    r11171 r11677  
    113113      string baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
    114114      CopyFile(baseDir, targetDir, CoreProperties.Settings.Default.PluginInfrastructureDll);
    115       CopyFile(baseDir, targetDir, CoreProperties.Settings.Default.SharpZipLibDll);
    116       CopyFile(baseDir, targetDir, CoreProperties.Settings.Default.SharpZipLibLicense);
    117115
    118116      // copy slave plugins, otherwise its not possible to register the UnhandledException handler to the appdomain       

  • branches/ALPS/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs

    r9666 r11677  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.18047
     4//     Runtime Version:4.0.30319.34014
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    1313   
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
    1616    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    1717       
    … …  
    8686        [global::System.Configuration.UserScopedSettingAttribute()]
    8787        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    88         [global::System.Configuration.DefaultSettingValueAttribute("ICSharpCode.SharpZipLib.dll")]
    89         public string SharpZipLibDll {
    90             get {
    91                 return ((string)(this["SharpZipLibDll"]));
    92             }
    93             set {
    94                 this["SharpZipLibDll"] = value;
    95             }
    96         }
    97        
    98         [global::System.Configuration.UserScopedSettingAttribute()]
    99         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    100         [global::System.Configuration.DefaultSettingValueAttribute("ICSharpCode.SharpZipLib License.txt")]
    101         public string SharpZipLibLicense {
    102             get {
    103                 return ((string)(this["SharpZipLibLicense"]));
    104             }
    105             set {
    106                 this["SharpZipLibLicense"] = value;
    107             }
    108         }
    109        
    110         [global::System.Configuration.UserScopedSettingAttribute()]
    111         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    11288        [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Clients.Hive.SlaveCore-3.3.dll")]
    11389        public string ClientsHiveSlaveCoreDll {

  • branches/ALPS/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings

    r9666 r11677  
    1717    <Setting Name="PluginInfrastructureDll" Type="System.String" Scope="User">
    1818      <Value Profile="(Default)">HeuristicLab.PluginInfrastructure-3.3.dll</Value>
    19     </Setting>
    20     <Setting Name="SharpZipLibDll" Type="System.String" Scope="User">
    21       <Value Profile="(Default)">ICSharpCode.SharpZipLib.dll</Value>
    22     </Setting>
    23     <Setting Name="SharpZipLibLicense" Type="System.String" Scope="User">
    24       <Value Profile="(Default)">ICSharpCode.SharpZipLib License.txt</Value>
    2519    </Setting>
    2620    <Setting Name="ClientsHiveSlaveCoreDll" Type="System.String" Scope="User">

  • branches/ALPS/HeuristicLab.Clients.Hive.Slave/3.3/app.config

    r10010 r11677  
    22<configuration>
    33  <configSections>
    4     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5       <section name="HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
    6       <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     4    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     5      <section name="HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     6      <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
    77    </sectionGroup>
    88  </configSections>
    99  <runtime>
    10     <gcServer enabled="true" />
     10    <gcServer enabled="true"/>
    1111  </runtime>
    1212
    1313  <startup>
    14     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
     14    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
    1515  </startup>
    1616 
    … …  
    2626      <wsHttpBinding>
    2727        <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:35:00" sendTimeout="00:35:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
    28           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    29           <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
     28          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
     29          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
    3030          <security mode="Message">
    31             <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
    32             <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default" />
     31            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
     32            <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/>
    3333          </security>
    3434        </binding>
    … …  
    3636      <netTcpBinding>
    3737        <binding name="netTcpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:35:00" sendTimeout="00:35:00" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
    38           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    39           <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
     38          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
     39          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
    4040          <security mode="TransportWithMessageCredential">
    41             <transport clientCredentialType="Windows" />
    42             <message clientCredentialType="UserName" algorithmSuite="Default" />
     41            <transport clientCredentialType="Windows"/>
     42            <message clientCredentialType="UserName" algorithmSuite="Default"/>
    4343          </security>
    4444        </binding>
    … …  
    5959      <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
    6060        <identity>
    61           <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ==" />
     61          <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>
    6262        </identity>
    6363      </endpoint>
    … …  
    8080      <setting name="PluginInfrastructureDll" serializeAs="String">
    8181        <value>HeuristicLab.PluginInfrastructure-3.3.dll</value>
    82       </setting>
    83       <setting name="SharpZipLibDll" serializeAs="String">
    84         <value>ICSharpCode.SharpZipLib.dll</value>
    85       </setting>
    86       <setting name="SharpZipLibLicense" serializeAs="String">
    87         <value>ICSharpCode.SharpZipLib License.txt</value>
    8882      </setting>
    8983      <setting name="ClientsHiveSlaveCoreDll" serializeAs="String">
    … …  
    163157      <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
    164158        <value>
    165           <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    166             xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     159          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
    167160            <string>netTcpBinding_IHiveService</string>
    168161            <string>wsHttpBinding_IHiveService</string>
Note: See TracChangeset for help on using the changeset viewer.