Ignore:
Timestamp:
02/05/15 17:37:03 (5 years ago)
Author:
ascheibe
Message:

#2280 merged r11623, r11631, r11634 into stable

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj

    r8600 r11920  
    1313    <ProjectTypeGuids>{3D9AD99F-2412-4246-B90B-4EAA41C64699};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    1414    <StartArguments>/client:"WcfTestClient.exe"</StartArguments>
    15     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     15    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1616    <TargetFrameworkProfile>
    1717    </TargetFrameworkProfile>
     
    2626    <WarningLevel>4</WarningLevel>
    2727    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     28    <Prefer32Bit>false</Prefer32Bit>
    2829  </PropertyGroup>
    2930  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3738    </DocumentationFile>
    3839    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     40    <Prefer32Bit>false</Prefer32Bit>
    3941  </PropertyGroup>
    4042  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    99101    <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    100102    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     103    <Prefer32Bit>false</Prefer32Bit>
    101104  </PropertyGroup>
    102105  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     
    116119    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
    117120    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
     121    <Prefer32Bit>false</Prefer32Bit>
    118122  </PropertyGroup>
    119123  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     
    132136    <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    133137    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     138    <Prefer32Bit>false</Prefer32Bit>
    134139  </PropertyGroup>
    135140  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     
    148153    <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    149154    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     155    <Prefer32Bit>false</Prefer32Bit>
    150156  </PropertyGroup>
    151157  <ItemGroup>
     
    337343  </ProjectExtensions>
    338344  <PropertyGroup>
    339    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     345    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    340346set ProjectDir=$(ProjectDir)
    341347set SolutionDir=$(SolutionDir)
     
    343349
    344350call PreBuildEvent.cmd</PreBuildEvent>
    345 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     351    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    346352export ProjectDir=$(ProjectDir)
    347353export SolutionDir=$(SolutionDir)
  • stable/HeuristicLab.Services.OKB/3.3/app.config

    r8049 r11920  
    22<configuration>
    33  <connectionStrings>
    4     <add name="HeuristicLab.Authentication"
    5          connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
    6     <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString"
    7          connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" />
     4    <add name="HeuristicLab.Authentication" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
     5    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"/>
    86  </connectionStrings>
    97
    108  <system.web>
    11     <compilation debug="true" />
     9    <compilation debug="true"/>
    1210    <membership>
    1311      <providers>
    14         <clear />
    15         <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication"
    16              enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false"
    17              maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10"
    18              applicationName="HeuristicLab.Authentication" />
     12        <clear/>
     13        <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"/>
    1914      </providers>
    2015    </membership>
    2116    <roleManager enabled="true">
    2217      <providers>
    23         <clear />
    24         <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication"
    25              applicationName="HeuristicLab.Authentication" />
     18        <clear/>
     19        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication"/>
    2620      </providers>
    2721    </roleManager>
     
    3125    <bindings>
    3226      <mexHttpBinding>
    33         <binding name="DefaultMexHttpBinding" />
     27        <binding name="DefaultMexHttpBinding"/>
    3428      </mexHttpBinding>
    3529      <wsHttpBinding>
    3630        <binding name="DefaultWsHttpBinding" maxReceivedMessageSize="200000000">
    37           <readerQuotas maxArrayLength="200000000" maxBytesPerRead="200000000" />
     31          <readerQuotas maxArrayLength="200000000" maxBytesPerRead="200000000"/>
    3832          <security mode="Message">
    39             <message clientCredentialType="UserName" />
     33            <message clientCredentialType="UserName"/>
    4034          </security>
    4135        </binding>
     
    4640      <serviceBehaviors>
    4741        <behavior name="DefaultServiceBehavior">
    48           <serviceMetadata httpGetEnabled="true" />
    49           <serviceDebug includeExceptionDetailInFaults="true" />
    50           <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider" />
     42          <serviceMetadata httpGetEnabled="true"/>
     43          <serviceDebug includeExceptionDetailInFaults="true"/>
     44          <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider"/>
    5145          <serviceCredentials>
    52             <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
    53             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider" />
     46            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName"/>
     47            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider"/>
    5448          </serviceCredentials>
    55           <dataContractSerializer maxItemsInObjectGraph="6553600" />
     49          <dataContractSerializer maxItemsInObjectGraph="6553600"/>
    5650        </behavior>
    5751      </serviceBehaviors>
     
    6054    <services>     
    6155      <service behaviorConfiguration="DefaultServiceBehavior" name="HeuristicLab.Services.OKB.Administration.AdministrationService">
    62         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding"
    63           contract="IMetadataExchange" />
    64         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
    65           contract="HeuristicLab.Services.OKB.Administration.IAdministrationService" />
     56        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange"/>
     57        <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.OKB.Administration.IAdministrationService"/>
    6658        <host>
    6759          <baseAddresses>
    68             <add baseAddress="http://localhost:8732/Design_Time_Addresses/OKB-3.3/AdministrationService" />
     60            <add baseAddress="http://localhost:8732/Design_Time_Addresses/OKB-3.3/AdministrationService"/>
    6961          </baseAddresses>
    7062        </host>
    7163      </service>
    7264      <service behaviorConfiguration="DefaultServiceBehavior" name="HeuristicLab.Services.OKB.RunCreation.RunCreationService">
    73         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding"
    74           contract="IMetadataExchange" />
    75         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
    76           contract="HeuristicLab.Services.OKB.RunCreation.IRunCreationService" />
     65        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange"/>
     66        <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.OKB.RunCreation.IRunCreationService"/>
    7767        <host>
    7868          <baseAddresses>
    79             <add baseAddress="http://localhost:8732/Design_Time_Addresses/OKB-3.3/RunCreationService" />
     69            <add baseAddress="http://localhost:8732/Design_Time_Addresses/OKB-3.3/RunCreationService"/>
    8070          </baseAddresses>
    8171        </host>
    8272      </service>
    8373      <service behaviorConfiguration="DefaultServiceBehavior" name="HeuristicLab.Services.OKB.Query.QueryService">
    84         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding"
    85           contract="IMetadataExchange" />
    86         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
    87           contract="HeuristicLab.Services.OKB.Query.IQueryService" />
     74        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange"/>
     75        <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.OKB.Query.IQueryService"/>
    8876        <host>
    8977          <baseAddresses>
    90             <add baseAddress="http://localhost:8732/Design_Time_Addresses/OKB-3.3/QueryService" />
     78            <add baseAddress="http://localhost:8732/Design_Time_Addresses/OKB-3.3/QueryService"/>
    9179          </baseAddresses>
    9280        </host>
     
    9583  </system.serviceModel>
    9684  <startup>
    97     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
     85    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
    9886  </startup>
    9987</configuration>
Note: See TracChangeset for help on using the changeset viewer.