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.PTSP/3.3
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed

  • branches/2522_RefactorPluginInfrastructure/HeuristicLab.Problems.PTSP/3.3/HeuristicLab.Problems.PTSP-3.3.csproj

    r15069 r16143  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    3   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
     2<Project Sdk="Microsoft.NET.Sdk">
    43  <PropertyGroup>
    5     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    6     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    7     <ProjectGuid>{97198965-AFEA-496B-B3B1-316905C43FD6}</ProjectGuid>
    8     <OutputType>Library</OutputType>
    9     <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>
    1011    <RootNamespace>HeuristicLab.Problems.PTSP</RootNamespace>
    11     <AssemblyName>HeuristicLab.Problems.PTSP-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    13     <FileAlignment>512</FileAlignment>
    14   </PropertyGroup>
    15   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    16     <DebugSymbols>true</DebugSymbols>
    17     <DebugType>full</DebugType>
    18     <Optimize>false</Optimize>
    19     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    20     <DefineConstants>DEBUG;TRACE</DefineConstants>
    21     <ErrorReport>prompt</ErrorReport>
    22     <WarningLevel>4</WarningLevel>
    23     <PlatformTarget>AnyCPU</PlatformTarget>
    24   </PropertyGroup>
    25   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    26     <DebugType>pdbonly</DebugType>
    27     <Optimize>true</Optimize>
    28     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    29     <DefineConstants>TRACE</DefineConstants>
    30     <ErrorReport>prompt</ErrorReport>
    31     <WarningLevel>4</WarningLevel>
    32   </PropertyGroup>
    33   <PropertyGroup>
    34     <SignAssembly>true</SignAssembly>
    35   </PropertyGroup>
    36   <PropertyGroup>
    37     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    38   </PropertyGroup>
    39   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    40     <DebugSymbols>true</DebugSymbols>
    41     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    42     <DefineConstants>DEBUG;TRACE</DefineConstants>
    43     <DebugType>full</DebugType>
    44     <PlatformTarget>x64</PlatformTarget>
    45     <ErrorReport>prompt</ErrorReport>
    46     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    47   </PropertyGroup>
    48   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    49     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    50     <DefineConstants>TRACE</DefineConstants>
    51     <Optimize>true</Optimize>
    52     <DebugType>pdbonly</DebugType>
    53     <PlatformTarget>x64</PlatformTarget>
    54     <ErrorReport>prompt</ErrorReport>
    55     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    56   </PropertyGroup>
    57   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    58     <DebugSymbols>true</DebugSymbols>
    59     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    60     <DefineConstants>DEBUG;TRACE</DefineConstants>
    61     <DebugType>full</DebugType>
    62     <PlatformTarget>x86</PlatformTarget>
    63     <ErrorReport>prompt</ErrorReport>
    64     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    65   </PropertyGroup>
    66   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    67     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    68     <DefineConstants>TRACE</DefineConstants>
    69     <Optimize>true</Optimize>
    70     <DebugType>pdbonly</DebugType>
    71     <PlatformTarget>x86</PlatformTarget>
    72     <ErrorReport>prompt</ErrorReport>
    73     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    7412  </PropertyGroup>
    7513  <ItemGroup>
    76     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    77       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    78       <Name>HeuristicLab.Analysis-3.3</Name>
    79       <Private>False</Private>
    80     </ProjectReference>
    81     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    82       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    83       <Name>HeuristicLab.Collections-3.3</Name>
    84       <Private>False</Private>
    85     </ProjectReference>
    86     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    87       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    88       <Name>HeuristicLab.Common.Resources-3.3</Name>
    89       <Private>False</Private>
    90     </ProjectReference>
    91     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    92       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    93       <Name>HeuristicLab.Common-3.3</Name>
    94       <Private>False</Private>
    95     </ProjectReference>
    96     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    97       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    98       <Name>HeuristicLab.Core-3.3</Name>
    99       <Private>False</Private>
    100     </ProjectReference>
    101     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    102       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    103       <Name>HeuristicLab.Data-3.3</Name>
    104       <Private>False</Private>
    105     </ProjectReference>
    106     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    107       <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    108       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    109       <Private>False</Private>
    110     </ProjectReference>
    111     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    112       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    113       <Name>HeuristicLab.Operators-3.3</Name>
    114       <Private>False</Private>
    115     </ProjectReference>
    116     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    117       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    118       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    119       <Private>False</Private>
    120     </ProjectReference>
    121     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    122       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    123       <Name>HeuristicLab.Optimization-3.3</Name>
    124       <Private>False</Private>
    125     </ProjectReference>
    126     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    127       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    128       <Name>HeuristicLab.Parameters-3.3</Name>
    129       <Private>False</Private>
    130     </ProjectReference>
    131     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    132       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    133       <Name>HeuristicLab.Persistence-3.3</Name>
    134       <Private>False</Private>
    135     </ProjectReference>
    136     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    137       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    138       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    139       <Private>False</Private>
    140     </ProjectReference>
    141     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    142       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    143       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    144       <Private>False</Private>
    145     </ProjectReference>
    146     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    147       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    148       <Name>HeuristicLab.Random-3.3</Name>
    149       <Private>False</Private>
    150     </ProjectReference>
    151     <Reference Include="System" />
    152     <Reference Include="System.Core" />
    153     <Reference Include="System.Drawing" />
    154     <Reference Include="System.IO.Compression" />
    155     <Reference Include="System.Xml.Linq" />
    156     <Reference Include="System.Data.DataSetExtensions" />
    157     <Reference Include="Microsoft.CSharp" />
    158     <Reference Include="System.Data" />
    159     <Reference Include="System.Xml" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     15    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    16016  </ItemGroup>
    16117  <ItemGroup>
    162     <None Include="Properties\AssemblyInfo.cs.frame" />
    163     <None Include="Plugin.cs.frame" />
    164     <Compile Include="AnalyticalPTSP.cs" />
    165     <Compile Include="Analyzers\BestPTSPSolutionAnalyzer.cs" />
    166     <Compile Include="DistanceCalculators\MaximumDistance.cs" />
    167     <Compile Include="DistanceCalculators\ManhattanDistance.cs" />
    168     <Compile Include="DistanceCalculators\GeoDistance.cs" />
    169     <Compile Include="DistanceCalculators\DistanceCalculator.cs" />
    170     <Compile Include="DistanceCalculators\AttDistance.cs" />
    171     <Compile Include="DistanceCalculators\UpperEuclideanDistance.cs" />
    172     <Compile Include="DistanceCalculators\RoundedEuclideanDistance.cs" />
    173     <Compile Include="DistanceCalculators\EuclideanDistance.cs" />
    174     <Compile Include="DistanceMatrix.cs" />
    175     <Compile Include="EstimatedPTSP.cs" />
    176     <Compile Include="Improvers\PTSPAnalyticalInsertionLocalImprovement.cs" />
    177     <Compile Include="Improvers\PTSPAnalyticalTwoPointFiveLocalImprovement.cs" />
    178     <Compile Include="Improvers\PTSPEstimatedInsertionLocalImprovement.cs" />
    179     <Compile Include="Improvers\PTSPAnalyticalInversionLocalImprovement.cs" />
    180     <Compile Include="Improvers\PTSPEstimatedTwoPointFiveLocalImprovement.cs" />
    181     <Compile Include="Improvers\PTSPEstimatedInversionLocalImprovement.cs" />
    182     <Compile Include="Interfaces\IAnalyticalPTSPMoveEvaluator.cs" />
    183     <Compile Include="Interfaces\IAnalyticalPTSPOperator.cs" />
    184     <Compile Include="Interfaces\IEstimatedPTSPOperator.cs" />
    185     <Compile Include="Interfaces\ITwoPointFiveMoveOperator.cs" />
    186     <Compile Include="Interfaces\IEstimatedPTSPMoveEvaluator.cs" />
    187     <Compile Include="Moves\AnalyticalPTSPMoveEvaluator.cs" />
    188     <Compile Include="Moves\OneShift\PTSPAnalyticalInsertionMoveEvaluator.cs" />
    189     <Compile Include="Moves\OneShift\PTSPEstimatedInsertionMoveEvaluator.cs" />
    190     <Compile Include="Moves\EstimatedPTSPMoveEvaluator.cs" />
    191     <Compile Include="Moves\TwoOpt\PTSPAnalyticalInversionMoveEvaluator.cs" />
    192     <Compile Include="Moves\TwoOpt\PTSPEstimatedInversionMoveEvaluator.cs" />
    193     <Compile Include="Moves\TwoPointFiveOpt\PTSPAnalyticalTwoPointFiveMoveEvaluator.cs" />
    194     <Compile Include="Moves\TwoPointFiveOpt\PTSPEstimatedTwoPointFiveMoveEvaluator.cs" />
    195     <Compile Include="Moves\TwoPointFiveOpt\ExhaustiveTwoPointFiveMoveGenerator.cs" />
    196     <Compile Include="Moves\TwoPointFiveOpt\StochasticTwoPointFiveMultiMoveGenerator.cs" />
    197     <Compile Include="Moves\TwoPointFiveOpt\StochasticTwoPointFiveSingleMoveGenerator.cs" />
    198     <Compile Include="Moves\TwoPointFiveOpt\TwoPointFiveMoveGenerator.cs" />
    199     <Compile Include="Moves\TwoPointFiveOpt\TwoPointFiveMoveMaker.cs" />
    200     <Compile Include="Moves\TwoPointFiveOpt\TwoPointFiveMove.cs" />
    201     <Compile Include="PathPTSPTour.cs" />
    202     <Compile Include="PTSP.cs" />
    203     <Compile Include="Plugin.cs" />
    204     <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.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj" />
     21    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj" />
     22    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj" />
     23    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-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" />
    20533  </ItemGroup>
    20634  <ItemGroup>
    207     <None Include="HeuristicLab.snk" />
     35    <Reference Include="Microsoft.CSharp" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
    20836  </ItemGroup>
    209   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    210   <PropertyGroup>
    211     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    212 set ProjectDir=$(ProjectDir)
    213 set SolutionDir=$(SolutionDir)
    214 set OutDir=$(OutDir)
    215 set TargetDir=$(TargetDir)
    216 
    217 call PreBuildEvent.cmd
    218     </PreBuildEvent>
    219     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    220 export ProjectDir=$(ProjectDir)
    221 export SolutionDir=$(SolutionDir)
    222 
    223 $SolutionDir/PreBuildEvent.sh
    224     </PreBuildEvent>
     37  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     38    <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" />
     39  </Target>
     40  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     41    <OutputPath>..\..\bin\</OutputPath>
     42    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    22543  </PropertyGroup>
    226   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    227        Other similar extension points exist, see Microsoft.Common.targets.
    228   <Target Name="BeforeBuild">
    229   </Target>
    230   <Target Name="AfterBuild">
    231   </Target>
    232   -->
    23344</Project>
Note: See TracChangeset for help on using the changeset viewer.