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.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.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">
    3   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
    4   <PropertyGroup>
    5     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    6     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    7     <ProjectGuid>{3B90F866-70F8-43EF-A541-51819D255B7B}</ProjectGuid>
    8     <OutputType>Library</OutputType>
    9     <AppDesignerFolder>Properties</AppDesignerFolder>
     2<Project Sdk="Microsoft.NET.Sdk">
     3  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     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.4.0.0</AssemblyVersion>
     10    <AssemblyFileVersion>3.4.5.0</AssemblyFileVersion>
    1011    <RootNamespace>HeuristicLab.DataPreprocessing</RootNamespace>
    11     <AssemblyName>HeuristicLab.DataPreprocessing-3.4</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    13     <FileAlignment>512</FileAlignment>
    14     <TargetFrameworkProfile />
    15   </PropertyGroup>
    16   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    17     <DebugSymbols>true</DebugSymbols>
    18     <DebugType>full</DebugType>
    19     <Optimize>false</Optimize>
    20     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    21     <DefineConstants>DEBUG;TRACE</DefineConstants>
    22     <ErrorReport>prompt</ErrorReport>
    23     <WarningLevel>4</WarningLevel>
    24     <UseVSHostingProcess>false</UseVSHostingProcess>
    25     <Prefer32Bit>false</Prefer32Bit>
    26   </PropertyGroup>
    27   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    28     <DebugType>pdbonly</DebugType>
    29     <Optimize>true</Optimize>
    30     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    31     <DefineConstants>TRACE</DefineConstants>
    32     <ErrorReport>prompt</ErrorReport>
    33     <WarningLevel>4</WarningLevel>
    34     <Prefer32Bit>false</Prefer32Bit>
    35   </PropertyGroup>
    36   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    37     <PlatformTarget>x64</PlatformTarget>
    38     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    39     <DefineConstants>DEBUG;TRACE</DefineConstants>
    40     <Prefer32Bit>false</Prefer32Bit>
    41   </PropertyGroup>
    42   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    43     <PlatformTarget>x64</PlatformTarget>
    44     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    45     <Optimize>true</Optimize>
    46     <Prefer32Bit>false</Prefer32Bit>
    47   </PropertyGroup>
    48   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    49     <DebugSymbols>true</DebugSymbols>
    50     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    51     <DefineConstants>DEBUG;TRACE</DefineConstants>
    52     <DebugType>full</DebugType>
    53     <PlatformTarget>x86</PlatformTarget>
    54     <ErrorReport>prompt</ErrorReport>
    55     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    56     <Prefer32Bit>false</Prefer32Bit>
    57   </PropertyGroup>
    58   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    59     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    60     <DefineConstants>TRACE</DefineConstants>
    61     <Optimize>true</Optimize>
    62     <DebugType>pdbonly</DebugType>
    63     <PlatformTarget>x86</PlatformTarget>
    64     <ErrorReport>prompt</ErrorReport>
    65     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    66     <Prefer32Bit>false</Prefer32Bit>
    67   </PropertyGroup>
    68   <PropertyGroup>
    69     <SignAssembly>true</SignAssembly>
    70   </PropertyGroup>
    71   <PropertyGroup>
    72     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    7312  </PropertyGroup>
    7413  <ItemGroup>
    75     <Reference Include="System" />
    76     <Reference Include="System.Core" />
    77     <Reference Include="System.Drawing" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
    7815  </ItemGroup>
    7916  <ItemGroup>
    80     <Compile Include="Content\MultiScatterPlotContent.cs" />
    81     <Compile Include="Content\PreprocessingContent.cs" />
    82     <Compile Include="Content\SingleScatterPlotContent.cs" />
    83     <Compile Include="Content\ScatterPlotContent.cs" />
    84     <Compile Include="Content\DataCompletenessChartContent.cs" />
    85     <Compile Include="Data\FilteredPreprocessingData.cs" />
    86     <Compile Include="Content\ManipulationContent.cs" />
    87     <Compile Include="Content\PreprocessingChartContent.cs" />
    88     <Compile Include="Data\PreprocessingData.cs" />
    89     <Compile Include="Data\IFilteredPreprocessingData.cs" />
    90     <Compile Include="Content\CorrelationMatrixContent.cs" />
    91     <Compile Include="PreprocessingTransformator.cs" />
    92     <Compile Include="Data\DataPreprocessingChangedEvent.cs" />
    93     <Compile Include="Filter\ComparisonFilter.cs" />
    94     <Compile Include="Filter\IFilter.cs" />
    95     <Compile Include="Data\IPreprocessingData.cs" />
    96     <Compile Include="Content\FilterContent.cs" />
    97     <Compile Include="Content\HistogramContent.cs" />
    98     <Compile Include="Content\LineChartContent.cs" />
    99     <Compile Include="Content\StatisticsContent.cs" />
    100     <Compile Include="Content\TransformationContent.cs" />
    101     <Compile Include="Content\IViewShortcut.cs" />
    102     <Compile Include="ProblemDataCreator.cs" />
    103     <None Include="Plugin.cs.frame" />
    104     <Compile Include="Content\DataGridContent.cs" />
    105     <Compile Include="PreprocessingContext.cs" />
    106     <Compile Include="Plugin.cs" />
    107     <Compile Include="Properties\AssemblyInfo.cs" />
    108     <None Include="Properties\AssemblyInfo.cs.frame" />
     17    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj" />
     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.Data\3.3\HeuristicLab.Data-3.3.csproj" />
     23    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj" />
     24    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj" />
     25    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
     26    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj" />
     27    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj" />
     28    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj" />
    10929  </ItemGroup>
    11030  <ItemGroup>
    111     <None Include="HeuristicLab.snk" />
     31    <Reference Include="Microsoft.Win32.Registry, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     32      <HintPath>..\..\packages\Microsoft.Win32.Registry.4.5.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
     33    </Reference>
     34    <Reference Include="Microsoft.Win32.Registry.AccessControl, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     35      <HintPath>..\..\packages\Microsoft.Win32.Registry.AccessControl.4.5.0\lib\net461\Microsoft.Win32.Registry.AccessControl.dll</HintPath>
     36    </Reference>
     37    <Reference Include="WindowsBase" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
    11238  </ItemGroup>
    113   <ItemGroup>
    114     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    115       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    116       <Name>HeuristicLab.Analysis-3.3</Name>
    117       <Private>False</Private>
    118     </ProjectReference>
    119     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    120       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    121       <Name>HeuristicLab.Collections-3.3</Name>
    122       <Private>False</Private>
    123     </ProjectReference>
    124     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    125       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    126       <Name>HeuristicLab.Common.Resources-3.3</Name>
    127       <Private>False</Private>
    128     </ProjectReference>
    129     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    130       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    131       <Name>HeuristicLab.Common-3.3</Name>
    132       <Private>False</Private>
    133     </ProjectReference>
    134     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    135       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    136       <Name>HeuristicLab.Core-3.3</Name>
    137       <Private>False</Private>
    138     </ProjectReference>
    139     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    140       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    141       <Name>HeuristicLab.Data-3.3</Name>
    142       <Private>False</Private>
    143     </ProjectReference>
    144     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    145       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    146       <Name>HeuristicLab.Optimization-3.3</Name>
    147       <Private>False</Private>
    148     </ProjectReference>
    149     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    150       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    151       <Name>HeuristicLab.Persistence-3.3</Name>
    152       <Private>False</Private>
    153     </ProjectReference>
    154     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    155       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    156       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    157       <Private>False</Private>
    158     </ProjectReference>
    159     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    160       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    161       <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    162       <Private>False</Private>
    163     </ProjectReference>
    164     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    165       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    166       <Name>HeuristicLab.Random-3.3</Name>
    167       <Private>False</Private>
    168     </ProjectReference>
    169     <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    170       <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    171       <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    172       <Private>False</Private>
    173     </ProjectReference>
    174   </ItemGroup>
    175   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    176   <PropertyGroup>
    177     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    178 set ProjectDir=$(ProjectDir)
    179 set SolutionDir=$(SolutionDir)
    180 set Outdir=$(Outdir)
    181 
    182 call PreBuildEvent.cmd
    183 </PreBuildEvent>
    184     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    185 export ProjectDir=$(ProjectDir)
    186 export SolutionDir=$(SolutionDir)
    187 
    188 $SolutionDir/PreBuildEvent.sh
    189 </PreBuildEvent>
     39  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     40    <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" />
     41  </Target>
     42  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     43    <OutputPath>..\..\bin\</OutputPath>
     44    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    19045  </PropertyGroup>
    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">
    194   </Target>
    195   <Target Name="AfterBuild">
    196   </Target>
    197   -->
    19846</Project>
Note: See TracChangeset for help on using the changeset viewer.