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

Legend:

Unmodified
Added
Removed

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

    r11623 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>9.0.30729</ProductVersion>
    7     <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{E0B45023-CB84-48A1-A1B7-8295B64B7BAD}</ProjectGuid>
    9     <OutputType>Library</OutputType>
    10     <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Algorithms.EvolutionStrategy</RootNamespace>
    12     <AssemblyName>HeuristicLab.Algorithms.EvolutionStrategy-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    14     <TargetFrameworkProfile>
    15     </TargetFrameworkProfile>
    16     <FileAlignment>512</FileAlignment>
     4    <TargetFramework>netstandard2.0</TargetFramework>
     5    <Copyright>(c) 2002-2018 HEAL</Copyright>
     6    <Product>HeuristicLab</Product>
    177    <SignAssembly>true</SignAssembly>
    188    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    19     <FileUpgradeFlags>
    20     </FileUpgradeFlags>
    21     <OldToolsVersion>3.5</OldToolsVersion>
    22     <UpgradeBackupLocation />
    23     <PublishUrl>publish\</PublishUrl>
    24     <Install>true</Install>
    25     <InstallFrom>Disk</InstallFrom>
    26     <UpdateEnabled>false</UpdateEnabled>
    27     <UpdateMode>Foreground</UpdateMode>
    28     <UpdateInterval>7</UpdateInterval>
    29     <UpdateIntervalUnits>Days</UpdateIntervalUnits>
    30     <UpdatePeriodically>false</UpdatePeriodically>
    31     <UpdateRequired>false</UpdateRequired>
    32     <MapFileExtensions>true</MapFileExtensions>
    33     <ApplicationRevision>0</ApplicationRevision>
    34     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
    35     <IsWebBootstrapper>false</IsWebBootstrapper>
    36     <UseApplicationTrust>false</UseApplicationTrust>
    37     <BootstrapperEnabled>true</BootstrapperEnabled>
    38   </PropertyGroup>
    39   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    40     <DebugSymbols>true</DebugSymbols>
    41     <DebugType>full</DebugType>
    42     <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    44     <DefineConstants>DEBUG;TRACE</DefineConstants>
    45     <ErrorReport>prompt</ErrorReport>
    46     <WarningLevel>4</WarningLevel>
    47     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    48     <Prefer32Bit>false</Prefer32Bit>
    49   </PropertyGroup>
    50   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    51     <DebugType>pdbonly</DebugType>
    52     <Optimize>true</Optimize>
    53     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    54     <DefineConstants>TRACE</DefineConstants>
    55     <ErrorReport>prompt</ErrorReport>
    56     <WarningLevel>4</WarningLevel>
    57     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    58     <Prefer32Bit>false</Prefer32Bit>
    59   </PropertyGroup>
    60   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    61     <DebugSymbols>true</DebugSymbols>
    62     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    63     <DefineConstants>DEBUG;TRACE</DefineConstants>
    64     <DebugType>full</DebugType>
    65     <PlatformTarget>x86</PlatformTarget>
    66     <ErrorReport>prompt</ErrorReport>
    67     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    68     <Prefer32Bit>false</Prefer32Bit>
    69   </PropertyGroup>
    70   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    71     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    72     <DefineConstants>TRACE</DefineConstants>
    73     <Optimize>true</Optimize>
    74     <DebugType>pdbonly</DebugType>
    75     <PlatformTarget>x86</PlatformTarget>
    76     <ErrorReport>prompt</ErrorReport>
    77     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    78     <Prefer32Bit>false</Prefer32Bit>
    79   </PropertyGroup>
    80   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    81     <DebugSymbols>true</DebugSymbols>
    82     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    83     <DefineConstants>DEBUG;TRACE</DefineConstants>
    84     <DebugType>full</DebugType>
    85     <PlatformTarget>x64</PlatformTarget>
    86     <ErrorReport>prompt</ErrorReport>
    87     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    88     <Prefer32Bit>false</Prefer32Bit>
    89   </PropertyGroup>
    90   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    91     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    92     <DefineConstants>TRACE</DefineConstants>
    93     <Optimize>true</Optimize>
    94     <DebugType>pdbonly</DebugType>
    95     <PlatformTarget>x64</PlatformTarget>
    96     <ErrorReport>prompt</ErrorReport>
    97     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    98     <Prefer32Bit>false</Prefer32Bit>
     9    <AssemblyVersion>3.3.0.0</AssemblyVersion>
     10    <AssemblyFileVersion>3.3.15.0</AssemblyFileVersion>
     11    <RootNamespace>HeuristicLab.Algorithms.EvolutionStrategy</RootNamespace>
    9912  </PropertyGroup>
    10013  <ItemGroup>
    101     <Reference Include="System" />
    102     <Reference Include="System.Core">
    103       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    104     </Reference>
    105     <Reference Include="System.Xml.Linq">
    106       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    107     </Reference>
    108     <Reference Include="System.Data.DataSetExtensions">
    109       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    110     </Reference>
    111     <Reference Include="System.Data" />
    112     <Reference Include="System.Xml" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     15    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    11316  </ItemGroup>
    11417  <ItemGroup>
    115     <Compile Include="Plugin.cs" />
    116     <Compile Include="Properties\AssemblyInfo.cs" />
    117     <Compile Include="EvolutionStrategy.cs" />
    118     <Compile Include="EvolutionStrategyMainLoop.cs" />
    119     <Compile Include="WithoutRepeatingBatchedRandomSelector.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" />
     30    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj" />
    12031  </ItemGroup>
    121   <ItemGroup>
    122     <None Include="HeuristicLab.snk" />
    123     <None Include="Plugin.cs.frame" />
    124     <None Include="Properties\AssemblyInfo.cs.frame" />
    125   </ItemGroup>
    126   <ItemGroup>
    127     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    128       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    129       <Name>HeuristicLab.Analysis-3.3</Name>
    130       <Private>False</Private>
    131     </ProjectReference>
    132     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    133       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    134       <Name>HeuristicLab.Collections-3.3</Name>
    135       <Private>False</Private>
    136     </ProjectReference>
    137     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    138       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    139       <Name>HeuristicLab.Common-3.3</Name>
    140       <Private>False</Private>
    141     </ProjectReference>
    142     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    143       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    144       <Name>HeuristicLab.Core-3.3</Name>
    145       <Private>False</Private>
    146     </ProjectReference>
    147     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    148       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    149       <Name>HeuristicLab.Data-3.3</Name>
    150       <Private>False</Private>
    151     </ProjectReference>
    152     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    153       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    154       <Name>HeuristicLab.Operators-3.3</Name>
    155       <Private>False</Private>
    156     </ProjectReference>
    157     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    158       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    159       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    160       <Private>False</Private>
    161     </ProjectReference>
    162     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    163       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    164       <Name>HeuristicLab.Optimization-3.3</Name>
    165       <Private>False</Private>
    166     </ProjectReference>
    167     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    168       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    169       <Name>HeuristicLab.Parameters-3.3</Name>
    170       <Private>False</Private>
    171     </ProjectReference>
    172     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    173       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    174       <Name>HeuristicLab.Persistence-3.3</Name>
    175       <Private>False</Private>
    176     </ProjectReference>
    177     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    178       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    179       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    180       <Private>False</Private>
    181     </ProjectReference>
    182     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    183       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    184       <Name>HeuristicLab.Random-3.3</Name>
    185       <Private>False</Private>
    186     </ProjectReference>
    187     <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
    188       <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
    189       <Name>HeuristicLab.Selection-3.3</Name>
    190       <Private>False</Private>
    191     </ProjectReference>
    192   </ItemGroup>
    193   <ItemGroup>
    194     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    195       <Visible>False</Visible>
    196       <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
    197       <Install>false</Install>
    198     </BootstrapperPackage>
    199     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
    200       <Visible>False</Visible>
    201       <ProductName>.NET Framework 3.5 SP1</ProductName>
    202       <Install>true</Install>
    203     </BootstrapperPackage>
    204     <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
    205       <Visible>False</Visible>
    206       <ProductName>Windows Installer 3.1</ProductName>
    207       <Install>true</Install>
    208     </BootstrapperPackage>
    209   </ItemGroup>
    210   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    211   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    212        Other similar extension points exist, see Microsoft.Common.targets.
    213   <Target Name="BeforeBuild">
     32  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     33    <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" />
    21434  </Target>
    215   <Target Name="AfterBuild">
    216   </Target>
    217   -->
    218   <PropertyGroup>
    219     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    220 set ProjectDir=$(ProjectDir)
    221 set SolutionDir=$(SolutionDir)
    222 set Outdir=$(Outdir)
    223 
    224 call PreBuildEvent.cmd
    225 </PreBuildEvent>
    226     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    227 export ProjectDir=$(ProjectDir)
    228 export SolutionDir=$(SolutionDir)
    229 
    230 $SolutionDir/PreBuildEvent.sh
    231 </PreBuildEvent>
     35  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     36    <OutputPath>..\..\bin\</OutputPath>
     37    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    23238  </PropertyGroup>
    23339</Project>
Note: See TracChangeset for help on using the changeset viewer.