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.Algorithms.DataAnalysis.Glmnet/3.4
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed

  • branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Glmnet/3.4/HeuristicLab.Algorithms.DataAnalysis.Glmnet-3.4.csproj

    r15139 r16143  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="14.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')" />
     2<Project Sdk="Microsoft.NET.Sdk">
    43  <PropertyGroup>
    5     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    6     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    7     <ProjectGuid>{4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}</ProjectGuid>
    8     <OutputType>Library</OutputType>
    9     <AppDesignerFolder>Properties</AppDesignerFolder>
     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</AssemblyVersion>
     10    <AssemblyFileVersion>3.4.0.0</AssemblyFileVersion>
    1011    <RootNamespace>HeuristicLab.Algorithms.DataAnalysis.Glmnet</RootNamespace>
    11     <AssemblyName>HeuristicLab.Algorithms.DataAnalysis.Glmnet-3.4</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    13     <FileAlignment>512</FileAlignment>
    14     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    15     <TargetFrameworkProfile />
    16   </PropertyGroup>
    17   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    18     <PlatformTarget>AnyCPU</PlatformTarget>
    19     <DebugSymbols>true</DebugSymbols>
    20     <DebugType>full</DebugType>
    21     <Optimize>false</Optimize>
    22     <OutputPath>..\..\bin\</OutputPath>
    23     <DefineConstants>DEBUG;TRACE</DefineConstants>
    24     <ErrorReport>prompt</ErrorReport>
    25     <WarningLevel>4</WarningLevel>
    26     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    27   </PropertyGroup>
    28   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    29     <PlatformTarget>AnyCPU</PlatformTarget>
    30     <DebugType>pdbonly</DebugType>
    31     <Optimize>true</Optimize>
    32     <OutputPath>..\..\bin\</OutputPath>
    33     <DefineConstants>TRACE</DefineConstants>
    34     <ErrorReport>prompt</ErrorReport>
    35     <WarningLevel>4</WarningLevel>
    36   </PropertyGroup>
    37   <PropertyGroup>
    38     <SignAssembly>true</SignAssembly>
    39   </PropertyGroup>
    40   <PropertyGroup>
    41     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    42   </PropertyGroup>
    43   <PropertyGroup>
    44     <StartupObject />
    45   </PropertyGroup>
    46   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    47     <DebugSymbols>true</DebugSymbols>
    48     <OutputPath>..\..\bin\</OutputPath>
    49     <DefineConstants>DEBUG;TRACE</DefineConstants>
    50     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    51     <DebugType>full</DebugType>
    52     <PlatformTarget>x64</PlatformTarget>
    53     <ErrorReport>prompt</ErrorReport>
    54   </PropertyGroup>
    55   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    56     <OutputPath>..\..\bin\</OutputPath>
    57     <DefineConstants>TRACE</DefineConstants>
    58     <Optimize>true</Optimize>
    59     <DebugType>pdbonly</DebugType>
    60     <PlatformTarget>x64</PlatformTarget>
    61     <ErrorReport>prompt</ErrorReport>
    62   </PropertyGroup>
    63   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    64     <DebugSymbols>true</DebugSymbols>
    65     <OutputPath>..\..\bin\</OutputPath>
    66     <DefineConstants>DEBUG;TRACE</DefineConstants>
    67     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    68     <DebugType>full</DebugType>
    69     <PlatformTarget>x86</PlatformTarget>
    70     <ErrorReport>prompt</ErrorReport>
    71   </PropertyGroup>
    72   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    73     <OutputPath>..\..\bin\</OutputPath>
    74     <DefineConstants>TRACE</DefineConstants>
    75     <Optimize>true</Optimize>
    76     <DebugType>pdbonly</DebugType>
    77     <PlatformTarget>x86</PlatformTarget>
    78     <ErrorReport>prompt</ErrorReport>
    7912  </PropertyGroup>
    8013  <ItemGroup>
    81     <Reference Include="System" />
    82     <Reference Include="System.Core" />
    83     <Reference Include="System.Data.Linq" />
    84     <Reference Include="System.Xml.Linq" />
    85     <Reference Include="System.Data.DataSetExtensions" />
    86     <Reference Include="Microsoft.CSharp" />
    87     <Reference Include="System.Data" />
    88     <Reference Include="System.Net.Http" />
    89     <Reference Include="System.Xml" />
     14    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     15    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    9016  </ItemGroup>
    9117  <ItemGroup>
    92     <None Include="HeuristicLab.snk" />
    93     <None Include="Plugin.cs.frame" />
    94     <None Include="Properties\AssemblyInfo.cs.frame" />
     18    <ProjectReference Include="..\..\HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj" />
     19    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj" />
     20    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-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.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj" />
     25    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj" />
     26    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj" />
     27    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj" />
     28    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
     29    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj" />
     30    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj" />
     31    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj" />
     32    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj" />
    9533  </ItemGroup>
    9634  <ItemGroup>
    97     <Content Include="glmnet-license-gpl2.txt">
    98       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    99     </Content>
    100     <Content Include="glmnet-x64.dll">
    101       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    102     </Content>
    103     <Content Include="glmnet-x86.dll">
    104       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    105     </Content>
     35    <Reference Include="Microsoft.CSharp" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
    10636  </ItemGroup>
    10737  <ItemGroup>
    108     <Compile Include="ElasticNetLinearRegression.cs" />
    109     <Compile Include="Glmnet.cs" />
    110     <Compile Include="Plugin.cs" />
    111     <Compile Include="Properties\AssemblyInfo.cs" />
     38    <None Update="glmnet-license-gpl2.txt">
     39      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     40    </None>
     41    <None Update="glmnet-x64.dll">
     42      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     43    </None>
     44    <None Update="glmnet-x86.dll">
     45      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     46    </None>
    11247  </ItemGroup>
    113   <ItemGroup>
    114     <ProjectReference Include="..\..\HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj">
    115       <Project>{2e782078-fa81-4b70-b56f-74ce38dac6c8}</Project>
    116       <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name>
    117     </ProjectReference>
    118     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    119       <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
    120       <Name>HeuristicLab.Analysis-3.3</Name>
    121     </ProjectReference>
    122     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    123       <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
    124       <Name>HeuristicLab.Collections-3.3</Name>
    125     </ProjectReference>
    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     </ProjectReference>
    130     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    131       <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
    132       <Name>HeuristicLab.Core-3.3</Name>
    133     </ProjectReference>
    134     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    135       <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
    136       <Name>HeuristicLab.Data-3.3</Name>
    137     </ProjectReference>
    138     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    139       <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    140       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    141     </ProjectReference>
    142     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    143       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    144       <Name>HeuristicLab.Optimization-3.3</Name>
    145     </ProjectReference>
    146     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    147       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    148       <Name>HeuristicLab.Parameters-3.3</Name>
    149     </ProjectReference>
    150     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    151       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    152       <Name>HeuristicLab.Persistence-3.3</Name>
    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     </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj">
    159       <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project>
    160       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name>
    161     </ProjectReference>
    162     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    163       <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    164       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
    165     </ProjectReference>
    166     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    167       <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
    168       <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    169     </ProjectReference>
    170     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    171       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    172       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    173     </ProjectReference>
    174   </ItemGroup>
    175   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    176   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    177        Other similar extension points exist, see Microsoft.Common.targets.
    178   <Target Name="BeforeBuild">
     48  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     49    <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" />
    17950  </Target>
    180   <Target Name="AfterBuild">
    181   </Target>
    182   -->
    183   <PropertyGroup>
    184     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    185 set ProjectDir=$(ProjectDir)
    186 set SolutionDir=$(SolutionDir)
    187 set Outdir=$(Outdir)
    188 
    189 call PreBuildEvent.cmd
    190 </PreBuildEvent>
    191     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    192 export ProjectDir=$(ProjectDir)
    193 export SolutionDir=$(SolutionDir)
    194 
    195 $SolutionDir/PreBuildEvent.sh
    196 </PreBuildEvent>
     51  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     52    <OutputPath>..\..\bin\</OutputPath>
     53    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    19754  </PropertyGroup>
    19855</Project>
Note: See TracChangeset for help on using the changeset viewer.