Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 21:55:55 (13 years ago)
Author:
abeham
Message:

#1614

  • updated branch from trunk
Location:
branches/GeneralizedQAP
Files:
9 deleted
8 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/GeneralizedQAP

  • branches/GeneralizedQAP/HeuristicLab.ExtLibs

    • Property svn:ignore set to
      bin

  • branches/GeneralizedQAP/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS

    • Property svn:ignore set to
      bin

  • branches/GeneralizedQAP/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/HeuristicLab.ProtobufCS

    • Property svn:ignore

      •  

        old new  
        44HeuristicLabProtobufCSPlugin.cs
        55*.vs10x
         6Plugin.cs

  • branches/GeneralizedQAP/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/HeuristicLab.ProtobufCS/HeuristicLab.ProtobufCS-0.9.1.csproj

    r5163 r6878  
    1212    <AssemblyName>HeuristicLab.ProtobufCS-0.9.1</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile></TargetFrameworkProfile>
     14    <TargetFrameworkProfile>
     15    </TargetFrameworkProfile>
    1516    <FileAlignment>512</FileAlignment>
    1617    <SignAssembly>true</SignAssembly>
    … …  
    4041    <DebugType>full</DebugType>
    4142    <Optimize>false</Optimize>
    42     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4344    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4445    <ErrorReport>prompt</ErrorReport>
    … …  
    4950    <DebugType>pdbonly</DebugType>
    5051    <Optimize>true</Optimize>
    51     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5253    <DefineConstants>TRACE</DefineConstants>
    5354    <ErrorReport>prompt</ErrorReport>
    … …  
    5758  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    5859    <DebugSymbols>true</DebugSymbols>
    59     <OutputPath>bin\x86\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6061    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6162    <DebugType>full</DebugType>
    … …  
    6566  </PropertyGroup>
    6667  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    67     <OutputPath>bin\x86\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6869    <DefineConstants>TRACE</DefineConstants>
    6970    <Optimize>true</Optimize>
    … …  
    7576  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7677    <DebugSymbols>true</DebugSymbols>
    77     <OutputPath>bin\x64\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7879    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7980    <DebugType>full</DebugType>
    … …  
    8384  </PropertyGroup>
    8485  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    85     <OutputPath>bin\x64\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8687    <DefineConstants>TRACE</DefineConstants>
    8788    <Optimize>true</Optimize>
    … …  
    9596  </ItemGroup>
    9697  <ItemGroup>
    97     <None Include="HeuristicLabProtobufCSPlugin.cs.frame" />
    98     <Compile Include="HeuristicLabProtobufCSPlugin.cs" />
     98    <None Include="Plugin.cs.frame" />
     99    <Compile Include="Plugin.cs" />
    99100    <Compile Include="Properties\AssemblyInfo.cs" />
    100     <None Include="Properties\AssemblyInfo.frame" />
     101    <None Include="Properties\AssemblyInfo.cs.frame" />
    101102  </ItemGroup>
    102103  <ItemGroup>
    … …  
    108109      <Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>
    109110      <Name>ProtocolBuffers</Name>
     111      <Private>False</Private>
    110112    </ProjectReference>
    111113  </ItemGroup>
    … …  
    150152
    151153call PreBuildEvent.cmd
    152 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProtobufCSPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProtobufCSPlugin.cs"</PreBuildEvent>
     154</PreBuildEvent>
    153155  </PropertyGroup>
    154156</Project>

  • branches/GeneralizedQAP/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS

    • Property svn:ignore set to
      bin

  • branches/GeneralizedQAP/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoGen/ProtoGen.csproj

    r6559 r6878  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    6767  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    6868    <DebugSymbols>true</DebugSymbols>
    69     <OutputPath>bin\x86\Debug\</OutputPath>
     69    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7070    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7171    <DebugType>full</DebugType>
    … …  
    8282  </PropertyGroup>
    8383  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    84     <OutputPath>bin\x86\Release\</OutputPath>
     84    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8585    <DefineConstants>TRACE</DefineConstants>
    8686    <Optimize>true</Optimize>
    8787    <DebugType>pdbonly</DebugType>
    8888    <PlatformTarget>x86</PlatformTarget>
    89     <CodeAnalysisLogFile>bin\Release\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     89    <CodeAnalysisLogFile>$(SolutionDir)\bin\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9090    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9191    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    115115  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    116116    <DebugSymbols>true</DebugSymbols>
    117     <OutputPath>bin\x64\Debug\</OutputPath>
     117    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    118118    <DefineConstants>DEBUG;TRACE</DefineConstants>
    119119    <DebugType>full</DebugType>
    … …  
    130130  </PropertyGroup>
    131131  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    132     <OutputPath>bin\x64\Release\</OutputPath>
     132    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    133133    <DefineConstants>TRACE</DefineConstants>
    134134    <Optimize>true</Optimize>
    135135    <DebugType>pdbonly</DebugType>
    136136    <PlatformTarget>x64</PlatformTarget>
    137     <CodeAnalysisLogFile>bin\Release\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     137    <CodeAnalysisLogFile>$(SolutionDir)\bin\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    138138    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    139139    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    196196      <Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>
    197197      <Name>ProtocolBuffers</Name>
    198     </ProjectReference>
     198  <Private>False</Private></ProjectReference>
    199199  </ItemGroup>
    200200  <ItemGroup>

  • branches/GeneralizedQAP/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtocolBuffers/ProtocolBuffers.csproj

    r6780 r6878  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5151    <DebugType>pdbonly</DebugType>
    5252    <Optimize>true</Optimize>
    53     <OutputPath>bin\Release\</OutputPath>
     53    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5454    <DefineConstants>TRACE</DefineConstants>
    5555    <ErrorReport>prompt</ErrorReport>
    … …  
    6969  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7070    <DebugSymbols>true</DebugSymbols>
    71     <OutputPath>bin\x64\Debug\</OutputPath>
     71    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7272    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7373    <NoStdLib>true</NoStdLib>
    … …  
    8383  </PropertyGroup>
    8484  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    85     <OutputPath>bin\x64\Release\</OutputPath>
     85    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8686    <DefineConstants>TRACE</DefineConstants>
    8787    <Optimize>true</Optimize>
    … …  
    8989    <DebugType>pdbonly</DebugType>
    9090    <PlatformTarget>x64</PlatformTarget>
    91     <CodeAnalysisLogFile>bin\Release\Google.ProtocolBuffers-0.9.1.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     91    <CodeAnalysisLogFile>$(SolutionDir)\bin\Google.ProtocolBuffers-0.9.1.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9292    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9393    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    103103  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    104104    <DebugSymbols>true</DebugSymbols>
    105     <OutputPath>bin\x86\Debug\</OutputPath>
     105    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    106106    <DefineConstants>DEBUG;TRACE</DefineConstants>
    107107    <NoStdLib>true</NoStdLib>
    … …  
    119119  </PropertyGroup>
    120120  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    121     <OutputPath>bin\x86\Release\</OutputPath>
     121    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    122122    <DefineConstants>TRACE</DefineConstants>
    123123    <Optimize>true</Optimize>
    … …  
    125125    <DebugType>pdbonly</DebugType>
    126126    <PlatformTarget>x86</PlatformTarget>
    127     <CodeAnalysisLogFile>bin\Release\Google.ProtocolBuffers-0.9.1.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     127    <CodeAnalysisLogFile>$(SolutionDir)\bin\Google.ProtocolBuffers-0.9.1.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    128128    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    129129    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
Note: See TracChangeset for help on using the changeset viewer.