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

Legend:

Unmodified
Added
Removed

  • branches/2522_RefactorPluginInfrastructure/HeuristicLab.Operators.Programmable/3.3/HeuristicLab.Operators.Programmable-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>{6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}</ProjectGuid>
    9     <OutputType>Library</OutputType>
    10     <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Operators.Programmable</RootNamespace>
    12     <AssemblyName>HeuristicLab.Operators.Programmable-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     <DocumentationFile>
    58     </DocumentationFile>
    59     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    60     <Prefer32Bit>false</Prefer32Bit>
    61   </PropertyGroup>
    62   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    63     <DebugSymbols>true</DebugSymbols>
    64     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    65     <DefineConstants>DEBUG;TRACE</DefineConstants>
    66     <DebugType>full</DebugType>
    67     <PlatformTarget>x86</PlatformTarget>
    68     <ErrorReport>prompt</ErrorReport>
    69     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    70     <Prefer32Bit>false</Prefer32Bit>
    71   </PropertyGroup>
    72   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    73     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    74     <DefineConstants>TRACE</DefineConstants>
    75     <DocumentationFile>
    76     </DocumentationFile>
    77     <Optimize>true</Optimize>
    78     <DebugType>pdbonly</DebugType>
    79     <PlatformTarget>x86</PlatformTarget>
    80     <ErrorReport>prompt</ErrorReport>
    81     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    82     <Prefer32Bit>false</Prefer32Bit>
    83   </PropertyGroup>
    84   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    85     <DebugSymbols>true</DebugSymbols>
    86     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    87     <DefineConstants>DEBUG;TRACE</DefineConstants>
    88     <DebugType>full</DebugType>
    89     <PlatformTarget>x64</PlatformTarget>
    90     <ErrorReport>prompt</ErrorReport>
    91     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    92     <Prefer32Bit>false</Prefer32Bit>
    93   </PropertyGroup>
    94   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    95     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    96     <DefineConstants>TRACE</DefineConstants>
    97     <DocumentationFile>
    98     </DocumentationFile>
    99     <Optimize>true</Optimize>
    100     <DebugType>pdbonly</DebugType>
    101     <PlatformTarget>x64</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.Operators.Programmable</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.Data.Linq">
    112       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    113     </Reference>
    114     <Reference Include="System.Drawing" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     15    <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
     16    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    11517  </ItemGroup>
    11618  <ItemGroup>
    117     <None Include="Plugin.cs.frame" />
    118     <Compile Include="Plugin.cs" />
    119     <Compile Include="ProgrammableOperator.cs" />
    120     <Compile Include="ProgrammableSingleSuccessorOperator.cs" />
    121     <Compile Include="Properties\AssemblyInfo.cs" />
     19    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj" />
     20    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj" />
     21    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj" />
     22    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj" />
     23    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj" />
     24    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj" />
     25    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj" />
     26    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj" />
     27    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
    12228  </ItemGroup>
    123   <ItemGroup>
    124     <None Include="HeuristicLab.snk" />
    125     <None Include="Properties\AssemblyInfo.cs.frame" />
    126   </ItemGroup>
    127   <ItemGroup>
    128     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    129       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    130       <Name>HeuristicLab.Collections-3.3</Name>
    131       <Private>False</Private>
    132     </ProjectReference>
    133     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    134       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    135       <Name>HeuristicLab.Common.Resources-3.3</Name>
    136       <Private>False</Private>
    137     </ProjectReference>
    138     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    139       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    140       <Name>HeuristicLab.Common-3.3</Name>
    141       <Private>False</Private>
    142     </ProjectReference>
    143     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    144       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    145       <Name>HeuristicLab.Core-3.3</Name>
    146       <Private>False</Private>
    147     </ProjectReference>
    148     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    149       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    150       <Name>HeuristicLab.Data-3.3</Name>
    151       <Private>False</Private>
    152     </ProjectReference>
    153     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    154       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    155       <Name>HeuristicLab.Operators-3.3</Name>
    156       <Private>False</Private>
    157     </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    159       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    160       <Name>HeuristicLab.Parameters-3.3</Name>
    161       <Private>False</Private>
    162     </ProjectReference>
    163     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    164       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    165       <Name>HeuristicLab.Persistence-3.3</Name>
    166       <Private>False</Private>
    167     </ProjectReference>
    168     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    169       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    170       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    171       <Private>False</Private>
    172     </ProjectReference>
    173   </ItemGroup>
    174   <ItemGroup>
    175     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    176       <Visible>False</Visible>
    177       <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
    178       <Install>false</Install>
    179     </BootstrapperPackage>
    180     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
    181       <Visible>False</Visible>
    182       <ProductName>.NET Framework 3.5 SP1</ProductName>
    183       <Install>true</Install>
    184     </BootstrapperPackage>
    185     <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
    186       <Visible>False</Visible>
    187       <ProductName>Windows Installer 3.1</ProductName>
    188       <Install>true</Install>
    189     </BootstrapperPackage>
    190   </ItemGroup>
    191   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    192   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    193        Other similar extension points exist, see Microsoft.Common.targets.
    194   <Target Name="BeforeBuild">
     29  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     30    <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" />
    19531  </Target>
    196   <Target Name="AfterBuild">
    197   </Target>
    198   -->
    199   <PropertyGroup>
    200     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    201 set ProjectDir=$(ProjectDir)
    202 set SolutionDir=$(SolutionDir)
    203 set Outdir=$(Outdir)
    204 
    205 call PreBuildEvent.cmd
    206 </PreBuildEvent>
    207     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    208 export ProjectDir=$(ProjectDir)
    209 export SolutionDir=$(SolutionDir)
    210 
    211 $SolutionDir/PreBuildEvent.sh
    212 </PreBuildEvent>
     32  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     33    <OutputPath>..\..\bin\</OutputPath>
     34    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    21335  </PropertyGroup>
    21436</Project>

  • branches/2522_RefactorPluginInfrastructure/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs

    r15973 r16143  
    263263      typeof(System.ComponentModel.INotifyPropertyChanged).Assembly, // System.dll
    264264      typeof(System.Linq.Enumerable).Assembly,  // System.Core.dll
    265       typeof(System.Data.Linq.DataContext).Assembly, // System.Data.Linq.dll
    266265      typeof(HeuristicLab.Common.IDeepCloneable).Assembly,
    267266      typeof(HeuristicLab.Core.Item).Assembly,
    … …  
    307306        "System.Collections.Generic",
    308307        "System.Text",
    309         "System.Linq",
    310         "System.Data.Linq",
     308        "System.Linq"
    311309      };
    312310    }
Note: See TracChangeset for help on using the changeset viewer.