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

Legend:

Unmodified
Added
Removed

  • branches/2522_RefactorPluginInfrastructure/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

    r15973 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>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</ProjectGuid>
    9     <OutputType>Library</OutputType>
    10     <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Data</RootNamespace>
    12     <AssemblyName>HeuristicLab.Data-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     <IsWebBootstrapper>true</IsWebBootstrapper>
    21     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    22     <TargetFrameworkProfile>
    23     </TargetFrameworkProfile>
    24     <PublishUrl>http://localhost/HeuristicLab.Data/</PublishUrl>
    25     <Install>true</Install>
    26     <InstallFrom>Web</InstallFrom>
    27     <UpdateEnabled>true</UpdateEnabled>
    28     <UpdateMode>Foreground</UpdateMode>
    29     <UpdateInterval>7</UpdateInterval>
    30     <UpdateIntervalUnits>Days</UpdateIntervalUnits>
    31     <UpdatePeriodically>false</UpdatePeriodically>
    32     <UpdateRequired>false</UpdateRequired>
    33     <MapFileExtensions>true</MapFileExtensions>
    34     <ApplicationRevision>0</ApplicationRevision>
    35     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
    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     <DocumentationFile>
    48     </DocumentationFile>
    49     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    50     <Prefer32Bit>false</Prefer32Bit>
    51   </PropertyGroup>
    52   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    53     <DebugType>pdbonly</DebugType>
    54     <Optimize>true</Optimize>
    55     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    56     <DefineConstants>TRACE</DefineConstants>
    57     <ErrorReport>prompt</ErrorReport>
    58     <WarningLevel>4</WarningLevel>
    59     <DocumentationFile>
    60     </DocumentationFile>
    61     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
    62     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    63     <Prefer32Bit>false</Prefer32Bit>
    64   </PropertyGroup>
    65   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    66     <DebugSymbols>true</DebugSymbols>
    67     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    68     <DefineConstants>DEBUG;TRACE</DefineConstants>
    69     <DebugType>full</DebugType>
    70     <PlatformTarget>x86</PlatformTarget>
    71     <ErrorReport>prompt</ErrorReport>
    72     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    73     <Prefer32Bit>false</Prefer32Bit>
    74   </PropertyGroup>
    75   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    76     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    77     <DefineConstants>TRACE</DefineConstants>
    78     <DocumentationFile>
    79     </DocumentationFile>
    80     <Optimize>true</Optimize>
    81     <DebugType>pdbonly</DebugType>
    82     <PlatformTarget>x86</PlatformTarget>
    83     <ErrorReport>prompt</ErrorReport>
    84     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    85     <Prefer32Bit>false</Prefer32Bit>
    86   </PropertyGroup>
    87   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    88     <DebugSymbols>true</DebugSymbols>
    89     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    90     <DefineConstants>DEBUG;TRACE</DefineConstants>
    91     <DebugType>full</DebugType>
    92     <PlatformTarget>x64</PlatformTarget>
    93     <ErrorReport>prompt</ErrorReport>
    94     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    95     <Prefer32Bit>false</Prefer32Bit>
    96   </PropertyGroup>
    97   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    98     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    99     <DefineConstants>TRACE</DefineConstants>
    100     <DocumentationFile>
    101     </DocumentationFile>
    102     <Optimize>true</Optimize>
    103     <DebugType>pdbonly</DebugType>
    104     <PlatformTarget>x64</PlatformTarget>
    105     <ErrorReport>prompt</ErrorReport>
    106     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    107     <Prefer32Bit>false</Prefer32Bit>
     9    <AssemblyVersion>3.3.0.0</AssemblyVersion>
     10    <AssemblyFileVersion>3.3.15.0</AssemblyFileVersion>
     11    <RootNamespace>HeuristicLab.Data</RootNamespace>
    10812  </PropertyGroup>
    10913  <ItemGroup>
    110     <Reference Include="System" />
    111     <Reference Include="System.Core">
    112       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    113     </Reference>
    114     <Reference Include="System.Data" />
    115     <Reference Include="System.Drawing" />
    116     <Reference Include="System.Xml" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     15    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    11716  </ItemGroup>
    11817  <ItemGroup>
    119     <None Include="Plugin.cs.frame" />
    120     <Compile Include="BoolArray.cs" />
    121     <Compile Include="BoolMatrix.cs" />
    122     <Compile Include="BoolValue.cs" />
    123     <Compile Include="Comparison.cs" />
    124     <Compile Include="ComparisonType.cs" />
    125     <Compile Include="EnumValue.cs" />
    126     <Compile Include="Interfaces\IValueTypeArray.cs" />
    127     <Compile Include="Path Types\DirectoryValue.cs" />
    128     <Compile Include="Path Types\FileValue.cs" />
    129     <Compile Include="Path Types\PathValue.cs" />
    130     <Compile Include="Path Types\TextFileValue.cs" />
    131     <Compile Include="PercentMatrix.cs" />
    132     <Compile Include="PercentArray.cs" />
    133     <Compile Include="DoubleRange.cs" />
    134     <Compile Include="IntRange.cs" />
    135     <Compile Include="Interfaces\IStringConvertibleValueTuple.cs" />
    136     <Compile Include="PercentValue.cs" />
    137     <Compile Include="DateTimeValue.cs" />
    138     <Compile Include="DoubleArray.cs" />
    139     <Compile Include="DoubleMatrix.cs" />
    140     <Compile Include="DoubleValue.cs" />
    141     <Compile Include="FormatPatterns.cs" />
    142     <Compile Include="IntArray.cs" />
    143     <Compile Include="IntMatrix.cs" />
    144     <Compile Include="IntValue.cs" />
    145     <Compile Include="Interfaces\IStringConvertibleArray.cs" />
    146     <Compile Include="Interfaces\IStringConvertibleMatrix.cs" />
    147     <Compile Include="Interfaces\IStringConvertibleValue.cs" />
    148     <Compile Include="Plugin.cs" />
    149     <Compile Include="Properties\AssemblyInfo.cs" />
    150     <Compile Include="StringArray.cs" />
    151     <Compile Include="StringConvertibleArray.cs" />
    152     <Compile Include="StringMatrix.cs" />
    153     <Compile Include="StringValue.cs" />
    154     <Compile Include="TimeSpanValue.cs" />
    155     <Compile Include="TriangularMatrix.cs" />
    156     <Compile Include="ValueTypeArray.cs" />
    157     <Compile Include="ValueTypeMatrix.cs" />
    158     <Compile Include="StringConvertibleValueTuple.cs" />
    159     <Compile Include="ValueTypeValue.cs" />
     18    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj" />
     19    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj" />
     20    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj" />
     21    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj" />
     22    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
    16023  </ItemGroup>
    161   <ItemGroup>
    162     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    163       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    164       <Name>HeuristicLab.Common.Resources-3.3</Name>
    165       <Private>False</Private>
    166     </ProjectReference>
    167     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    168       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    169       <Name>HeuristicLab.Common-3.3</Name>
    170       <Private>False</Private>
    171     </ProjectReference>
    172     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    173       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    174       <Name>HeuristicLab.Core-3.3</Name>
    175       <Private>False</Private>
    176     </ProjectReference>
    177     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    178       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    179       <Name>HeuristicLab.Persistence-3.3</Name>
    180       <Private>False</Private>
    181     </ProjectReference>
    182     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    183       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    184       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    185       <Private>False</Private>
    186     </ProjectReference>
    187   </ItemGroup>
    188   <ItemGroup>
    189     <None Include="HeuristicLab.snk" />
    190     <None Include="Properties\AssemblyInfo.cs.frame" />
    191   </ItemGroup>
    192   <ItemGroup>
    193     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    194       <Visible>False</Visible>
    195       <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
    196       <Install>false</Install>
    197     </BootstrapperPackage>
    198     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
    199       <Visible>False</Visible>
    200       <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
    201       <Install>true</Install>
    202     </BootstrapperPackage>
    203     <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
    204       <Visible>False</Visible>
    205       <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
    206       <Install>false</Install>
    207     </BootstrapperPackage>
    208     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
    209       <Visible>False</Visible>
    210       <ProductName>.NET Framework 3.5</ProductName>
    211       <Install>false</Install>
    212     </BootstrapperPackage>
    213     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
    214       <Visible>False</Visible>
    215       <ProductName>.NET Framework 3.5 SP1</ProductName>
    216       <Install>false</Install>
    217     </BootstrapperPackage>
    218   </ItemGroup>
    219   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    220   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    221        Other similar extension points exist, see Microsoft.Common.targets.
    222   <Target Name="BeforeBuild">
     24  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     25    <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" />
    22326  </Target>
    224   <Target Name="AfterBuild">
    225   </Target>
    226   -->
    227   <PropertyGroup>
    228     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    229 set ProjectDir=$(ProjectDir)
    230 set SolutionDir=$(SolutionDir)
    231 set Outdir=$(Outdir)
    232 
    233 call PreBuildEvent.cmd
    234 </PreBuildEvent>
    235     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    236 export ProjectDir=$(ProjectDir)
    237 export SolutionDir=$(SolutionDir)
    238 
    239 $SolutionDir/PreBuildEvent.sh
    240 </PreBuildEvent>
     27  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     28    <OutputPath>..\..\bin\</OutputPath>
     29    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    24130  </PropertyGroup>
    24231</Project>
Note: See TracChangeset for help on using the changeset viewer.