Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
11 edited
1 copied

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Scripting/3.3/CompilationException.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • stable/HeuristicLab.Scripting/3.3/ExecutableScript.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Scripting {
    2929  [Item("Executable Script", "An executable script.")]
    30   [StorableClass]
     30  [StorableType("206BFDFE-A829-424E-BFAD-BB7993830325")]
    3131  public abstract class ExecutableScript : Script {
    3232    private Thread scriptThread;
    … …  
    4747    #region Construction & Cloning
    4848    [StorableConstructor]
    49     protected ExecutableScript(bool deserializing) : base(deserializing) { }
     49    protected ExecutableScript(StorableConstructorFlag _) : base(_) { }
    5050    protected ExecutableScript(ExecutableScript original, Cloner cloner)
    5151      : base(original, cloner) {

  • stable/HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj

    r13277 r17097  
    1010    <RootNamespace>HeuristicLab.Scripting</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Scripting-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <TargetFrameworkProfile />
    … …  
    8181  </PropertyGroup>
    8282  <ItemGroup>
     83    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     84      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     85    </Reference>
     86    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     87      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     88    </Reference>
    8389    <Reference Include="Microsoft.CSharp" />
    8490    <Reference Include="System" />
    8591    <Reference Include="System.Core" />
    8692    <Reference Include="System.Drawing" />
     93    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     94      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     95    </Reference>
    8796    <Reference Include="System.Xml.Linq" />
    8897    <Reference Include="System.Data.DataSetExtensions" />
    … …  
    102111    <Compile Include="Variables.cs" />
    103112    <Compile Include="VariableStore.cs" />
     113    <None Include="packages.config" />
    104114    <None Include="Plugin.cs.frame" />
    105115    <Compile Include="Script.cs" />

  • stable/HeuristicLab.Scripting/3.3/Plugin.cs.frame

    r15587 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • stable/HeuristicLab.Scripting/3.3/Properties/AssemblyInfo.cs.frame

    r15587 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • stable/HeuristicLab.Scripting/3.3/Script.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3232using HeuristicLab.Common.Resources;
    3333using HeuristicLab.Core;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HEAL.Attic;
    3535using Microsoft.CSharp;
    3636
    3737namespace HeuristicLab.Scripting {
    38   [StorableClass]
     38  [StorableType("0FA4F218-E1F5-4C09-9C2F-12B32D4EC373")]
    3939  public abstract class Script : NamedItem, IProgrammableItem {
    4040    #region Fields & Properties
    … …  
    6666    #region Construction & Initialization
    6767    [StorableConstructor]
    68     protected Script(bool deserializing) : base(deserializing) { }
     68    protected Script(StorableConstructorFlag _) : base(_) { }
    6969    protected Script(Script original, Cloner cloner)
    7070      : base(original, cloner) {

  • stable/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Scripting {
    3030  [Item("C# Script", "An empty C# script.")]
    3131  [Creatable(CreatableAttribute.Categories.Scripts, Priority = 100)]
    32   [StorableClass]
     32  [StorableType("1630933C-AB5B-44EC-A967-C299CC57E4E3")]
    3333  public class CSharpScript : ExecutableScript, IStorableContent {
    3434    #region Fields & Properties
    … …  
    4949    #region Construction & Cloning
    5050    [StorableConstructor]
    51     protected CSharpScript(bool deserializing) : base(deserializing) { }
     51    protected CSharpScript(StorableConstructorFlag _) : base(_) { }
    5252    protected CSharpScript(CSharpScript original, Cloner cloner)
    5353      : base(original, cloner) {

  • stable/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScriptBase.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • stable/HeuristicLab.Scripting/3.3/Scripts/Templates/CSharpScriptTemplate.cs

    r11937 r17097  
    66// use 'variables' to work with IEnumerable<T> extension methods on the script's variable store
    77
    8 using System;
    9 using System.Linq;
    10 using System.Collections.Generic;
    118
    12 using HeuristicLab.Core;
    13 using HeuristicLab.Common;
    149//using HeuristicLab.Collections;
    1510//using HeuristicLab.Data;

  • stable/HeuristicLab.Scripting/3.3/VariableStore.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Common.Resources;
    2828using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Core;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3130using HeuristicLab.Persistence.Default.Xml;
    3231
    3332namespace HeuristicLab.Scripting {
    3433  [Item("VariableStore", "Represents a variable store.")]
    35   [StorableClass]
     34  [StorableType("DDE415E7-99FD-4C10-9B5E-63334876FFDE")]
    3635  public class VariableStore : ObservableDictionary<string, object>, IItem {
    3736    #region Properties
    … …  
    5554    #region Constructors & Cloning
    5655    [StorableConstructor]
    57     protected VariableStore(bool deserializing) : base(deserializing) { }
     56    protected VariableStore(StorableConstructorFlag _) : base(_) { }
    5857    protected VariableStore(VariableStore original, Cloner cloner) {
    5958      cloner.RegisterClonedObject(original, this);
    … …  
    8281    protected T CloneByPersistence<T>(T value) {
    8382      using (var serializerStream = new MemoryStream()) {
    84         XmlGenerator.Serialize(value, serializerStream);
     83        var serializer = new ProtoBufSerializer();
     84        serializer.Serialize(value, serializerStream, disposeStream: false);
    8585        var bytes = serializerStream.GetBuffer();
    8686        using (var deserializerStream = new MemoryStream(bytes)) {
    87           return XmlParser.Deserialize<T>(deserializerStream);
     87          return (T)serializer.Deserialize(deserializerStream);
    8888        }
    8989      }

  • stable/HeuristicLab.Scripting/3.3/packages.config

    r16565 r17097  
    22<packages>
    33  <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" />
    4   <package id="HEAL.Attic" version="1.0.0-pre01" targetFramework="net461" />
     4  <package id="HEAL.Attic" version="1.0.0-pre02" targetFramework="net461" />
    55  <package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" />
    66</packages>
Note: See TracChangeset for help on using the changeset viewer.