Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/07/19 15:30:17 (5 years ago)
Author:
abeham
Message:

#2931: merged to trunk

  • Fixed references in plugins
  • Fixed output path
  • Removed app.config from views plugin
  • Reverted changes to PathValue and FileValue and their respective views
Location:
trunk
Files:
1 deleted
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.ExactOptimization.Views/3.3

    • Property svn:ignore
      •  

        old new  
        1212*.nuget.props
        1313*.nuget.targets
         14Plugin.cs
  • trunk/HeuristicLab.ExactOptimization.Views/3.3/HeuristicLab.ExactOptimization.Views-3.3.csproj

    r16746 r16910  
    4444  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    4545    <DebugSymbols>true</DebugSymbols>
    46     <OutputPath>bin\x86\Debug\</OutputPath>
     46    <OutputPath>..\..\bin\</OutputPath>
    4747    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4848    <DebugType>full</DebugType>
     
    6060  </PropertyGroup>
    6161  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    62     <OutputPath>bin\x86\Release\</OutputPath>
     62    <OutputPath>..\..\bin\</OutputPath>
    6363    <DefineConstants>TRACE</DefineConstants>
    6464    <Optimize>true</Optimize>
     
    7777  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7878    <DebugSymbols>true</DebugSymbols>
    79     <OutputPath>bin\x64\Debug\</OutputPath>
     79    <OutputPath>..\..\bin\</OutputPath>
    8080    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8181    <DebugType>full</DebugType>
     
    9393  </PropertyGroup>
    9494  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    95     <OutputPath>bin\x64\Release\</OutputPath>
     95    <OutputPath>..\..\bin\</OutputPath>
    9696    <DefineConstants>TRACE</DefineConstants>
    9797    <Optimize>true</Optimize>
     
    111111  </PropertyGroup>
    112112  <ItemGroup>
    113     <Reference Include="HeuristicLab.Clients.Access-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    114       <SpecificVersion>False</SpecificVersion>
    115       <HintPath>..\..\bin\HeuristicLab.Clients.Access-3.3.dll</HintPath>
    116     </Reference>
    117     <Reference Include="HeuristicLab.Clients.Access.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    118       <SpecificVersion>False</SpecificVersion>
    119       <HintPath>..\..\bin\HeuristicLab.Clients.Access.Views-3.3.dll</HintPath>
    120     </Reference>
    121     <Reference Include="HeuristicLab.Clients.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    122       <SpecificVersion>False</SpecificVersion>
    123       <HintPath>..\..\bin\HeuristicLab.Clients.Common-3.3.dll</HintPath>
    124     </Reference>
    125     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    126       <SpecificVersion>False</SpecificVersion>
    127       <HintPath>..\..\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    128     </Reference>
    129     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    130       <SpecificVersion>False</SpecificVersion>
    131       <HintPath>..\..\bin\HeuristicLab.Data-3.3.dll</HintPath>
    132       <Private>False</Private>
    133     </Reference>
    134     <Reference Include="HeuristicLab.Optimizer-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    135       <SpecificVersion>False</SpecificVersion>
    136       <HintPath>..\..\bin\HeuristicLab.Optimizer-3.3.dll</HintPath>
    137     </Reference>
    138113    <Reference Include="Microsoft.CSharp" />
    139114    <Reference Include="System" />
     
    172147    </Compile>
    173148    <Compile Include="Properties\AssemblyInfo.cs" />
    174     <None Include="app.config">
    175       <SubType>Designer</SubType>
    176     </None>
    177149    <None Include="Plugin.cs.frame" />
    178150    <Compile Include="Plugin.cs" />
     
    183155  </ItemGroup>
    184156  <ItemGroup>
    185     <ProjectReference Include="..\..\HeuristicLab.Clients.Access.Administration\3.3\HeuristicLab.Clients.Access.Administration-3.3.csproj">
    186       <Project>{C9CF6AE8-4637-4A75-9141-042F479B5D50}</Project>
    187       <Name>HeuristicLab.Clients.Access.Administration-3.3</Name>
    188     </ProjectReference>
    189157    <ProjectReference Include="..\..\HeuristicLab.CodeEditor\3.4\HeuristicLab.CodeEditor-3.4.csproj">
    190158      <Project>{C38691AE-ECB4-489A-A05D-B035554E0168}</Project>
     
    217185      <Private>False</Private>
    218186    </ProjectReference>
     187    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     188      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     189      <Name>HeuristicLab.Data-3.3</Name>
     190      <Private>False</Private>
     191    </ProjectReference>
    219192    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    220193      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     
    250223      <Project>{6F023B90-2091-40A9-8AC0-B0338DFF8E5F}</Project>
    251224      <Name>HeuristicLab.Problems.Programmable.Views-3.3</Name>
     225      <Private>False</Private>
    252226    </ProjectReference>
    253227    <ProjectReference Include="..\..\HeuristicLab.Problems.Programmable\3.3\HeuristicLab.Problems.Programmable-3.3.csproj">
  • trunk/HeuristicLab.ExactOptimization.Views/3.3/Properties

    • Property svn:ignore set to
      AssemblyInfo.cs
Note: See TracChangeset for help on using the changeset viewer.