Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/04/12 16:45:02 (13 years ago)
Author:
spimming
Message:

#1680:

  • merged changes from trunk into branch
Location:
branches/HeuristicLab.Hive.Azure
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive.Azure

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/HeuristicLab.ProtobufCS/Plugin.cs.frame

    r6866 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/HeuristicLab.ProtobufCS/Properties/AssemblyInfo.cs.frame

    r6866 r7270  
    1111[assembly: AssemblyCompany("")]
    1212[assembly: AssemblyProduct("HeuristicLab")]
    13 [assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
     13[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
    1414[assembly: AssemblyTrademark("")]
    1515[assembly: AssemblyCulture("")]

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoGen/ProtoGen.csproj

    r6866 r7270  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>bin\Debug\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     52    <OutputPath>bin\Release\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    5656    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5757  </PropertyGroup>
    58   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight2|AnyCPU' ">
    59     <OutputPath>bin\Silverlight2\</OutputPath>
    60     <DefineConstants>TRACE</DefineConstants>
    61     <Optimize>true</Optimize>
    62     <DebugType>pdbonly</DebugType>
    63     <PlatformTarget>AnyCPU</PlatformTarget>
    64     <ErrorReport>prompt</ErrorReport>
    65     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    66   </PropertyGroup>
    6758  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    6859    <DebugSymbols>true</DebugSymbols>
    69     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     60    <OutputPath>bin\x86\Debug\</OutputPath>
    7061    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7162    <DebugType>full</DebugType>
    7263    <PlatformTarget>x86</PlatformTarget>
    73     <CodeAnalysisLogFile>bin\Debug\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     64    <CodeAnalysisLogFile>bin\x86\Debug\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    7465    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    7566    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    8273  </PropertyGroup>
    8374  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    84     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     75    <OutputPath>bin\x86\Release\</OutputPath>
    8576    <DefineConstants>TRACE</DefineConstants>
    8677    <Optimize>true</Optimize>
    8778    <DebugType>pdbonly</DebugType>
    8879    <PlatformTarget>x86</PlatformTarget>
    89     <CodeAnalysisLogFile>$(SolutionDir)\bin\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    90     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    91     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    92     <ErrorReport>prompt</ErrorReport>
    93     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    94     <CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    95     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
    96     <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    97     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
    98   </PropertyGroup>
    99   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Silverlight2|x86'">
    100     <OutputPath>bin\x86\Silverlight2\</OutputPath>
    101     <DefineConstants>TRACE</DefineConstants>
    102     <Optimize>true</Optimize>
    103     <DebugType>pdbonly</DebugType>
    104     <PlatformTarget>x86</PlatformTarget>
    105     <CodeAnalysisLogFile>bin\Silverlight2\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     80    <CodeAnalysisLogFile>bin\x86\Release\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    10681    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    10782    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    11590  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    11691    <DebugSymbols>true</DebugSymbols>
    117     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     92    <OutputPath>bin\x64\Debug\</OutputPath>
    11893    <DefineConstants>DEBUG;TRACE</DefineConstants>
    11994    <DebugType>full</DebugType>
    12095    <PlatformTarget>x64</PlatformTarget>
    121     <CodeAnalysisLogFile>bin\Debug\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     96    <CodeAnalysisLogFile>bin\x64\Debug\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    12297    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    12398    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    130105  </PropertyGroup>
    131106  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    132     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     107    <OutputPath>bin\x64\Release\</OutputPath>
    133108    <DefineConstants>TRACE</DefineConstants>
    134109    <Optimize>true</Optimize>
    135110    <DebugType>pdbonly</DebugType>
    136111    <PlatformTarget>x64</PlatformTarget>
    137     <CodeAnalysisLogFile>$(SolutionDir)\bin\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    138     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    139     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    140     <ErrorReport>prompt</ErrorReport>
    141     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    142     <CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    143     <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    144   </PropertyGroup>
    145   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Silverlight2|x64'">
    146     <OutputPath>bin\x64\Silverlight2\</OutputPath>
    147     <DefineConstants>TRACE</DefineConstants>
    148     <Optimize>true</Optimize>
    149     <DebugType>pdbonly</DebugType>
    150     <PlatformTarget>x64</PlatformTarget>
    151     <CodeAnalysisLogFile>bin\Silverlight2\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     112    <CodeAnalysisLogFile>bin\x64\Release\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    152113    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    153114    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    196157      <Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>
    197158      <Name>ProtocolBuffers</Name>
    198   <Private>False</Private></ProjectReference>
     159      <Private>False</Private>
     160    </ProjectReference>
    199161  </ItemGroup>
    200162  <ItemGroup>

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtocolBuffers/ProtocolBuffers.csproj

    r7215 r7270  
    6565    <DebugType>full</DebugType>
    6666    <PlatformTarget>x64</PlatformTarget>
    67     <CodeAnalysisLogFile>bin\Debug\Google.ProtocolBuffers-0.9.1.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     67    <CodeAnalysisLogFile>$(SolutionDir)\bin\Google.ProtocolBuffers-0.9.1.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    6868    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    6969    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    9595    <DebugType>full</DebugType>
    9696    <PlatformTarget>x86</PlatformTarget>
    97     <CodeAnalysisLogFile>bin\Debug\Google.ProtocolBuffers-0.9.1.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     97    <CodeAnalysisLogFile>$(SolutionDir)\bin\Google.ProtocolBuffers-0.9.1.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9898    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9999    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    223223    </BootstrapperPackage>
    224224  </ItemGroup>
    225   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition=" '$(Configuration)' != 'Silverlight2' " />
     225  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    226226  <PropertyGroup>
    227227    <PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)"
Note: See TracChangeset for help on using the changeset viewer.