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.ExternalEvaluation.Matlab/3.3/HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.csproj

    r11723 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>{362A5DC3-969D-43FB-A552-D2F52B780188}</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.ExternalEvaluation.Matlab</RootNamespace>
    11     <AssemblyName>HeuristicLab.Problems.ExternalEvaluation.Matlab-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="Interop.MLApp">
     14    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     15    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     16    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
     17  </ItemGroup>
     18  <ItemGroup>
     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\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.Problems.ParameterOptimization\3.3\HeuristicLab.Problems.ParameterOptimization-3.3.csproj" />
     30  </ItemGroup>
     31  <ItemGroup>
     32    <Reference Include="Interop.MLApp" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    8333      <HintPath>..\..\bin\Interop.MLApp.dll</HintPath>
    8434      <EmbedInteropTypes>True</EmbedInteropTypes>
    8535    </Reference>
    86     <Reference Include="System" />
    87     <Reference Include="System.Core" />
    88     <Reference Include="System.Drawing" />
    89     <Reference Include="System.Windows.Forms" />
    90     <Reference Include="System.Xml.Linq" />
    91     <Reference Include="System.Data.DataSetExtensions" />
    92     <Reference Include="Microsoft.CSharp" />
    93     <Reference Include="System.Data" />
    94     <Reference Include="System.Xml" />
     36    <Reference Include="Microsoft.CSharp" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
    9537  </ItemGroup>
    96   <ItemGroup>
    97     <Compile Include="MatlabParameterOptimizationProblem.cs" />
    98     <Compile Include="MatlabParameterVectorEvaluator.cs" />
    99     <Compile Include="Plugin.cs" />
    100     <Compile Include="Properties\AssemblyInfo.cs" />
    101   </ItemGroup>
    102   <ItemGroup>
    103     <None Include="HeuristicLab.snk" />
    104     <None Include="Plugin.cs.frame" />
    105     <None Include="Properties\AssemblyInfo.cs.frame" />
    106   </ItemGroup>
    107   <ItemGroup>
    108     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    109       <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
    110       <Name>HeuristicLab.Collections-3.3</Name>
    111       <Private>False</Private>
    112     </ProjectReference>
    113     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    114       <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
    115       <Name>HeuristicLab.Common-3.3</Name>
    116       <Private>False</Private>
    117     </ProjectReference>
    118     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    119       <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
    120       <Name>HeuristicLab.Core-3.3</Name>
    121       <Private>False</Private>
    122     </ProjectReference>
    123     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    124       <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
    125       <Name>HeuristicLab.Data-3.3</Name>
    126       <Private>False</Private>
    127     </ProjectReference>
    128     <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
    129       <Project>{bb6d334a-4bb6-4674-9883-31a6ebb32cab}</Project>
    130       <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
    131       <Private>False</Private>
    132     </ProjectReference>
    133     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    134       <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
    135       <Name>HeuristicLab.Operators-3.3</Name>
    136       <Private>False</Private>
    137     </ProjectReference>
    138     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    139       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    140       <Name>HeuristicLab.Optimization-3.3</Name>
    141       <Private>False</Private>
    142     </ProjectReference>
    143     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    144       <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
    145       <Name>HeuristicLab.Parameters-3.3</Name>
    146       <Private>False</Private>
    147     </ProjectReference>
    148     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    149       <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
    150       <Name>HeuristicLab.Persistence-3.3</Name>
    151       <Private>False</Private>
    152     </ProjectReference>
    153     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    154       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
    155       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    156       <Private>False</Private>
    157     </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.Problems.ParameterOptimization\3.3\HeuristicLab.Problems.ParameterOptimization-3.3.csproj">
    159       <Project>{d2c39fba-a1d5-403a-9211-b0a299a76313}</Project>
    160       <Name>HeuristicLab.Problems.ParameterOptimization-3.3</Name>
    161       <Private>False</Private>
    162     </ProjectReference>
    163   </ItemGroup>
    164   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    165   <PropertyGroup>
    166     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
    167       set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    168       set ProjectDir=$(ProjectDir)
    169       set SolutionDir=$(SolutionDir)
    170       set Outdir=$(Outdir)
    171 
    172       call PreBuildEvent.cmd
    173     </PreBuildEvent>
    174     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    175       export ProjectDir=$(ProjectDir)
    176       export SolutionDir=$(SolutionDir)
    177 
    178       $SolutionDir/PreBuildEvent.sh
    179     </PreBuildEvent>
     38  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     39    <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" />
     40  </Target>
     41  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     42    <OutputPath>..\..\bin\</OutputPath>
     43    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    18044  </PropertyGroup>
    181   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    182        Other similar extension points exist, see Microsoft.Common.targets.
    183   <Target Name="BeforeBuild">
    184   </Target>
    185   <Target Name="AfterBuild">
    186   </Target>
    187   -->
    18845</Project>
Note: See TracChangeset for help on using the changeset viewer.