From 6f3c2e5b19821315b42105aa5f1319662d5f07f3 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <bovender@bovender.de>
Date: Fri, 16 Nov 2018 09:25:57 +0100
Subject: [PATCH] Upgrade to target .NET 4.5.2, Visual Studio 2017.

- Verbessert: Upgrade der Framework-Targetversion von 4.0 auf 4.5.2.
---
 Tests/Tests.csproj                           |  5 ++++-
 Tests/app.config                             |  8 +++----
 Tests/packages.config                        |  6 +++---
 zaaReloaded2.sln                             |  5 -----
 zaaReloaded2/Properties/Settings.Designer.cs | 22 ++++++++++----------
 zaaReloaded2/Properties/Settings.settings    | 10 ++++-----
 zaaReloaded2/ThisAddIn.Designer.xml          | 10 ++++-----
 zaaReloaded2/app.config                      | 19 ++++++++---------
 zaaReloaded2/packages.config                 |  5 ++---
 zaaReloaded2/zaaReloaded2.csproj             | 10 ++++++---
 10 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 8f090f7..d2f355e 100755
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -16,6 +16,7 @@
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -25,6 +26,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,6 +35,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
diff --git a/Tests/app.config b/Tests/app.config
index 9fa19d3..8d2a273 100755
--- 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>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
diff --git a/Tests/packages.config b/Tests/packages.config
index 3ba2bfb..b68cdf3 100755
--- a/Tests/packages.config
+++ b/Tests/packages.config
@@ -1,8 +1,8 @@
 <?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="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" requireReinstallation="true" />
+  <package id="NLog" version="4.4.12" targetFramework="net40" requireReinstallation="true" />
+  <package id="NUnit" version="3.8.1" targetFramework="net40" requireReinstallation="true" />
   <package id="YamlDotNet.Signed" version="4.2.1" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/zaaReloaded2.sln b/zaaReloaded2.sln
index 4de881f..dc3e80d 100755
--- 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}"
diff --git a/zaaReloaded2/Properties/Settings.Designer.cs b/zaaReloaded2/Properties/Settings.Designer.cs
index ed0cc27..b7bad0b 100755
--- 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"]));
+            }
+        }
     }
 }
diff --git a/zaaReloaded2/Properties/Settings.settings b/zaaReloaded2/Properties/Settings.settings
index 1e41af2..79d3b2c 100755
--- 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>
\ No newline at end of file
diff --git a/zaaReloaded2/ThisAddIn.Designer.xml b/zaaReloaded2/ThisAddIn.Designer.xml
index 68447ab..3459a3f 100755
--- 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>
\ No newline at end of file
diff --git a/zaaReloaded2/app.config b/zaaReloaded2/app.config
index f64d1f8..a08a058 100755
--- 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>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
diff --git a/zaaReloaded2/packages.config b/zaaReloaded2/packages.config
index 9d3912d..613effd 100755
--- a/zaaReloaded2/packages.config
+++ b/zaaReloaded2/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 	packages.config
 	part of zaaReloaded2
@@ -20,7 +19,7 @@
 -->
 <packages>
   <package id="Bovender" version="0.17.0.0" targetFramework="net40" />
-  <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
+  <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" requireReinstallation="true" />
   <package id="YamlDotNet.Signed" version="4.1.0" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.4.12" targetFramework="net40" requireReinstallation="true" />
 </packages>
\ No newline at end of file
diff --git a/zaaReloaded2/zaaReloaded2.csproj b/zaaReloaded2/zaaReloaded2.csproj
index 537b37a..e67a0b1 100755
--- a/zaaReloaded2/zaaReloaded2.csproj
+++ b/zaaReloaded2/zaaReloaded2.csproj
@@ -27,7 +27,7 @@
     <NoStandardLibraries>false</NoStandardLibraries>
     <RootNamespace>zaaReloaded2</RootNamespace>
     <AssemblyName>zaaReloaded2</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <DefineConstants>VSTO40</DefineConstants>
     <IsWebBootstrapper>False</IsWebBootstrapper>
     <FileUpgradeFlags>
@@ -51,6 +51,7 @@
     <FriendlyName>zaaReloaded2</FriendlyName>
     <OfficeApplicationDescription />
     <LoadBehavior>3</LoadBehavior>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">
@@ -120,6 +121,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,6 +146,7 @@
     <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
     <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <!--
     This section specifies references for the project.
@@ -499,10 +502,11 @@
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>zaaReloaded2.pfx</ManifestKeyFile>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>23BEC8B1B1E83ACA6E769043D526DF27B7F3B5B4</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>F20396CB288028D87B0A781625F2E41675ECC16A</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>