Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/14/18 17:07:25 (6 years ago)
Author:
dpiringe
Message:

#2522:

  • migrated a lot of projects to .NET Standard 2.0
  • added AppDomain.CurrentDomain.ApplyPolicy to Assembly.ReflectionOnlyLoad in PluginValidator to correctly load the System library
  • deleted Properties folder from .NET Standard projects, because AssemblyInformation is saved in .csproj files now
  • .NET Framework projects target now v4.7, because it is only possible to use .NET Standard libraries in v4.6 or higher
  • removed System.Data.Linq from defaultAssemblies and DiscoverNamespaces in ProgrammableOperator, it is not supported in .NET Standard
  • the Microsoft.Windows.Compatibility package is necessary for usage of PluginInfrastructure, we should probably switch to the System.Drawing.Common package when PluginInfrastructure is migrated to .NET Standard
Location:
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Problems.BinPacking/3.3
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2522_RefactorPluginInfrastructure/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

    r15233 r16143  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project Sdk="Microsoft.NET.Sdk">
    33  <PropertyGroup>
    4     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    5     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    6     <ProductVersion>8.0.30703</ProductVersion>
    7     <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}</ProjectGuid>
    9     <OutputType>Library</OutputType>
    10     <AppDesignerFolder>Properties</AppDesignerFolder>
     4    <TargetFramework>netstandard2.0</TargetFramework>
     5    <Copyright>(c) 2002-2018 HEAL</Copyright>
     6    <Product>HeuristicLab</Product>
     7    <SignAssembly>true</SignAssembly>
     8    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     9    <AssemblyVersion>3.3.0.0</AssemblyVersion>
     10    <AssemblyFileVersion>3.3.15.0</AssemblyFileVersion>
    1111    <RootNamespace>HeuristicLab.Problems.BinPacking</RootNamespace>
    12     <AssemblyName>HeuristicLab.Problems.BinPacking-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    14     <FileAlignment>512</FileAlignment>
    15     <TargetFrameworkProfile />
    16   </PropertyGroup>
    17   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    18     <DebugSymbols>true</DebugSymbols>
    19     <DebugType>full</DebugType>
    20     <Optimize>false</Optimize>
    21     <OutputPath>..\..\bin\</OutputPath>
    22     <DefineConstants>DEBUG;TRACE</DefineConstants>
    23     <ErrorReport>prompt</ErrorReport>
    24     <WarningLevel>4</WarningLevel>
    25   </PropertyGroup>
    26   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    27     <DebugType>pdbonly</DebugType>
    28     <Optimize>true</Optimize>
    29     <OutputPath>..\..\bin\</OutputPath>
    30     <DefineConstants>TRACE</DefineConstants>
    31     <ErrorReport>prompt</ErrorReport>
    32     <WarningLevel>4</WarningLevel>
    33   </PropertyGroup>
    34   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    35     <DebugSymbols>true</DebugSymbols>
    36     <OutputPath>..\..\bin\</OutputPath>
    37     <DefineConstants>DEBUG;TRACE</DefineConstants>
    38     <DebugType>full</DebugType>
    39     <PlatformTarget>x64</PlatformTarget>
    40     <ErrorReport>prompt</ErrorReport>
    41   </PropertyGroup>
    42   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    43     <OutputPath>..\..\bin\</OutputPath>
    44     <DefineConstants>TRACE</DefineConstants>
    45     <Optimize>true</Optimize>
    46     <DebugType>pdbonly</DebugType>
    47     <PlatformTarget>x64</PlatformTarget>
    48     <ErrorReport>prompt</ErrorReport>
    49     <Prefer32Bit>false</Prefer32Bit>
    50   </PropertyGroup>
    51   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    52     <DebugSymbols>true</DebugSymbols>
    53     <OutputPath>..\..\bin\</OutputPath>
    54     <DefineConstants>DEBUG;TRACE</DefineConstants>
    55     <DebugType>full</DebugType>
    56     <PlatformTarget>x86</PlatformTarget>
    57     <ErrorReport>prompt</ErrorReport>
    58   </PropertyGroup>
    59   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    60     <OutputPath>..\..\bin\</OutputPath>
    61     <DefineConstants>TRACE</DefineConstants>
    62     <Optimize>true</Optimize>
    63     <DebugType>pdbonly</DebugType>
    64     <PlatformTarget>x86</PlatformTarget>
    65     <ErrorReport>prompt</ErrorReport>
    66   </PropertyGroup>
    67   <PropertyGroup>
    68     <SignAssembly>true</SignAssembly>
    69   </PropertyGroup>
    70   <PropertyGroup>
    71     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    7212  </PropertyGroup>
    7313  <ItemGroup>
    74     <Reference Include="System" />
    75     <Reference Include="System.Core" />
    76     <Reference Include="System.Drawing" />
    77     <Reference Include="System.IO.Compression" />
    78     <Reference Include="System.Windows.Forms" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     15    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    7916  </ItemGroup>
    8017  <ItemGroup>
    81     <Compile Include="2D\BinPacking2D.cs" />
    82     <Compile Include="2D\Evaluators\BinUtilizationEvaluator.cs" />
    83     <Compile Include="2D\Evaluators\PackingRatioEvaluator.cs" />
    84     <Compile Include="2D\Instances\BPPData.cs" />
    85     <Compile Include="2D\Instances\RandomDataDescriptor.cs" />
    86     <Compile Include="2D\Instances\RandomInstanceProvider.cs" />
    87     <Compile Include="2D\IntegerVectorEncoding\BottomLeftIntegerVectorDecoder.cs" />
    88     <Compile Include="2D\IntegerVectorEncoding\ExtremePointIntegerVectorDecoder.cs" />
    89     <Compile Include="2D\IntegerVectorEncoding\IntegerVectorDecoderBase.cs" />
    90     <Compile Include="2D\IntegerVectorEncoding\IntegerVectorProblem.cs" />
    91     <Compile Include="2D\Interfaces\IDecoder.cs" />
    92     <Compile Include="2D\Interfaces\IEvaluator.cs" />
    93     <Compile Include="2D\Interfaces\IOperator.cs" />
    94     <Compile Include="2D\MoveEvaluatorBase.cs" />
    95     <Compile Include="2D\PackingItem.cs" />
    96     <Compile Include="2D\PackingPosition.cs" />
    97     <Compile Include="2D\PackingShape.cs" />
    98     <Compile Include="2D\PermutationEncoding\BottomLeftPermutationDecoder.cs" />
    99     <Compile Include="2D\PermutationEncoding\ExtremePointPermutationDecoder.cs" />
    100     <Compile Include="2D\PermutationEncoding\PermutationProblem.cs" />
    101     <Compile Include="2D\PermutationEncoding\Swap2MoveEvaluator.cs" />
    102     <Compile Include="2D\PermutationEncoding\TranslocationMoveEvaluator.cs" />
    103     <Compile Include="2D\ProblemBase.cs" />
    104     <Compile Include="2D\Solution.cs" />
    105     <Compile Include="3D\BinPacking3D.cs" />
    106     <Compile Include="3D\Evaluators\BinUtilizationEvaluator.cs" />
    107     <Compile Include="3D\Evaluators\PackingRatioEvaluator.cs" />
    108     <Compile Include="Algorithms\3D\ExtremePointAlgorithm.cs" />
    109     <Compile Include="3D\Instances\ThreeDInstanceDescriptor.cs" />
    110     <Compile Include="3D\Instances\BPPData.cs" />
    111     <Compile Include="3D\Instances\RandomDataDescriptor.cs" />
    112     <Compile Include="3D\Instances\RealWorldContainerPackingInstanceProvider.cs" />
    113     <Compile Include="3D\Instances\RandomInstanceProvider.cs" />
    114     <Compile Include="3D\Instances\ThreeDInstanceParser.cs" />
    115     <Compile Include="3D\IntegerVectorEncoding\BottomLeftIntegerVectorDecoder.cs" />
    116     <Compile Include="3D\IntegerVectorEncoding\ExtremePointIntegerVectorDecoder.cs" />
    117     <Compile Include="3D\IntegerVectorEncoding\IntegerVectorDecoderBase.cs" />
    118     <Compile Include="3D\IntegerVectorEncoding\IntegerVectorProblem.cs" />
    119     <Compile Include="3D\Interfaces\IDecoder.cs" />
    120     <Compile Include="3D\Interfaces\IEvaluator.cs" />
    121     <Compile Include="3D\Interfaces\IOperator.cs" />
    122     <Compile Include="3D\MoveEvaluatorBase.cs" />
    123     <Compile Include="3D\PackingItem.cs" />
    124     <Compile Include="3D\PackingPosition.cs" />
    125     <Compile Include="3D\PackingShape.cs" />
    126     <Compile Include="3D\PermutationEncoding\BottomLeftPermutationDecoder.cs" />
    127     <Compile Include="3D\PermutationEncoding\ResidualSpaceBestFitExtremePointPermutationDecoder.cs" />
    128     <Compile Include="3D\PermutationEncoding\FreeVolumeBestFitExtremePointPermutationDecoder.cs" />
    129     <Compile Include="3D\PermutationEncoding\ExtremePointPermutationDecoderBase.cs" />
    130     <Compile Include="3D\PermutationEncoding\ExtremePointPermutationDecoder.cs" />
    131     <Compile Include="3D\PermutationEncoding\PermutationProblem.cs" />
    132     <Compile Include="3D\PermutationEncoding\Swap2MoveEvaluator.cs" />
    133     <Compile Include="3D\PermutationEncoding\TranslocationMoveEvaluator.cs" />
    134     <Compile Include="3D\ProblemBase.cs" />
    135     <Compile Include="3D\Solution.cs" />
    136     <Compile Include="BinPacking.cs" />
    137     <Compile Include="Interfaces\IPackingItem.cs">
    138       <SubType>Code</SubType>
    139     </Compile>
    140     <Compile Include="Interfaces\IPackingPosition.cs">
    141       <SubType>Code</SubType>
    142     </Compile>
    143     <Compile Include="Interfaces\IPackingShape.cs">
    144       <SubType>Code</SubType>
    145     </Compile>
    146     <Compile Include="PackingPlan.cs" />
    147     <Compile Include="PackingPosition.cs" />
    148     <Compile Include="PackingShape.cs" />
    149     <Compile Include="Plugin.cs" />
    150     <Compile Include="Properties\AssemblyInfo.cs" />
     18    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj" />
     19    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj" />
     20    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj" />
     21    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj" />
     22    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj" />
     23    <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj" />
     24    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj" />
     25    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj" />
     26    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj" />
     27    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj" />
     28    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj" />
     29    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj" />
     30    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
     31    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj" />
     32    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj" />
    15133  </ItemGroup>
    152   <ItemGroup>
    153     <EmbeddedResource Include="3D\Instances\ContainerPackingInstances.zip" />
    154     <None Include="HeuristicLab.snk" />
    155     <None Include="Properties\AssemblyInfo.cs.frame" />
    156     <None Include="Plugin.cs.frame" />
    157   </ItemGroup>
    158   <ItemGroup />
    159   <ItemGroup>
    160     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    161       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    162       <Name>HeuristicLab.Analysis-3.3</Name>
    163       <Private>False</Private>
    164     </ProjectReference>
    165     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    166       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    167       <Name>HeuristicLab.Collections-3.3</Name>
    168       <Private>False</Private>
    169     </ProjectReference>
    170     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    171       <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
    172       <Name>HeuristicLab.Common-3.3</Name>
    173       <Private>False</Private>
    174     </ProjectReference>
    175     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    176       <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
    177       <Name>HeuristicLab.Core-3.3</Name>
    178       <Private>False</Private>
    179     </ProjectReference>
    180     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    181       <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
    182       <Name>HeuristicLab.Data-3.3</Name>
    183       <Private>False</Private>
    184     </ProjectReference>
    185     <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
    186       <Project>{ddfb14dd-2a85-493c-a52d-e69729bbaeb0}</Project>
    187       <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
    188       <Private>False</Private>
    189     </ProjectReference>
    190     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    191       <Project>{dbecb8b0-b166-4133-baf1-ed67c3fd7fca}</Project>
    192       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    193       <Private>False</Private>
    194     </ProjectReference>
    195     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    196       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    197       <Name>HeuristicLab.Operators-3.3</Name>
    198       <Private>False</Private>
    199     </ProjectReference>
    200     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    201       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    202       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    203       <Private>False</Private>
    204     </ProjectReference>
    205     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    206       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    207       <Name>HeuristicLab.Optimization-3.3</Name>
    208       <Private>False</Private>
    209     </ProjectReference>
    210     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    211       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    212       <Name>HeuristicLab.Parameters-3.3</Name>
    213       <Private>False</Private>
    214     </ProjectReference>
    215     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    216       <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
    217       <Name>HeuristicLab.Persistence-3.3</Name>
    218       <Private>False</Private>
    219     </ProjectReference>
    220     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    221       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    222       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    223       <Private>False</Private>
    224     </ProjectReference>
    225     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    226       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    227       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    228       <Private>False</Private>
    229     </ProjectReference>
    230     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    231       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    232       <Name>HeuristicLab.Random-3.3</Name>
    233       <Private>False</Private>
    234     </ProjectReference>
    235   </ItemGroup>
    236   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    237   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    238        Other similar extension points exist, see Microsoft.Common.targets.
    239   <Target Name="BeforeBuild">
     34  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     35    <Exec Command="set Path=%Path%;$(ProjectDir);$(SolutionDir)&#xD;&#xA;set ProjectDir=$(ProjectDir)&#xD;&#xA;set SolutionDir=$(SolutionDir)&#xD;&#xA;set Outdir=$(Outdir)&#xD;&#xA;call PreBuildEvent.cmd" />
    24036  </Target>
    241   <Target Name="AfterBuild">
    242   </Target>
    243   -->
    244   <PropertyGroup>
    245     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    246 set ProjectDir=$(ProjectDir)
    247 set SolutionDir=$(SolutionDir)
    248 set Outdir=$(Outdir)
    249 
    250 call PreBuildEvent.cmd
    251 </PreBuildEvent>
    252     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    253 export ProjectDir=$(ProjectDir)
    254 export SolutionDir=$(SolutionDir)
    255 
    256 $SolutionDir/PreBuildEvent.sh
    257 </PreBuildEvent>
     37  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     38    <OutputPath>..\..\bin\</OutputPath>
     39    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    25840  </PropertyGroup>
    25941</Project>
Note: See TracChangeset for help on using the changeset viewer.