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

Legend:

Unmodified
Added
Removed

  • branches/2522_RefactorPluginInfrastructure/HeuristicLab.Problems.Instances.Orienteering/3.3/HeuristicLab.Problems.Instances.Orienteering-3.3.csproj

    r13008 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>{B37BF2DD-752C-456A-9DEF-FF5B41FC3C77}</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.Instances.Orienteering</RootNamespace>
    11     <AssemblyName>HeuristicLab.Problems.Instances.Orienteering-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    13     <FileAlignment>512</FileAlignment>
    14     <TargetFrameworkProfile />
    15   </PropertyGroup>
    16   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    17     <DebugSymbols>true</DebugSymbols>
    18     <DebugType>full</DebugType>
    19     <Optimize>false</Optimize>
    20     <OutputPath>..\..\bin\</OutputPath>
    21     <DefineConstants>DEBUG;TRACE</DefineConstants>
    22     <ErrorReport>prompt</ErrorReport>
    23     <WarningLevel>4</WarningLevel>
    24     <Prefer32Bit>false</Prefer32Bit>
    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     <Prefer32Bit>false</Prefer32Bit>
    34   </PropertyGroup>
    35   <PropertyGroup>
    36     <SignAssembly>true</SignAssembly>
    37   </PropertyGroup>
    38   <PropertyGroup>
    39     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    40   </PropertyGroup>
    41   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    42     <DebugSymbols>true</DebugSymbols>
    43     <OutputPath>..\..\bin\</OutputPath>
    44     <DefineConstants>DEBUG;TRACE</DefineConstants>
    45     <DebugType>full</DebugType>
    46     <PlatformTarget>x64</PlatformTarget>
    47     <ErrorReport>prompt</ErrorReport>
    48     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    49     <Prefer32Bit>false</Prefer32Bit>
    50   </PropertyGroup>
    51   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    52     <OutputPath>..\..\bin\</OutputPath>
    53     <DefineConstants>TRACE</DefineConstants>
    54     <Optimize>true</Optimize>
    55     <DebugType>pdbonly</DebugType>
    56     <PlatformTarget>x64</PlatformTarget>
    57     <ErrorReport>prompt</ErrorReport>
    58     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    59     <Prefer32Bit>false</Prefer32Bit>
    60   </PropertyGroup>
    61   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    62     <DebugSymbols>true</DebugSymbols>
    63     <OutputPath>..\..\bin\</OutputPath>
    64     <DefineConstants>DEBUG;TRACE</DefineConstants>
    65     <DebugType>full</DebugType>
    66     <PlatformTarget>x86</PlatformTarget>
    67     <ErrorReport>prompt</ErrorReport>
    68     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    69     <Prefer32Bit>false</Prefer32Bit>
    70   </PropertyGroup>
    71   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    72     <OutputPath>..\..\bin\</OutputPath>
    73     <DefineConstants>TRACE</DefineConstants>
    74     <Optimize>true</Optimize>
    75     <DebugType>pdbonly</DebugType>
    76     <PlatformTarget>x86</PlatformTarget>
    77     <ErrorReport>prompt</ErrorReport>
    78     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    79     <Prefer32Bit>false</Prefer32Bit>
    8012  </PropertyGroup>
    8113  <ItemGroup>
    82     <Reference Include="System" />
    83     <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" />
    8416  </ItemGroup>
    8517  <ItemGroup>
    86     <Compile Include="SchildeParser.cs" />
    87     <EmbeddedResource Include="Data\Schilde.zip" />
    88     <None Include="HeuristicLab.snk" />
    89     <None Include="Plugin.cs.frame" />
    90     <Compile Include="OPDataDescriptor.cs" />
    91     <Compile Include="SchildeInstanceProvider.cs" />
    92     <Compile Include="Plugin.cs" />
    93     <None Include="Properties\AssemblyInfo.cs.frame" />
    94     <Compile Include="Properties\AssemblyInfo.cs" />
     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\3.3\HeuristicLab.Problems.Instances-3.3.csproj" />
    9521  </ItemGroup>
    96   <ItemGroup>
    97     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    98       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    99       <Name>HeuristicLab.Common-3.3</Name>
    100     </ProjectReference>
    101     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    102       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    103       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    104     </ProjectReference>
    105     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    106       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    107       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    108     </ProjectReference>
    109   </ItemGroup>
    110   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    111   <PropertyGroup>
    112     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
    113       set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    114       set ProjectDir=$(ProjectDir)
    115       set SolutionDir=$(SolutionDir)
    116       set Outdir=$(Outdir)
    117 
    118       call PreBuildEvent.cmd
    119     </PreBuildEvent>
    120     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    121       export ProjectDir=$(ProjectDir)
    122       export SolutionDir=$(SolutionDir)
    123 
    124       $SolutionDir/PreBuildEvent.sh
    125     </PreBuildEvent>
     22  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     23    <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" />
     24  </Target>
     25  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     26    <OutputPath>..\..\bin\</OutputPath>
     27    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    12628  </PropertyGroup>
    127   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    128        Other similar extension points exist, see Microsoft.Common.targets.
    129   <Target Name="BeforeBuild">
    130   </Target>
    131   <Target Name="AfterBuild">
    132   </Target>
    133   -->
    13429</Project>
Note: See TracChangeset for help on using the changeset viewer.