Adjust settings serialization and deserialization to YamlDotNet 5.2.1.

Revert to target .NET 4.0 again...
Update NuGet packages except YamlDotNet.
2018-11-18 19:55:43 +01:00 · 2018-11-18 16:19:39 +01:00 · 2018-11-16 13:56:15 +01:00 · 2018-11-16 13:48:14 +01:00 · 2018-11-16 09:25:57 +01:00
20 changed files with 250 additions and 193 deletions
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -16,6 +17,9 @@
    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
    <IsCodedUITest>False</IsCodedUITest>
    <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@ -25,6 +29,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@ -33,46 +38,48 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
  </PropertyGroup>
  <PropertyGroup>
    <AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Bovender, Version=0.17.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bovender.0.17.0.0\lib\net40\Bovender.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Bovender">
+      <HintPath>..\..\bovender\Bovender\bin\Debug\Bovender.dll</HintPath>
    </Reference>
+    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\NLog.4.5.11\lib\net40-client\NLog.dll</HintPath>
    </Reference>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.8.1\lib\net40\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.11.0\lib\net40\nunit.framework.dll</HintPath>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Core">
      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Expression.Blend.Sdk.1.0.2\lib\net40-client\System.Windows.Interactivity.dll</HintPath>
-      <Private>True</Private>
    </Reference>
    <Reference Include="System.Xaml" />
    <Reference Include="System.XML" />
    <Reference Include="WindowsBase" />
-    <Reference Include="YamlDotNet, Version=4.1.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
-      <HintPath>..\packages\YamlDotNet.Signed.4.1.0\lib\net35\YamlDotNet.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="YamlDotNet, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.5.2.1\lib\net35\YamlDotNet.dll</HintPath>
    </Reference>
  </ItemGroup>
  <Choose>
@ -172,6 +179,12 @@
  </Choose>
  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+  </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/Tests/app.config
+++ b/Tests/app.config
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 	app.config
 	part of zaaReloaded2
@ -21,9 +21,9 @@
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
-        <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+        <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
--- a/Tests/packages.config
+++ b/Tests/packages.config
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bovender" version="0.17.0.0" targetFramework="net40" />
  <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
-  <package id="NUnit" version="3.8.1" targetFramework="net40" />
-  <package id="YamlDotNet.Signed" version="4.2.1" targetFramework="net40" />
+  <package id="NLog" version="4.5.11" targetFramework="net40" />
+  <package id="NUnit" version="3.11.0" targetFramework="net40" />
+  <package id="YamlDotNet" version="5.2.1" targetFramework="net40" />
 </packages>
--- a/zaaReloaded2.sln
+++ b/zaaReloaded2.sln
@ -3,11 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{386B2FA0-E39A-4BC4-930F-0BCF3787DC5E}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\packages.config = .nuget\packages.config
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zaaReloaded2", "zaaReloaded2\zaaReloaded2.csproj", "{0478F1B0-17F2-4151-8F93-1CB6EB9732C5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{529544E3-3C26-4688-B39D-04DA30F05E20}"
--- a/zaaReloaded2/Controller/Elements/ControlElementBase.cs
+++ b/zaaReloaded2/Controller/Elements/ControlElementBase.cs
@ -35,7 +35,21 @@ namespace zaaReloaded2.Controller.Elements
        /// Gets a list of child elements, all of which must be derived
        /// from FormatElementBase.
        /// </summary>
-        public IList<FormatElementBase> Children { get; internal set; }
+        public IList<FormatElementBase> Children
+        {
+            get
+            {
+                if (_children == null)
+                {
+                    _children = new List<FormatElementBase>();
+                }
+                return _children;
+            }
+            internal set
+            {
+                _children = value;
+            }
+        }

        /// <summary>
        /// Informs whether this control element can have child elements.
@ -46,17 +60,16 @@ namespace zaaReloaded2.Controller.Elements

        #region Constructors

-        public ControlElementBase()
-            : this(new List<FormatElementBase>())
-        { }
+        public ControlElementBase() : base() { }

        public ControlElementBase(IList<FormatElementBase> children)
+            : this()
        {
            Children = children;
        }

-        public ControlElementBase(FormatElementBase children)
-            : this(new List<FormatElementBase>() { children })
+        public ControlElementBase(FormatElementBase child)
+            : this(new List<FormatElementBase>() { child })
        { }

        #endregion
@ -111,5 +124,11 @@ namespace zaaReloaded2.Controller.Elements
        }

        #endregion
+
+        #region Fields
+
+        IList<FormatElementBase> _children;
+
+        #endregion
    }
 }
--- a/zaaReloaded2/Controller/Elements/FormatElementBase.cs
+++ b/zaaReloaded2/Controller/Elements/FormatElementBase.cs
@ -16,8 +16,8 @@
 * limitations under the License.
 */

-using System;
 using System.Runtime.Serialization;
+
 namespace zaaReloaded2.Controller.Elements
 {
    /// <summary>
--- a/zaaReloaded2/Controller/Settings.cs
+++ b/zaaReloaded2/Controller/Settings.cs
@ -18,13 +18,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using zaaReloaded2.Formatter;
 using zaaReloaded2.Controller.Elements;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Soap;
 using YamlDotNet.Serialization;

 namespace zaaReloaded2.Controller
@ -35,6 +33,43 @@ namespace zaaReloaded2.Controller
    [Serializable]
    public class Settings : ICloneable, ISerializable
    {
+        #region Auxiliary factories for YamlDotNet
+
+        public static ISerializer BuildSerializer()
+        {
+            SerializerBuilder builder = new SerializerBuilder()
+                .WithTagMapping("!Settings", typeof(Settings))
+                .WithTagMapping("!ElementsList", typeof(List<ElementBase>))
+                .WithTagMapping("!FormatElementsList", typeof(List<FormatElementBase>))
+                .WithTagMapping("!Items", typeof(Items))
+                .WithTagMapping("!CustomText", typeof(CustomText))
+                .WithTagMapping("!SelectFirstDay", typeof(SelectFirstDay))
+                .WithTagMapping("!SelectEachDay", typeof(SelectEachDay))
+                .WithTagMapping("!SelectLastDay", typeof(SelectLastDay))
+                .WithTagMapping("!TwoColumns", typeof(TwoColumns))
+                .WithTagMapping("!NextColumn", typeof(NextColumn))
+                .EnsureRoundtrip();
+            return builder.Build();
+        }
+
+        public static IDeserializer BuildDeserializer()
+        {
+            DeserializerBuilder builder = new DeserializerBuilder()
+                .WithTagMapping("!Settings", typeof(Settings))
+                .WithTagMapping("!ElementsList", typeof(List<ElementBase>))
+                .WithTagMapping("!FormatElementsList", typeof(List<FormatElementBase>))
+                .WithTagMapping("!Items", typeof(Items))
+                .WithTagMapping("!CustomText", typeof(CustomText))
+                .WithTagMapping("!SelectFirstDay", typeof(SelectFirstDay))
+                .WithTagMapping("!SelectEachDay", typeof(SelectEachDay))
+                .WithTagMapping("!SelectLastDay", typeof(SelectLastDay))
+                .WithTagMapping("!TwoColumns", typeof(TwoColumns))
+                .WithTagMapping("!NextColumn", typeof(NextColumn));
+            return builder.Build();
+        }
+
+        #endregion
+
        #region Persistence

        /// <summary>
@ -48,7 +83,7 @@ namespace zaaReloaded2.Controller
        {
            Logger.Info("LoadFromFile: {0}", fileName);
            StreamReader reader = new StreamReader(fileName);
-            Deserializer deserializer = new DeserializerBuilder().Build();
+            IDeserializer deserializer = BuildDeserializer();
            Settings settings;
            try
            {
@ -81,9 +116,7 @@ namespace zaaReloaded2.Controller
            Logger.Info("SaveToFile: Settings name: {0}", Name);
            using (StreamWriter writer = new StreamWriter(fileName))
            {
-                Serializer serializer = new SerializerBuilder()
-                    .EnsureRoundtrip()
-                    .Build();
+                ISerializer serializer = BuildSerializer();
                serializer.Serialize(writer, this);
            }
            Logger.Info("SaveToFile: Successfully saved to file '{0}'", fileName);
--- a/zaaReloaded2/Controller/SettingsRepository.cs
+++ b/zaaReloaded2/Controller/SettingsRepository.cs
@ -62,10 +62,12 @@ namespace zaaReloaded2.Controller
            SettingsRepository repo = UserSettings.Default.SettingsRepository;
            if (repo == null)
            {
+                Logger.Warn("Load: No repository in user settings; creating a new one.");
                return new SettingsRepository();
            }
            else
            {
+                Logger.Warn("Load: Loaded repository from user settings.");
                repo.LoadDefaults();
                return repo;
            }
@ -183,8 +185,8 @@ namespace zaaReloaded2.Controller
        private void LoadDefaults()
        {
            Assembly myAssembly = this.GetType().Assembly;
-            // SoapFormatter deserializer = new SoapFormatter();
-            var deserializer = new YamlDotNet.Serialization.DeserializerBuilder().Build();
+            var deserializer = Settings.BuildDeserializer();
+            Logger.Info("LoadDefaults: Loading ward default");
            using (Stream stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.ward.zaaReloaded2"))
            {
                StreamReader reader = new StreamReader(stream);
@ -193,6 +195,7 @@ namespace zaaReloaded2.Controller
                settings.Uid = Guid.Parse(DEFAULT_SETTINGS_1_UID);
                ReplaceOrAdd(settings);
            }
+            Logger.Info("LoadDefaults: Loading clinic default");
            using (Stream stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.clinic.zaaReloaded2"))
            {
                StreamReader reader = new StreamReader(stream);
@ -238,5 +241,13 @@ namespace zaaReloaded2.Controller
        const string DEFAULT_SETTINGS_2_UID = "783C63B5-A964-4368-B2D0-D4595DCCB952";

        #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
    }
 }
--- a/zaaReloaded2/Defaults/clinic.zaaReloaded2
+++ b/zaaReloaded2/Defaults/clinic.zaaReloaded2
@ -1,53 +1,53 @@
-!zaaReloaded2.Controller.Settings,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+!Settings
 Name: Kopie von Standard für NepA
 ReferenceStyle: IfSpecialItem
-Elements: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.ElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
- !zaaReloaded2.Controller.Elements.SelectEachDay,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
-  Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+Elements: !ElementsList
+- !SelectEachDay
+  Children: !FormatElementsList
+  - !Items
    Content: 'Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Kardiale Marker: CK, CK-MB, hsTnT, NT-proBNP'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt, U-Schwangerschaftstest'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE, CDT'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Hormone: iPTH, TSH, fT3, fT4, Aldosteron, Renin, ARQ'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Vitamine: B12, Folsäure'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'BGA: pH, Std.-Bic., BE'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Tumormarker: PSA, AFP'
-  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !CustomText
    Content: 'Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden'
-  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !CustomText
    Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR'
-  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !CustomText
    Content: 'Autoantikörper: ANCA (IF) 1: (Ref. < 1:40), MPO-ANCA (ELISA) IU/ml (Ref. < 9), PR3-ANCA (ELISA) IU/ml (Ref. < 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA)'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'MSU: MSU-Keim, MSU-Multiresistenz'
 Uid: 581d378c-8f7a-4a1c-8490-36e257770a09
--- a/zaaReloaded2/Defaults/ward.zaaReloaded2
+++ b/zaaReloaded2/Defaults/ward.zaaReloaded2
@ -1,101 +1,101 @@
-!zaaReloaded2.Controller.Settings,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+!Settings
 Name: Kopie von Standard für Station
 ReferenceStyle: IfSpecialItem
-Elements: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.ElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
- !zaaReloaded2.Controller.Elements.TwoColumns,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
-  Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 []
- !zaaReloaded2.Controller.Elements.SelectFirstDay,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
-  Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+Elements: !ElementsList
+- !TwoColumns
+  Children: !FormatElementsList
+- !SelectFirstDay
+  Children: !FormatElementsList
+  - !Items
    Content: 'Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Hormone: iPTH, TSH, fT3, fT4'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Vitamine: B12, Folsäure'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'BGA: pH, Std.-Bic., BE'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin'
-  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !CustomText
    Content: 'Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden'
-  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !CustomText
    Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR'
-  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !CustomText
    Content: 'Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Tumormarker: PSA'
- !zaaReloaded2.Controller.Elements.NextColumn,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
-  Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 []
- !zaaReloaded2.Controller.Elements.SelectLastDay,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
-  Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+- !NextColumn
+  Children: !FormatElementsList
+- !SelectLastDay
+  Children: !FormatElementsList
+  - !Items
    Content: 'Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Hormone: iPTH, TSH, fT3, fT4'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Vitamine: B12, Folsäure'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'BGA: pH, Std.-Bic., BE'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin'
-  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !CustomText
    Content: 'Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden'
-  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !CustomText
    Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR'
-  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !CustomText
    Content: 'Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)'
-  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  - !Items
    Content: 'Tumormarker: PSA'
 Uid: 216d9bbb-94d8-47e5-b13b-59e0edd24d91
--- a/zaaReloaded2/Properties/AssemblyInfo.cs
+++ b/zaaReloaded2/Properties/AssemblyInfo.cs
@ -14,7 +14,8 @@ using System.Security;
 [assembly: AssemblyCopyright("Copyright © Daniel Kraus 2015-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: InternalsVisibleTo("Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010061ecc0718277dee13e7dae2dad33787a981c9883ba80a659bebbdbec76563e201a7a3a6a5852e01bb5eb328d24d5889244b4626da9af9f93db663565441a3120e3985789e6f2a39289f4eed063725b84152cbef472d9dd2f7495f51dad6c91f4dc6fb7c72cb6bd9381335ac9878ec0a6369e880f35b8eca3063e16468d7704eb")]
+//[assembly: InternalsVisibleTo("Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010061ecc0718277dee13e7dae2dad33787a981c9883ba80a659bebbdbec76563e201a7a3a6a5852e01bb5eb328d24d5889244b4626da9af9f93db663565441a3120e3985789e6f2a39289f4eed063725b84152cbef472d9dd2f7495f51dad6c91f4dc6fb7c72cb6bd9381335ac9878ec0a6369e880f35b8eca3063e16468d7704eb")]
+[assembly: InternalsVisibleTo("Tests")]

 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
--- a/zaaReloaded2/Properties/Settings.Designer.cs
+++ b/zaaReloaded2/Properties/Settings.Designer.cs
@ -12,7 +12,7 @@ namespace zaaReloaded2.Properties {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@ -32,15 +32,6 @@ namespace zaaReloaded2.Properties {
            }
        }
        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("2017")]
-        public string PubYear {
-            get {
-                return ((string)(this["PubYear"]));
-            }
-        }
-        
        [global::System.Configuration.ApplicationScopedSettingAttribute()]
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
        [global::System.Configuration.DefaultSettingValueAttribute("Daniel Kraus")]
@ -187,7 +178,7 @@ namespace zaaReloaded2.Properties {
        
        [global::System.Configuration.ApplicationScopedSettingAttribute()]
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://git.bovender.de")]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://git.bovender.de/daniel/zaaReloaded2")]
        public string Repository {
            get {
                return ((string)(this["Repository"]));
@ -229,5 +220,14 @@ namespace zaaReloaded2.Properties {
                return ((string)(this["UserSettingsFile"]));
            }
        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2018")]
+        public string PubYear {
+            get {
+                return ((string)(this["PubYear"]));
+            }
+        }
    }
 }
--- a/zaaReloaded2/Properties/Settings.settings
+++ b/zaaReloaded2/Properties/Settings.settings
@ -5,9 +5,6 @@
    <Setting Name="AddinName" Type="System.String" Scope="Application">
      <Value Profile="(Default)">zaaReloaded2</Value>
    </Setting>
-    <Setting Name="PubYear" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">2018</Value>
-    </Setting>
    <Setting Name="Authors" Type="System.String" Scope="Application">
      <Value Profile="(Default)">Daniel Kraus</Value>
    </Setting>
@ -57,7 +54,7 @@
      <Value Profile="(Default)">BITTE_ERGÄNZEN</Value>
    </Setting>
    <Setting Name="Repository" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">https://git.bovender.de</Value>
+      <Value Profile="(Default)">https://git.bovender.de/daniel/zaaReloaded2</Value>
    </Setting>
    <Setting Name="DrugsParagraph" Type="System.String" Scope="Application">
      <Value Profile="(Default)">zaaReloaded2-Medikamente</Value>
@ -71,5 +68,8 @@
    <Setting Name="UserSettingsFile" Type="System.String" Scope="Application">
      <Value Profile="(Default)">settings.yml</Value>
    </Setting>
+    <Setting Name="PubYear" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">2018</Value>
+    </Setting>
  </Settings>
-</SettingsFile>
+</SettingsFile>
--- a/zaaReloaded2/ThisAddIn.Designer.xml
+++ b/zaaReloaded2/ThisAddIn.Designer.xml
@ -1,5 +1,5 @@
-<hostitem:hostItem hostitem:baseType="Microsoft.Office.Tools.AddInBase" hostitem:namespace="zaaReloaded2" hostitem:className="ThisAddIn" hostitem:identifier="ThisAddIn" hostitem:primaryCookie="AddIn" hostitem:master="true" hostitem:factoryType="Microsoft.Office.Tools.Word.ApplicationFactory" hostitem:startupIndex="0" xmlns:hostitem="http://schemas.microsoft.com/2004/VisualStudio/Tools/Applications/HostItem.xsd">
-	<hostitem:hostObject hostitem:name="Application" hostitem:identifier="Application" hostitem:type="Microsoft.Office.Interop.Word.Application" hostitem:cookie="Application" hostitem:modifier="Internal"/>
-	<hostitem:hostControl hostitem:name="CustomTaskPanes" hostitem:identifier="CustomTaskPanes" hostitem:type="Microsoft.Office.Tools.CustomTaskPaneCollection" hostitem:primaryCookie="CustomTaskPanes" hostitem:modifier="Internal"/>
-	<hostitem:hostControl hostitem:name="VstoSmartTags" hostitem:identifier="VstoSmartTags" hostitem:type="Microsoft.Office.Tools.SmartTagCollection" hostitem:primaryCookie="VstoSmartTags" hostitem:modifier="Internal"/>
-</hostitem:hostItem>
+<hostitem:hostItem hostitem:baseType="Microsoft.Office.Tools.AddInBase" hostitem:namespace="zaaReloaded2" hostitem:className="ThisAddIn" hostitem:identifier="ThisAddIn" hostitem:primaryCookie="AddIn" hostitem:master="true" hostitem:factoryType="Microsoft.Office.Tools.Word.ApplicationFactory" hostitem:startupIndex="0" xmlns:hostitem="http://schemas.microsoft.com/2004/VisualStudio/Tools/Applications/HostItem.xsd">
+  <hostitem:hostObject hostitem:name="Application" hostitem:identifier="Application" hostitem:type="Microsoft.Office.Interop.Word.Application" hostitem:cookie="Application" hostitem:modifier="Internal" />
+  <hostitem:hostControl hostitem:name="CustomTaskPanes" hostitem:identifier="CustomTaskPanes" hostitem:type="Microsoft.Office.Tools.CustomTaskPaneCollection" hostitem:primaryCookie="CustomTaskPanes" hostitem:modifier="Internal" />
+  <hostitem:hostControl hostitem:name="VstoSmartTags" hostitem:identifier="VstoSmartTags" hostitem:type="Microsoft.Office.Tools.SmartTagCollection" hostitem:primaryCookie="VstoSmartTags" hostitem:modifier="Internal" />
+</hostitem:hostItem>
--- a/zaaReloaded2/ThisAddIn.cs
+++ b/zaaReloaded2/ThisAddIn.cs
@ -178,6 +178,8 @@ namespace zaaReloaded2

        void CentralHandler_ManageExceptionCallback(object sender, Bovender.ExceptionHandler.ManageExceptionEventArgs e)
        {
+            Logger.Fatal("*** EXCEPTION ***");
+            Logger.Fatal(e.Exception);
            e.IsHandled = true;
            ExceptionViewModel vm = new ExceptionViewModel(e.Exception);
            vm.InjectInto<ExceptionView>().ShowDialogInForm();
--- a/zaaReloaded2/VERSION
+++ b/zaaReloaded2/VERSION
@ -1,2 +1,2 @@
-2.4.2
-2.4.2.0
+2.5.0
+2.5.0.0
--- a/zaaReloaded2/ViewModels/ControlElementViewModel.cs
+++ b/zaaReloaded2/ViewModels/ControlElementViewModel.cs
@ -16,12 +16,8 @@
 * limitations under the License.
 */
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Bovender.Mvvm.ViewModels;
 using zaaReloaded2.Controller.Elements;
-using System.Diagnostics;
 using System.Collections.ObjectModel;

 namespace zaaReloaded2.ViewModels
--- a/zaaReloaded2/app.config
+++ b/zaaReloaded2/app.config
@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 	app.config
 	part of zaaReloaded2
@ -21,7 +20,7 @@
 <configuration>
    <configSections>
        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="zaaReloaded2.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+            <section name="zaaReloaded2.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
        </sectionGroup>
    </configSections>
    <applicationSettings>
@ -29,9 +28,6 @@
            <setting name="AddinName" serializeAs="String">
                <value>zaaReloaded2</value>
            </setting>
-            <setting name="PubYear" serializeAs="String">
-                <value>2017</value>
-            </setting>
            <setting name="Authors" serializeAs="String">
                <value>Daniel Kraus</value>
            </setting>
@ -81,7 +77,7 @@
                <value>BITTE_ERGÄNZEN</value>
            </setting>
            <setting name="Repository" serializeAs="String">
-                <value>https://git.bovender.de</value>
+                <value>https://git.bovender.de/daniel/zaaReloaded2</value>
            </setting>
            <setting name="DrugsParagraph" serializeAs="String">
                <value>zaaReloaded2-Medikamente</value>
@ -95,14 +91,17 @@
            <setting name="UserSettingsFile" serializeAs="String">
                <value>settings.yml</value>
            </setting>
+            <setting name="PubYear" serializeAs="String">
+                <value>2018</value>
+            </setting>
        </zaaReloaded2.Properties.Settings>
    </applicationSettings>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
-        <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+        <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
--- a/zaaReloaded2/packages.config
+++ b/zaaReloaded2/packages.config
@ -1,26 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!--
-	packages.config
-	part of zaaReloaded2
-	
-	Copyright 2015-2018 Daniel Kraus
-	
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	    http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-->
 <packages>
-  <package id="Bovender" version="0.17.0.0" targetFramework="net40" />
  <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
-  <package id="YamlDotNet.Signed" version="4.1.0" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.11" targetFramework="net40" />
+  <package id="YamlDotNet" version="5.2.1" targetFramework="net40" />
 </packages>
--- a/zaaReloaded2/zaaReloaded2.csproj
+++ b/zaaReloaded2/zaaReloaded2.csproj
@ -36,6 +36,7 @@
    </UpgradeBackupLocation>
    <OldToolsVersion>12.0</OldToolsVersion>
    <VSTO_TrustAssembliesLocation>true</VSTO_TrustAssembliesLocation>
+    <TargetFrameworkProfile />
    <BootstrapperEnabled>true</BootstrapperEnabled>
    <PublishUrl>publish\</PublishUrl>
    <InstallUrl />
@ -58,6 +59,11 @@
      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
      <Install>true</Install>
    </BootstrapperPackage>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
      <Visible>False</Visible>
      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
@ -120,6 +126,7 @@
    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
    <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <!--
    This section defines properties that are set when the "Release" configuration is selected.
@ -144,15 +151,15 @@
    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
    <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <!--
    This section specifies references for the project.
  -->
  <ItemGroup>
    <Reference Include="Accessibility" />
-    <Reference Include="Bovender, Version=0.17.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bovender.0.17.0.0\lib\net40\Bovender.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Bovender">
+      <HintPath>..\..\bovender\Bovender\bin\Debug\Bovender.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
    <Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
@ -166,8 +173,7 @@
    </Reference>
    <Reference Include="Microsoft.VisualStudio.Tools.Applications.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\NLog.4.5.11\lib\net40-client\NLog.dll</HintPath>
    </Reference>
    <Reference Include="Office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
      <EmbedInteropTypes>True</EmbedInteropTypes>
@ -181,7 +187,10 @@
    <Reference Include="System.configuration" />
    <Reference Include="System.Data" />
    <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Expression.Blend.Sdk.1.0.2\lib\net40-client\System.Windows.Interactivity.dll</HintPath>
@ -193,9 +202,8 @@
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="WindowsBase" />
-    <Reference Include="YamlDotNet, Version=4.1.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
-      <HintPath>..\packages\YamlDotNet.Signed.4.1.0\lib\net35\YamlDotNet.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="YamlDotNet, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.5.2.1\lib\net35\YamlDotNet.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@ -499,13 +507,14 @@
    <SignManifests>true</SignManifests>
  </PropertyGroup>
  <PropertyGroup>
-    <ManifestKeyFile>zaaReloaded2.pfx</ManifestKeyFile>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
  </PropertyGroup>
  <PropertyGroup>
-    <ManifestCertificateThumbprint>23BEC8B1B1E83ACA6E769043D526DF27B7F3B5B4</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>F20396CB288028D87B0A781625F2E41675ECC16A</ManifestCertificateThumbprint>
  </PropertyGroup>
  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
  </PropertyGroup>
  <PropertyGroup>
    <AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
Author	SHA1	Message	Date
Daniel Kraus	f83c538c94	Adjust settings serialization and deserialization to YamlDotNet 5.2.1.	2018-11-18 19:55:43 +01:00
Daniel Kraus	f32d3a64fc	Revert to target .NET 4.0 again...	2018-11-18 16:19:39 +01:00
Daniel Kraus	4dd6a35134	Update NuGet packages except YamlDotNet.	2018-11-16 13:56:15 +01:00
Daniel Kraus	cd90d330e1	Unsign assemblies.	2018-11-16 13:48:14 +01:00
Daniel Kraus	6f3c2e5b19	Upgrade to target .NET 4.5.2, Visual Studio 2017. - Verbessert: Upgrade der Framework-Targetversion von 4.0 auf 4.5.2.	2018-11-16 09:25:57 +01:00