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.SequentialEngine/3.3/HeuristicLab.SequentialEngine-3.3.csproj

    r11623 r16143  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
     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>{DC3D7072-7999-4719-B65D-3997744D5DC1}</ProjectGuid>
    9     <OutputType>Library</OutputType>
    10     <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.SequentialEngine</RootNamespace>
    12     <AssemblyName>HeuristicLab.SequentialEngine-3.3</AssemblyName>
     4    <TargetFramework>netstandard2.0</TargetFramework>
     5    <Copyright>(c) 2002-2018 HEAL</Copyright>
     6    <Product>HeuristicLab</Product>
    137    <SignAssembly>true</SignAssembly>
    148    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    15     <FileUpgradeFlags>
    16     </FileUpgradeFlags>
    17     <OldToolsVersion>3.5</OldToolsVersion>
    18     <UpgradeBackupLocation>
    19     </UpgradeBackupLocation>
    20     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    21     <TargetFrameworkProfile>
    22     </TargetFrameworkProfile>
    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     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
    58     <DocumentationFile>
    59     </DocumentationFile>
    60     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    61     <Prefer32Bit>false</Prefer32Bit>
    62   </PropertyGroup>
    63   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    64     <DebugSymbols>true</DebugSymbols>
    65     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    66     <DefineConstants>DEBUG;TRACE</DefineConstants>
    67     <DebugType>full</DebugType>
    68     <PlatformTarget>x86</PlatformTarget>
    69     <ErrorReport>prompt</ErrorReport>
    70     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    71     <Prefer32Bit>false</Prefer32Bit>
    72   </PropertyGroup>
    73   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    74     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    75     <DefineConstants>TRACE</DefineConstants>
    76     <DocumentationFile>
    77     </DocumentationFile>
    78     <Optimize>true</Optimize>
    79     <DebugType>pdbonly</DebugType>
    80     <PlatformTarget>x86</PlatformTarget>
    81     <ErrorReport>prompt</ErrorReport>
    82     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    83     <Prefer32Bit>false</Prefer32Bit>
    84   </PropertyGroup>
    85   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    86     <DebugSymbols>true</DebugSymbols>
    87     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    88     <DefineConstants>DEBUG;TRACE</DefineConstants>
    89     <DebugType>full</DebugType>
    90     <PlatformTarget>x64</PlatformTarget>
    91     <ErrorReport>prompt</ErrorReport>
    92     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    93     <Prefer32Bit>false</Prefer32Bit>
    94   </PropertyGroup>
    95   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    96     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    97     <DefineConstants>TRACE</DefineConstants>
    98     <DocumentationFile>
    99     </DocumentationFile>
    100     <Optimize>true</Optimize>
    101     <DebugType>pdbonly</DebugType>
    102     <PlatformTarget>x64</PlatformTarget>
    103     <ErrorReport>prompt</ErrorReport>
    104     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    105     <Prefer32Bit>false</Prefer32Bit>
     9    <AssemblyVersion>3.3.0.0</AssemblyVersion>
     10    <AssemblyFileVersion>3.3.15.0</AssemblyFileVersion>
     11    <RootNamespace>HeuristicLab.SequentialEngine</RootNamespace>
    10612  </PropertyGroup>
    10713  <ItemGroup>
    108     <Reference Include="System" />
    109     <Reference Include="System.Core">
    110       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    111     </Reference>
    112     <Reference Include="System.Data" />
    113     <Reference Include="System.Xml" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     15    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    11416  </ItemGroup>
    11517  <ItemGroup>
    116     <None Include="Plugin.cs.frame" />
    117     <Compile Include="Plugin.cs" />
    118     <Compile Include="Properties\AssemblyInfo.cs" />
    119     <Compile Include="SequentialEngine.cs" />
     18    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj" />
     19    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj" />
     20    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj" />
     21    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
    12022  </ItemGroup>
    121   <ItemGroup>
    122     <None Include="HeuristicLab.snk" />
    123     <None Include="Properties\AssemblyInfo.cs.frame" />
    124   </ItemGroup>
    125   <ItemGroup>
    126     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    127       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    128       <Name>HeuristicLab.Common-3.3</Name>
    129       <Private>False</Private>
    130     </ProjectReference>
    131     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    132       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    133       <Name>HeuristicLab.Core-3.3</Name>
    134       <Private>False</Private>
    135     </ProjectReference>
    136     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    137       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    138       <Name>HeuristicLab.Persistence-3.3</Name>
    139       <Private>False</Private>
    140     </ProjectReference>
    141     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    142       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    143       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    144       <Private>False</Private>
    145     </ProjectReference>
    146   </ItemGroup>
    147   <ItemGroup>
    148     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    149       <Visible>False</Visible>
    150       <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
    151       <Install>false</Install>
    152     </BootstrapperPackage>
    153     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
    154       <Visible>False</Visible>
    155       <ProductName>.NET Framework 3.5 SP1</ProductName>
    156       <Install>true</Install>
    157     </BootstrapperPackage>
    158     <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
    159       <Visible>False</Visible>
    160       <ProductName>Windows Installer 3.1</ProductName>
    161       <Install>true</Install>
    162     </BootstrapperPackage>
    163   </ItemGroup>
    164   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    165   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    166        Other similar extension points exist, see Microsoft.Common.targets.
    167   <Target Name="BeforeBuild">
     23  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     24    <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" />
    16825  </Target>
    169   <Target Name="AfterBuild">
    170   </Target>
    171   -->
    172   <PropertyGroup>
    173     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    174 set ProjectDir=$(ProjectDir)
    175 set SolutionDir=$(SolutionDir)
    176 set Outdir=$(Outdir)
    177 
    178 call PreBuildEvent.cmd
    179 </PreBuildEvent>
    180     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    181 export ProjectDir=$(ProjectDir)
    182 export SolutionDir=$(SolutionDir)
    183 
    184 $SolutionDir/PreBuildEvent.sh
    185 </PreBuildEvent>
     26  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     27    <OutputPath>..\..\bin\</OutputPath>
     28    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    18629  </PropertyGroup>
    18730</Project>
Note: See TracChangeset for help on using the changeset viewer.