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
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.RandomSearch/3.3/HeuristicLab.Algorithms.RandomSearch-3.3.csproj

    r13863 r16143  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="14.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>{4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}</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.Algorithms.RandomSearch</RootNamespace>
    11     <AssemblyName>HeuristicLab.Algorithms.RandomSearch-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   </PropertyGroup>
    24   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    25     <DebugType>pdbonly</DebugType>
    26     <Optimize>true</Optimize>
    27     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    28     <DefineConstants>TRACE</DefineConstants>
    29     <ErrorReport>prompt</ErrorReport>
    30     <WarningLevel>4</WarningLevel>
    31   </PropertyGroup>
    32   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    33     <DebugSymbols>true</DebugSymbols>
    34     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    35     <DefineConstants>DEBUG;TRACE</DefineConstants>
    36     <DebugType>full</DebugType>
    37     <PlatformTarget>x64</PlatformTarget>
    38     <ErrorReport>prompt</ErrorReport>
    39     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    40   </PropertyGroup>
    41   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    42     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    43     <DefineConstants>TRACE</DefineConstants>
    44     <Optimize>true</Optimize>
    45     <DebugType>pdbonly</DebugType>
    46     <PlatformTarget>x64</PlatformTarget>
    47     <ErrorReport>prompt</ErrorReport>
    48     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    49   </PropertyGroup>
    50   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    51     <DebugSymbols>true</DebugSymbols>
    52     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    53     <DefineConstants>DEBUG;TRACE</DefineConstants>
    54     <DebugType>full</DebugType>
    55     <PlatformTarget>x86</PlatformTarget>
    56     <ErrorReport>prompt</ErrorReport>
    57     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    58   </PropertyGroup>
    59   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    60     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    61     <DefineConstants>TRACE</DefineConstants>
    62     <Optimize>true</Optimize>
    63     <DebugType>pdbonly</DebugType>
    64     <PlatformTarget>x86</PlatformTarget>
    65     <ErrorReport>prompt</ErrorReport>
    66     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    67   </PropertyGroup>
    68   <PropertyGroup>
    69     <SignAssembly>true</SignAssembly>
    70   </PropertyGroup>
    71   <PropertyGroup>
    72     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    7312  </PropertyGroup>
    7413  <ItemGroup>
    75     <Reference Include="System" />
    76     <Reference Include="System.Core" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     15    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    7716  </ItemGroup>
    7817  <ItemGroup>
    79     <Compile Include="RandomSearchAlgorithm.cs" />
    80     <None Include="HeuristicLab.snk" />
    81     <None Include="Plugin.cs.frame" />
    82     <Compile Include="Plugin.cs" />
    83     <None Include="Properties\AssemblyInfo.cs.frame" />
    84     <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.Operators\3.3\HeuristicLab.Operators-3.3.csproj" />
     24    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj" />
     25    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj" />
     26    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj" />
     27    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj" />
     28    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
     29    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj" />
    8530  </ItemGroup>
    86   <ItemGroup>
    87     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    88       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    89       <Name>HeuristicLab.Analysis-3.3</Name>
    90     </ProjectReference>
    91     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    92       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    93       <Name>HeuristicLab.Collections-3.3</Name>
    94     </ProjectReference>
    95     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    96       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    97       <Name>HeuristicLab.Common-3.3</Name>
    98     </ProjectReference>
    99     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    100       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    101       <Name>HeuristicLab.Core-3.3</Name>
    102     </ProjectReference>
    103     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    104       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    105       <Name>HeuristicLab.Data-3.3</Name>
    106     </ProjectReference>
    107     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    108       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    109       <Name>HeuristicLab.Operators-3.3</Name>
    110     </ProjectReference>
    111     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    112       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    113       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    114     </ProjectReference>
    115     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    116       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    117       <Name>HeuristicLab.Optimization-3.3</Name>
    118     </ProjectReference>
    119     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    120       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    121       <Name>HeuristicLab.Parameters-3.3</Name>
    122     </ProjectReference>
    123     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    124       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    125       <Name>HeuristicLab.Persistence-3.3</Name>
    126     </ProjectReference>
    127     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    128       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
    129       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    130     </ProjectReference>
    131     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    132       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    133       <Name>HeuristicLab.Random-3.3</Name>
    134     </ProjectReference>
    135   </ItemGroup>
    136   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    137   <PropertyGroup>
    138     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
    139       set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    140       set ProjectDir=$(ProjectDir)
    141       set SolutionDir=$(SolutionDir)
    142       set Outdir=$(Outdir)
    143 
    144       call PreBuildEvent.cmd
    145     </PreBuildEvent>
    146     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    147       export ProjectDir=$(ProjectDir)
    148       export SolutionDir=$(SolutionDir)
    149 
    150       $SolutionDir/PreBuildEvent.sh
    151     </PreBuildEvent>
     31  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     32    <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" />
     33  </Target>
     34  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     35    <OutputPath>..\..\bin\</OutputPath>
     36    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    15237  </PropertyGroup>
    153   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    154        Other similar extension points exist, see Microsoft.Common.targets.
    155   <Target Name="BeforeBuild">
    156   </Target>
    157   <Target Name="AfterBuild">
    158   </Target>
    159   -->
    16038</Project>
Note: See TracChangeset for help on using the changeset viewer.