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

Legend:

Unmodified
Added
Removed

  • branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.ScatterSearch/3.3/HeuristicLab.Algorithms.ScatterSearch-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>8.0.30703</ProductVersion>
    7     <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}</ProjectGuid>
    9     <OutputType>Library</OutputType>
    10     <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>
    1111    <RootNamespace>HeuristicLab.Algorithms.ScatterSearch</RootNamespace>
    12     <AssemblyName>HeuristicLab.Algorithms.ScatterSearch-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    14     <FileAlignment>512</FileAlignment>
    15     <TargetFrameworkProfile />
    16   </PropertyGroup>
    17   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    18     <DebugSymbols>true</DebugSymbols>
    19     <DebugType>full</DebugType>
    20     <Optimize>false</Optimize>
    21     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    22     <DefineConstants>DEBUG;TRACE</DefineConstants>
    23     <ErrorReport>prompt</ErrorReport>
    24     <WarningLevel>4</WarningLevel>
    25     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    26     <Prefer32Bit>false</Prefer32Bit>
    27   </PropertyGroup>
    28   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    29     <DebugType>pdbonly</DebugType>
    30     <Optimize>true</Optimize>
    31     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    32     <DefineConstants>TRACE</DefineConstants>
    33     <ErrorReport>prompt</ErrorReport>
    34     <WarningLevel>4</WarningLevel>
    35     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    36     <Prefer32Bit>false</Prefer32Bit>
    37   </PropertyGroup>
    38   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    39     <DebugSymbols>true</DebugSymbols>
    40     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    41     <DefineConstants>DEBUG;TRACE</DefineConstants>
    42     <DebugType>full</DebugType>
    43     <PlatformTarget>x86</PlatformTarget>
    44     <ErrorReport>prompt</ErrorReport>
    45     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    46     <Prefer32Bit>false</Prefer32Bit>
    47   </PropertyGroup>
    48   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    49     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    50     <DefineConstants>TRACE</DefineConstants>
    51     <Optimize>true</Optimize>
    52     <DebugType>pdbonly</DebugType>
    53     <PlatformTarget>x86</PlatformTarget>
    54     <ErrorReport>prompt</ErrorReport>
    55     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    56     <Prefer32Bit>false</Prefer32Bit>
    57   </PropertyGroup>
    58   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    59     <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    61     <DefineConstants>DEBUG;TRACE</DefineConstants>
    62     <DebugType>full</DebugType>
    63     <PlatformTarget>x64</PlatformTarget>
    64     <ErrorReport>prompt</ErrorReport>
    65     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    66     <Prefer32Bit>false</Prefer32Bit>
    67   </PropertyGroup>
    68   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    69     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    70     <DefineConstants>TRACE</DefineConstants>
    71     <Optimize>true</Optimize>
    72     <DebugType>pdbonly</DebugType>
    73     <PlatformTarget>x64</PlatformTarget>
    74     <ErrorReport>prompt</ErrorReport>
    75     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    76     <Prefer32Bit>false</Prefer32Bit>
    77   </PropertyGroup>
    78   <PropertyGroup>
    79     <SignAssembly>true</SignAssembly>
    80   </PropertyGroup>
    81   <PropertyGroup>
    82     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    8312  </PropertyGroup>
    8413  <ItemGroup>
    85     <Reference Include="System" />
    86     <Reference Include="System.Core" />
    87     <Reference Include="System.Drawing" />
    88     <Reference Include="System.Xml.Linq" />
    89     <Reference Include="System.Data.DataSetExtensions" />
    90     <Reference Include="Microsoft.CSharp" />
    91     <Reference Include="System.Data" />
    92     <Reference Include="System.Xml" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     15    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    9316  </ItemGroup>
    9417  <ItemGroup>
    95     <Compile Include="OffspringProcessor.cs" />
    96     <None Include="HeuristicLab.snk" />
    97     <None Include="Plugin.cs.frame" />
    98     <Compile Include="Plugin.cs" />
    99     <Compile Include="Properties\AssemblyInfo.cs" />
    100     <None Include="Properties\AssemblyInfo.cs.frame" />
    101     <Compile Include="ReferenceSetUpdateMethod.cs" />
    102     <Compile Include="PopulationRebuildMethod.cs" />
    103     <Compile Include="ScatterSearch.cs" />
    104     <Compile Include="ScatterSearchMainLoop.cs" />
    105     <Compile Include="SolutionPoolUpdateMethod.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" />
    10631  </ItemGroup>
    10732  <ItemGroup>
    108     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    109       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    110       <Name>HeuristicLab.Analysis-3.3</Name>
    111       <Private>False</Private>
    112     </ProjectReference>
    113     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    114       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    115       <Name>HeuristicLab.Collections-3.3</Name>
    116       <Private>False</Private>
    117     </ProjectReference>
    118     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    119       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    120       <Name>HeuristicLab.Common-3.3</Name>
    121       <Private>False</Private>
    122     </ProjectReference>
    123     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    124       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    125       <Name>HeuristicLab.Core-3.3</Name>
    126       <Private>False</Private>
    127     </ProjectReference>
    128     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    129       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    130       <Name>HeuristicLab.Data-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.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    139       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    140       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    141       <Private>False</Private>
    142     </ProjectReference>
    143     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    144       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    145       <Name>HeuristicLab.Optimization-3.3</Name>
    146       <Private>False</Private>
    147     </ProjectReference>
    148     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    149       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    150       <Name>HeuristicLab.Parameters-3.3</Name>
    151       <Private>False</Private>
    152     </ProjectReference>
    153     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    154       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    155       <Name>HeuristicLab.Persistence-3.3</Name>
    156       <Private>False</Private>
    157     </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    159       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    160       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    161       <Private>False</Private>
    162     </ProjectReference>
    163     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    164       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    165       <Name>HeuristicLab.Random-3.3</Name>
    166       <Private>False</Private>
    167     </ProjectReference>
    168     <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
    169       <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
    170       <Name>HeuristicLab.Selection-3.3</Name>
    171       <Private>False</Private>
    172     </ProjectReference>
     33    <Reference Include="Microsoft.CSharp" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
    17334  </ItemGroup>
    174   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    175   <PropertyGroup>
    176     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    177 set ProjectDir=$(ProjectDir)
    178 set SolutionDir=$(SolutionDir)
    179 set Outdir=$(Outdir)
    180 
    181 call PreBuildEvent.cmd
    182 </PreBuildEvent>
    183     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    184 export ProjectDir=$(ProjectDir)
    185 export SolutionDir=$(SolutionDir)
    186 
    187 $SolutionDir/PreBuildEvent.sh
    188 </PreBuildEvent>
     35  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     36    <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" />
     37  </Target>
     38  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     39    <OutputPath>..\..\bin\</OutputPath>
     40    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    18941  </PropertyGroup>
    190   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    191        Other similar extension points exist, see Microsoft.Common.targets.
    192   <Target Name="BeforeBuild">
    193   </Target>
    194   <Target Name="AfterBuild">
    195   </Target>
    196   -->
    19742</Project>
Note: See TracChangeset for help on using the changeset viewer.