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