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

Legend:

Unmodified
Added
Removed

  • branches/2522_RefactorPluginInfrastructure/HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-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>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</ProjectGuid>
    9     <OutputType>Library</OutputType>
    10     <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Parameters</RootNamespace>
    12     <AssemblyName>HeuristicLab.Parameters-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     <DocumentationFile>
    58     </DocumentationFile>
    59     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    60     <Prefer32Bit>false</Prefer32Bit>
    61   </PropertyGroup>
    62   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    63     <DebugSymbols>true</DebugSymbols>
    64     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    65     <DefineConstants>DEBUG;TRACE</DefineConstants>
    66     <DebugType>full</DebugType>
    67     <PlatformTarget>x64</PlatformTarget>
    68     <ErrorReport>prompt</ErrorReport>
    69     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    70     <Prefer32Bit>false</Prefer32Bit>
    71   </PropertyGroup>
    72   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    73     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    74     <DefineConstants>TRACE</DefineConstants>
    75     <DocumentationFile>
    76     </DocumentationFile>
    77     <Optimize>true</Optimize>
    78     <DebugType>pdbonly</DebugType>
    79     <PlatformTarget>x64</PlatformTarget>
    80     <ErrorReport>prompt</ErrorReport>
    81     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    82     <Prefer32Bit>false</Prefer32Bit>
    83   </PropertyGroup>
    84   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    85     <DebugSymbols>true</DebugSymbols>
    86     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    87     <DefineConstants>DEBUG;TRACE</DefineConstants>
    88     <DebugType>full</DebugType>
    89     <PlatformTarget>x86</PlatformTarget>
    90     <ErrorReport>prompt</ErrorReport>
    91     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    92     <Prefer32Bit>false</Prefer32Bit>
    93   </PropertyGroup>
    94   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    95     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    96     <DefineConstants>TRACE</DefineConstants>
    97     <DocumentationFile>
    98     </DocumentationFile>
    99     <Optimize>true</Optimize>
    100     <DebugType>pdbonly</DebugType>
    101     <PlatformTarget>x86</PlatformTarget>
    102     <ErrorReport>prompt</ErrorReport>
    103     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    104     <Prefer32Bit>false</Prefer32Bit>
     9    <AssemblyVersion>3.3.0.0</AssemblyVersion>
     10    <AssemblyFileVersion>3.3.15.0</AssemblyFileVersion>
     11    <RootNamespace>HeuristicLab.Parameters</RootNamespace>
    10512  </PropertyGroup>
    10613  <ItemGroup>
    107     <Reference Include="System" />
    108     <Reference Include="System.Core">
    109       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    110     </Reference>
    111     <Reference Include="System.Drawing" />
    112     <Reference Include="System.Xml.Linq">
    113       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    114     </Reference>
    115     <Reference Include="System.Data.DataSetExtensions">
    116       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    117     </Reference>
    118     <Reference Include="System.Data" />
    119     <Reference Include="System.Xml" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     15    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    12016  </ItemGroup>
    12117  <ItemGroup>
    122     <None Include="Plugin.cs.frame" />
    123     <Compile Include="ConstrainedValueParameter.cs" />
    124     <Compile Include="FixedValueParameter.cs" />
    125     <Compile Include="OptionalConstrainedValueParameter.cs" />
    126     <Compile Include="Plugin.cs" />
    127     <Compile Include="ScopeTreeLookupParameter.cs" />
    128     <Compile Include="ValueParameter.cs" />
    129     <Compile Include="LookupParameter.cs" />
    130     <Compile Include="OptionalValueParameter.cs" />
    131     <Compile Include="ValueLookupParameter.cs" />
    132     <Compile Include="ScopeParameter.cs" />
    133     <Compile Include="OperatorParameter.cs" />
    134     <Compile Include="Parameter.cs" />
    135     <Compile Include="Properties\AssemblyInfo.cs" />
     18    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj" />
     19    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-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.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj" />
     23    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
    13624  </ItemGroup>
    137   <ItemGroup>
    138     <None Include="HeuristicLab.snk" />
    139     <None Include="Properties\AssemblyInfo.cs.frame" />
    140   </ItemGroup>
    141   <ItemGroup>
    142     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    143       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    144       <Name>HeuristicLab.Collections-3.3</Name>
    145       <Private>False</Private>
    146     </ProjectReference>
    147     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    148       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    149       <Name>HeuristicLab.Common.Resources-3.3</Name>
    150       <Private>False</Private>
    151     </ProjectReference>
    152     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    153       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    154       <Name>HeuristicLab.Common-3.3</Name>
    155       <Private>False</Private>
    156     </ProjectReference>
    157     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    158       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    159       <Name>HeuristicLab.Core-3.3</Name>
    160       <Private>False</Private>
    161     </ProjectReference>
    162     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    163       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    164       <Name>HeuristicLab.Persistence-3.3</Name>
    165       <Private>False</Private>
    166     </ProjectReference>
    167     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    168       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    169       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    170       <Private>False</Private>
    171     </ProjectReference>
    172   </ItemGroup>
    173   <ItemGroup>
    174     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    175       <Visible>False</Visible>
    176       <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
    177       <Install>false</Install>
    178     </BootstrapperPackage>
    179     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
    180       <Visible>False</Visible>
    181       <ProductName>.NET Framework 3.5 SP1</ProductName>
    182       <Install>true</Install>
    183     </BootstrapperPackage>
    184     <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
    185       <Visible>False</Visible>
    186       <ProductName>Windows Installer 3.1</ProductName>
    187       <Install>true</Install>
    188     </BootstrapperPackage>
    189   </ItemGroup>
    190   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    191   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    192        Other similar extension points exist, see Microsoft.Common.targets.
    193   <Target Name="BeforeBuild">
     25  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     26    <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" />
    19427  </Target>
    195   <Target Name="AfterBuild">
    196   </Target>
    197   -->
    198   <PropertyGroup>
    199     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    200 set ProjectDir=$(ProjectDir)
    201 set SolutionDir=$(SolutionDir)
    202 set Outdir=$(Outdir)
    203 
    204 call PreBuildEvent.cmd
    205 </PreBuildEvent>
    206     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    207 export ProjectDir=$(ProjectDir)
    208 export SolutionDir=$(SolutionDir)
    209 
    210 $SolutionDir/PreBuildEvent.sh
    211 </PreBuildEvent>
     28  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     29    <OutputPath>..\..\bin\</OutputPath>
     30    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    21231  </PropertyGroup>
    21332</Project>
Note: See TracChangeset for help on using the changeset viewer.