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

Legend:

Unmodified
Added
Removed

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

    r13080 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')" />
     2<Project Sdk="Microsoft.NET.Sdk">
    43  <PropertyGroup>
    5     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    6     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    7     <ProjectGuid>{21977CC3-1757-4B3B-87BD-FF817AAA900F}</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.3.0.0</AssemblyVersion>
     10    <AssemblyFileVersion>3.3.15.0</AssemblyFileVersion>
    1011    <RootNamespace>HeuristicLab.Scripting</RootNamespace>
    11     <AssemblyName>HeuristicLab.Scripting-3.3</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>..\..\bin\</OutputPath>
    21     <DefineConstants>DEBUG;TRACE</DefineConstants>
    22     <ErrorReport>prompt</ErrorReport>
    23     <WarningLevel>4</WarningLevel>
    24     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    25     <Prefer32Bit>false</Prefer32Bit>
    26   </PropertyGroup>
    27   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    28     <DebugType>pdbonly</DebugType>
    29     <Optimize>true</Optimize>
    30     <OutputPath>..\..\bin\</OutputPath>
    31     <DefineConstants>TRACE</DefineConstants>
    32     <ErrorReport>prompt</ErrorReport>
    33     <WarningLevel>4</WarningLevel>
    34     <Prefer32Bit>false</Prefer32Bit>
    35   </PropertyGroup>
    36   <PropertyGroup>
    37     <SignAssembly>true</SignAssembly>
    38   </PropertyGroup>
    39   <PropertyGroup>
    40     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    41   </PropertyGroup>
    42   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    43     <DebugSymbols>true</DebugSymbols>
    44     <OutputPath>..\..\bin\</OutputPath>
    45     <DefineConstants>DEBUG;TRACE</DefineConstants>
    46     <DebugType>full</DebugType>
    47     <PlatformTarget>x64</PlatformTarget>
    48     <ErrorReport>prompt</ErrorReport>
    49     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    50     <Prefer32Bit>false</Prefer32Bit>
    51   </PropertyGroup>
    52   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    53     <OutputPath>..\..\bin\</OutputPath>
    54     <DefineConstants>TRACE</DefineConstants>
    55     <Optimize>true</Optimize>
    56     <DebugType>pdbonly</DebugType>
    57     <PlatformTarget>x64</PlatformTarget>
    58     <ErrorReport>prompt</ErrorReport>
    59     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    60     <Prefer32Bit>false</Prefer32Bit>
    61   </PropertyGroup>
    62   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    63     <DebugSymbols>true</DebugSymbols>
    64     <OutputPath>..\..\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>..\..\bin\</OutputPath>
    74     <DefineConstants>TRACE</DefineConstants>
    75     <Optimize>true</Optimize>
    76     <DebugType>pdbonly</DebugType>
    77     <PlatformTarget>x86</PlatformTarget>
    78     <ErrorReport>prompt</ErrorReport>
    79     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    80     <Prefer32Bit>false</Prefer32Bit>
    8112  </PropertyGroup>
    8213  <ItemGroup>
    83     <Reference Include="Microsoft.CSharp" />
    84     <Reference Include="System" />
    85     <Reference Include="System.Core" />
    86     <Reference Include="System.Drawing" />
    87     <Reference Include="System.Xml.Linq" />
    88     <Reference Include="System.Data.DataSetExtensions" />
    89     <Reference Include="System.Data" />
    90     <Reference Include="System.Xml" />
     14    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     15    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />
     16    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
    9117  </ItemGroup>
    9218  <ItemGroup>
    93     <Compile Include="CompilationException.cs" />
    94     <Compile Include="ExecutableScript.cs" />
    95     <Compile Include="Scripts\CSharp\CSharpScript.cs" />
    96     <Compile Include="Scripts\Templates\CSharpScriptTemplate.cs" />
    97     <Compile Include="Scripts\Templates\ScriptTemplates.Designer.cs">
    98       <AutoGen>True</AutoGen>
    99       <DesignTime>True</DesignTime>
    100       <DependentUpon>ScriptTemplates.resx</DependentUpon>
    101     </Compile>
    102     <Compile Include="Variables.cs" />
    103     <Compile Include="VariableStore.cs" />
    104     <None Include="Plugin.cs.frame" />
    105     <Compile Include="Script.cs" />
    106     <Compile Include="Scripts\CSharp\CSharpScriptBase.cs" />
    107     <Compile Include="Plugin.cs" />
    108     <Compile Include="Properties\AssemblyInfo.cs" />
    109     <None Include="Properties\AssemblyInfo.cs.frame" />
     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.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj" />
     24    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
    11025  </ItemGroup>
    11126  <ItemGroup>
    112     <None Include="HeuristicLab.snk" />
     27    <Reference Include="Microsoft.CSharp" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
    11328  </ItemGroup>
    114   <ItemGroup>
    115     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    116       <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
    117       <Name>HeuristicLab.Collections-3.3</Name>
    118       <Private>False</Private>
    119     </ProjectReference>
    120     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    121       <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
    122       <Name>HeuristicLab.Common.Resources-3.3</Name>
    123       <Private>False</Private>
    124     </ProjectReference>
    125     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    126       <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
    127       <Name>HeuristicLab.Common-3.3</Name>
    128       <Private>False</Private>
    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       <Private>False</Private>
    134     </ProjectReference>
    135     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    136       <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
    137       <Name>HeuristicLab.Persistence-3.3</Name>
    138       <Private>False</Private>
    139     </ProjectReference>
    140     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    141       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
    142       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    143       <Private>False</Private>
    144     </ProjectReference>
    145   </ItemGroup>
    146   <ItemGroup>
    147     <EmbeddedResource Include="Scripts\Templates\ScriptTemplates.resx">
    148       <Generator>ResXFileCodeGenerator</Generator>
    149       <LastGenOutput>ScriptTemplates.Designer.cs</LastGenOutput>
    150       <CustomToolNamespace>HeuristicLab.Scripting</CustomToolNamespace>
    151     </EmbeddedResource>
    152   </ItemGroup>
    153   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    154   <PropertyGroup>
    155     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    156 set ProjectDir=$(ProjectDir)
    157 set SolutionDir=$(SolutionDir)
    158 set Outdir=$(Outdir)
    159 
    160 call PreBuildEvent.cmd
    161 </PreBuildEvent>
    162     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    163 export ProjectDir=$(ProjectDir)
    164 export SolutionDir=$(SolutionDir)
    165 
    166 $SolutionDir/PreBuildEvent.sh
    167 </PreBuildEvent>
     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" />
     31  </Target>
     32  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     33    <OutputPath>..\..\bin\</OutputPath>
     34    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    16835  </PropertyGroup>
    169   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    170        Other similar extension points exist, see Microsoft.Common.targets.
    171   <Target Name="BeforeBuild">
    172   </Target>
    173   <Target Name="AfterBuild">
    174   </Target>
    175   -->
    17636</Project>
Note: See TracChangeset for help on using the changeset viewer.