Free cookie consent management tool by TermsFeed Policy Generator

Changeset 12682 for trunk/sources


Ignore:
Timestamp:
07/08/15 13:17:18 (9 years ago)
Author:
mkommend
Message:

#2335: Corrected accidentally merged project files.

Location:
trunk/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

    r12676 r12682  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    105105  </PropertyGroup>
    106106  <ItemGroup>
    107     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    108       <SpecificVersion>False</SpecificVersion>
    109       <HintPath>..\..\..\..\..\..\HL Preprocessing\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    110     </Reference>
    111     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    112       <SpecificVersion>False</SpecificVersion>
    113       <HintPath>..\..\..\..\..\..\HL Preprocessing\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    114     </Reference>
    115     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    116       <SpecificVersion>False</SpecificVersion>
    117       <HintPath>..\..\..\..\..\..\HL Preprocessing\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    118     </Reference>
    119     <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    120       <SpecificVersion>False</SpecificVersion>
    121       <HintPath>..\..\..\..\..\..\HL Preprocessing\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
    122     </Reference>
    123     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    124       <SpecificVersion>False</SpecificVersion>
    125       <HintPath>..\..\..\..\..\..\HL Preprocessing\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    126     </Reference>
    127     <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    128       <SpecificVersion>False</SpecificVersion>
    129       <HintPath>..\..\..\..\..\..\HL Preprocessing\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
    130     </Reference>
    131     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    132       <SpecificVersion>False</SpecificVersion>
    133       <HintPath>..\..\..\..\..\..\HL Preprocessing\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    134     </Reference>
    135     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    136       <SpecificVersion>False</SpecificVersion>
    137       <HintPath>..\..\..\..\..\..\HL Preprocessing\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    138     </Reference>
    139107    <Reference Include="System" />
    140108    <Reference Include="System.Core">
    … …  
    262230    <None Include="HeuristicLab.snk" />
    263231    <None Include="Properties\AssemblyInfo.cs.frame" />
     232  </ItemGroup>
     233  <ItemGroup>
     234    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     235      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
     236      <Name>HeuristicLab.Common.Resources-3.3</Name>
     237      <Private>False</Private>
     238    </ProjectReference>
     239    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     240      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     241      <Name>HeuristicLab.Common-3.3</Name>
     242      <Private>False</Private>
     243    </ProjectReference>
     244    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
     245      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
     246      <Name>HeuristicLab.Core.Views-3.3</Name>
     247      <Private>False</Private>
     248    </ProjectReference>
     249    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     250      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     251      <Name>HeuristicLab.Core-3.3</Name>
     252      <Private>False</Private>
     253    </ProjectReference>
     254    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     255      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     256      <Name>HeuristicLab.Data-3.3</Name>
     257      <Private>False</Private>
     258    </ProjectReference>
     259    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
     260      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     261      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     262      <Private>False</Private>
     263    </ProjectReference>
     264    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
     265      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
     266      <Name>HeuristicLab.MainForm-3.3</Name>
     267      <Private>False</Private>
     268    </ProjectReference>
     269    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     270      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     271      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     272      <Private>False</Private>
     273    </ProjectReference>
    264274  </ItemGroup>
    265275  <ItemGroup>

  • trunk/sources/HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj

    r12676 r12682  
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     20    <OutputPath>..\..\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
    … …  
    2828    <DebugType>pdbonly</DebugType>
    2929    <Optimize>true</Optimize>
    30     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     30    <OutputPath>..\..\bin\</OutputPath>
    3131    <DefineConstants>TRACE</DefineConstants>
    3232    <ErrorReport>prompt</ErrorReport>
    … …  
    7373  </PropertyGroup>
    7474  <ItemGroup>
    75     <Reference Include="HeuristicLab.Analysis-3.3">
    76       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    77     </Reference>
    78     <Reference Include="HeuristicLab.Collections-3.3">
    79       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    80     </Reference>
    81     <Reference Include="HeuristicLab.Common-3.3">
    82       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    83     </Reference>
    84     <Reference Include="HeuristicLab.Common.Resources-3.3">
    85       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    86     </Reference>
    87     <Reference Include="HeuristicLab.Core-3.3">
    88       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    89     </Reference>
    90     <Reference Include="HeuristicLab.Data-3.3">
    91       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    92     </Reference>
    93     <Reference Include="HeuristicLab.Optimization-3.3">
    94       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    95     </Reference>
    96     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    97       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    98     </Reference>
    99     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    100       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    101     </Reference>
    10275    <Reference Include="System" />
    10376    <Reference Include="System.Core" />
    … …  
    151124    <None Include="HeuristicLab.snk" />
    152125  </ItemGroup>
     126  <ItemGroup>
     127    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     128      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
     129      <Name>HeuristicLab.Analysis-3.3</Name>
     130      <Private>False</Private>
     131    </ProjectReference>
     132    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     133      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
     134      <Name>HeuristicLab.Collections-3.3</Name>
     135      <Private>False</Private>
     136    </ProjectReference>
     137    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     138      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
     139      <Name>HeuristicLab.Common.Resources-3.3</Name>
     140      <Private>False</Private>
     141    </ProjectReference>
     142    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     143      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
     144      <Name>HeuristicLab.Common-3.3</Name>
     145      <Private>False</Private>
     146    </ProjectReference>
     147    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     148      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     149      <Name>HeuristicLab.Core-3.3</Name>
     150      <Private>False</Private>
     151    </ProjectReference>
     152    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     153      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     154      <Name>HeuristicLab.Data-3.3</Name>
     155      <Private>False</Private>
     156    </ProjectReference>
     157    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     158      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     159      <Name>HeuristicLab.Optimization-3.3</Name>
     160      <Private>False</Private>
     161    </ProjectReference>
     162    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     163      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     164      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     165      <Private>False</Private>
     166    </ProjectReference>
     167    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     168      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
     169      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     170      <Private>False</Private>
     171    </ProjectReference>
     172  </ItemGroup>
    153173  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    154174  <PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.