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.Instances.VehicleRouting/3.4
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2522_RefactorPluginInfrastructure/HeuristicLab.Problems.Instances.VehicleRouting/3.4/HeuristicLab.Problems.Instances.VehicleRouting-3.4.csproj

    r15973 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>{8C265E11-4F8D-4CED-9E6B-F400A0075C18}</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.4.0.0</AssemblyVersion>
     10    <AssemblyFileVersion>3.4.8.0</AssemblyFileVersion>
    1111    <RootNamespace>HeuristicLab.Problems.Instances.VehicleRouting</RootNamespace>
    12     <AssemblyName>HeuristicLab.Problems.Instances.VehicleRouting-3.4</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     <Prefer32Bit>false</Prefer32Bit>
    26   </PropertyGroup>
    27   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    28     <DebugType>pdbonly</DebugType>
    29     <Optimize>true</Optimize>
    30     <OutputPath>..\..\bin\</OutputPath>
    31     <DefineConstants>TRACE</DefineConstants>
    32     <ErrorReport>prompt</ErrorReport>
    33     <WarningLevel>4</WarningLevel>
    34     <Prefer32Bit>false</Prefer32Bit>
    35   </PropertyGroup>
    36   <PropertyGroup>
    37     <SignAssembly>true</SignAssembly>
    38   </PropertyGroup>
    39   <PropertyGroup>
    40     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    41   </PropertyGroup>
    42   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    43     <DebugSymbols>true</DebugSymbols>
    44     <OutputPath>..\..\bin\</OutputPath>
    45     <DefineConstants>DEBUG;TRACE</DefineConstants>
    46     <DebugType>full</DebugType>
    47     <PlatformTarget>x64</PlatformTarget>
    48     <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Problems.Instances.VehicleRouting-3.4.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    49     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    50     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    51     <ErrorReport>prompt</ErrorReport>
    52     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    53     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    54     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
    55     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    56     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
    57     <Prefer32Bit>false</Prefer32Bit>
    58   </PropertyGroup>
    59   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    60     <OutputPath>..\..\bin\</OutputPath>
    61     <DefineConstants>TRACE</DefineConstants>
    62     <Optimize>true</Optimize>
    63     <DebugType>pdbonly</DebugType>
    64     <PlatformTarget>x64</PlatformTarget>
    65     <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Problems.Instances.VehicleRouting-3.4.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    66     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    67     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    68     <ErrorReport>prompt</ErrorReport>
    69     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    70     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    71     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
    72     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    73     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
    74     <Prefer32Bit>false</Prefer32Bit>
    75   </PropertyGroup>
    76   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    77     <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>..\..\bin\</OutputPath>
    79     <DefineConstants>DEBUG;TRACE</DefineConstants>
    80     <DebugType>full</DebugType>
    81     <PlatformTarget>x86</PlatformTarget>
    82     <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Problems.Instances.VehicleRouting-3.4.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    83     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    84     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    85     <ErrorReport>prompt</ErrorReport>
    86     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    87     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    88     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
    89     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    90     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
    91     <Prefer32Bit>false</Prefer32Bit>
    92   </PropertyGroup>
    93   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    94     <OutputPath>..\..\bin\</OutputPath>
    95     <DefineConstants>TRACE</DefineConstants>
    96     <Optimize>true</Optimize>
    97     <DebugType>pdbonly</DebugType>
    98     <PlatformTarget>x86</PlatformTarget>
    99     <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Problems.Instances.VehicleRouting-3.4.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    100     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    101     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    102     <ErrorReport>prompt</ErrorReport>
    103     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    104     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    105     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
    106     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    107     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
    108     <Prefer32Bit>false</Prefer32Bit>
    10912  </PropertyGroup>
    11013  <ItemGroup>
    111     <Reference Include="System" />
    112     <Reference Include="System.Core" />
    113     <Reference Include="System.Data" />
    114     <Reference Include="System.IO.Compression" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     15    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    11516  </ItemGroup>
    11617  <ItemGroup>
    117     <Compile Include="CordeauFormat\CordeauMDTWInstanceProvider.cs" />
    118     <Compile Include="GoldenFormat\ChristofidesInstanceProvider.cs" />
    119     <Compile Include="GoldenFormat\KytojokiInstanceProvider.cs" />
    120     <Compile Include="GoldenFormat\GoldenInstanceProvider.cs" />
    121     <Compile Include="GoldenFormat\GoldenParser.cs" />
    122     <Compile Include="GoldenFormat\GoldenFormatInstanceProvider.cs" />
    123     <Compile Include="IVRPInstanceProvider.cs" />
    124     <Compile Include="StreamReaderHelper.cs" />
    125     <Compile Include="TaillardFormat\TaillardInstanceProvider.cs" />
    126     <Compile Include="TaillardFormat\TaillardParser.cs" />
    127     <Compile Include="TaillardFormat\TaillardFormatInstanceProvider.cs" />
    128     <Compile Include="TSPLibFormat\AugeratInstanceProvider.cs" />
    129     <Compile Include="TSPLibFormat\ChristofidesEilonInstanceProvider.cs" />
    130     <Compile Include="CordeauFormat\CordeauMDInstanceProvider.cs" />
    131     <Compile Include="CordeauFormat\CordeauFormatInstanceProvider.cs" />
    132     <Compile Include="LiLimFormat\LiLimInstanceProvider.cs" />
    133     <Compile Include="LiLimFormat\LiLimFormatInstanceProvider.cs" />
    134     <Compile Include="SolomonFormat\HombergerInstanceProvider.cs" />
    135     <Compile Include="LiLimFormat\LiLimParser.cs" />
    136     <Compile Include="CordeauFormat\CordeauParser.cs" />
    137     <Compile Include="SolomonFormat\SolomonInstanceProvider.cs" />
    138     <Compile Include="SolomonFormat\SolomonFormatInstanceProvider.cs" />
    139     <Compile Include="SolomonFormat\SolomonParser.cs" />
    140     <Compile Include="TSPLibFormat\TSPLibFormatInstanceProvider.cs" />
    141     <Compile Include="VRPInstanceProvider.cs" />
    142     <Compile Include="VRPDataDescriptor.cs" />
    143     <EmbeddedResource Include="Data\Augerat.opt.zip" />
    144     <EmbeddedResource Include="Data\Augerat.zip" />
    145     <EmbeddedResource Include="Data\ChristofidesEilon.opt.zip" />
    146     <EmbeddedResource Include="Data\ChristofidesEilon.zip" />
    147     <EmbeddedResource Include="Data\Solomon.zip" />
    148     <EmbeddedResource Include="Data\Homberger.zip" />
    149     <EmbeddedResource Include="Data\LiLim.zip" />
    150     <EmbeddedResource Include="Data\Golden.zip" />
    151     <EmbeddedResource Include="Data\Christofides.zip" />
    152     <EmbeddedResource Include="Data\Kytojoki.zip" />
    153     <EmbeddedResource Include="Data\Taillard.opt.zip" />
    154     <EmbeddedResource Include="Data\Taillard.zip" />
    155     <EmbeddedResource Include="Data\CordeauMD.zip" />
    156     <EmbeddedResource Include="Data\CordeauMDTW.zip" />
    157     <EmbeddedResource Include="Data\CordeauMD.opt.zip" />
    158     <EmbeddedResource Include="Data\CordeauMDTW.opt.zip" />
    159     <EmbeddedResource Include="Data\Homberger.opt.zip" />
    160     <EmbeddedResource Include="Data\Solomon.opt.zip" />
    161     <None Include="Plugin.cs.frame" />
    162     <Compile Include="Plugin.cs" />
    163     <Compile Include="Properties\AssemblyInfo.cs" />
    164     <None Include="Properties\AssemblyInfo.cs.frame" />
     18    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj" />
     19    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
     20    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.TSPLIB\3.3\HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj" />
     21    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj" />
    16522  </ItemGroup>
    166   <ItemGroup>
    167     <None Include="HeuristicLab.snk" />
    168   </ItemGroup>
    169   <ItemGroup>
    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.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    176       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    177       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    178       <Private>False</Private>
    179     </ProjectReference>
    180     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.TSPLIB\3.3\HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj">
    181       <Project>{CE0F99D6-1C56-48A9-9B68-3E5B833703EF}</Project>
    182       <Name>HeuristicLab.Problems.Instances.TSPLIB-3.3</Name>
    183       <Private>False</Private>
    184     </ProjectReference>
    185     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    186       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    187       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    188       <Private>False</Private>
    189     </ProjectReference>
    190   </ItemGroup>
    191   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    192   <PropertyGroup>
    193     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    194 set ProjectDir=$(ProjectDir)
    195 set SolutionDir=$(SolutionDir)
    196 set Outdir=$(Outdir)
    197 
    198 call PreBuildEvent.cmd</PreBuildEvent>
    199     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    200 export ProjectDir=$(ProjectDir)
    201 export SolutionDir=$(SolutionDir)
    202 
    203 $SolutionDir/PreBuildEvent.sh
    204 </PreBuildEvent>
     23  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     24    <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" />
     25  </Target>
     26  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     27    <OutputPath>..\..\bin\</OutputPath>
     28    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    20529  </PropertyGroup>
    206   <PropertyGroup>
    207     <PostBuildEvent>
    208     </PostBuildEvent>
    209   </PropertyGroup>
    210   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    211        Other similar extension points exist, see Microsoft.Common.targets.
    212   <Target Name="BeforeBuild">
    213   </Target>
    214   <Target Name="AfterBuild">
    215   </Target>
    216   -->
    21730</Project>
Note: See TracChangeset for help on using the changeset viewer.