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.Problems.ParameterOptimization/3.3/HeuristicLab.Problems.ParameterOptimization-3.3.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">
    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>{D2C39FBA-A1D5-403A-9211-B0A299A76313}</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.ParameterOptimization</RootNamespace>
    11     <AssemblyName>HeuristicLab.Problems.ParameterOptimization-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.Core" />
    84     <Reference Include="System.Drawing" />
    85     <Reference Include="System.Xml.Linq" />
    86     <Reference Include="System.Data.DataSetExtensions" />
    87     <Reference Include="Microsoft.CSharp" />
    88     <Reference Include="System.Data" />
    89     <Reference Include="System.Xml" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     15    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    9016  </ItemGroup>
    9117  <ItemGroup>
    92     <Compile Include="BestSolutionAnalyzer.cs" />
    93     <Compile Include="BestSolutionsAnalyzer.cs" />
    94     <Compile Include="IParameterVectorEvaluator.cs" />
    95     <Compile Include="ParameterOptimizationProblem.cs" />
    96     <Compile Include="Plugin.cs" />
    97     <Compile Include="Properties\AssemblyInfo.cs" />
    98     <Compile Include="ParameterVectorEvaluator.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.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj" />
     24    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj" />
     25    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj" />
     26    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj" />
     27    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj" />
     28    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj" />
     29    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
    9930  </ItemGroup>
    10031  <ItemGroup>
    101     <None Include="HeuristicLab.snk" />
    102     <None Include="Plugin.cs.frame" />
    103     <None Include="Properties\AssemblyInfo.cs.frame" />
     32    <Reference Include="Microsoft.CSharp" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
    10433  </ItemGroup>
    105   <ItemGroup>
    106     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    107       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    108       <Name>HeuristicLab.Analysis-3.3</Name>
    109       <Private>False</Private>
    110     </ProjectReference>
    111     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    112       <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
    113       <Name>HeuristicLab.Collections-3.3</Name>
    114       <Private>False</Private>
    115     </ProjectReference>
    116     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    117       <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
    118       <Name>HeuristicLab.Common-3.3</Name>
    119       <Private>False</Private>
    120     </ProjectReference>
    121     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    122       <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
    123       <Name>HeuristicLab.Core-3.3</Name>
    124       <Private>False</Private>
    125     </ProjectReference>
    126     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    127       <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
    128       <Name>HeuristicLab.Data-3.3</Name>
    129       <Private>False</Private>
    130     </ProjectReference>
    131     <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
    132       <Project>{bb6d334a-4bb6-4674-9883-31a6ebb32cab}</Project>
    133       <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
    134       <Private>False</Private>
    135     </ProjectReference>
    136     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    137       <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
    138       <Name>HeuristicLab.Operators-3.3</Name>
    139       <Private>False</Private>
    140     </ProjectReference>
    141     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    142       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    143       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    144       <Private>False</Private>
    145     </ProjectReference>
    146     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    147       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    148       <Name>HeuristicLab.Optimization-3.3</Name>
    149       <Private>False</Private>
    150     </ProjectReference>
    151     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    152       <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
    153       <Name>HeuristicLab.Parameters-3.3</Name>
    154       <Private>False</Private>
    155     </ProjectReference>
    156     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    157       <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
    158       <Name>HeuristicLab.Persistence-3.3</Name>
    159       <Private>False</Private>
    160     </ProjectReference>
    161     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    162       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
    163       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    164       <Private>False</Private>
    165     </ProjectReference>
    166   </ItemGroup>
    167   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    168   <PropertyGroup>
    169     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
    170       set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    171       set ProjectDir=$(ProjectDir)
    172       set SolutionDir=$(SolutionDir)
    173       set Outdir=$(Outdir)
    174 
    175       call PreBuildEvent.cmd
    176     </PreBuildEvent>
    177     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    178       export ProjectDir=$(ProjectDir)
    179       export SolutionDir=$(SolutionDir)
    180 
    181       $SolutionDir/PreBuildEvent.sh
    182     </PreBuildEvent>
     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" />
     36  </Target>
     37  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     38    <OutputPath>..\..\bin\</OutputPath>
     39    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    18340  </PropertyGroup>
    184   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    185        Other similar extension points exist, see Microsoft.Common.targets.
    186   <Target Name="BeforeBuild">
    187   </Target>
    188   <Target Name="AfterBuild">
    189   </Target>
    190   -->
    19141</Project>
Note: See TracChangeset for help on using the changeset viewer.