v4.6.1

Tadelsucht · Oct 6, 2020 · 3e1c16a · 3e1c16a
1 parent 85c5df4
commit 3e1c16a
Show file tree

Hide file tree

Showing 11 changed files with 147 additions and 183 deletions.
diff --git a/BulkPDF/App.config b/BulkPDF/App.config
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
 
-    <supportedRuntime version="v2.0.50727" /></startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
 
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.5.5631.0" newVersion="2.5.5631.0" />
+        <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.5.5631.0" newVersion="2.5.5631.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/BulkPDF/BulkPDF.csproj b/BulkPDF/BulkPDF.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BulkPDF</RootNamespace>
     <AssemblyName>BulkPDF</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <IsWebBootstrapper>false</IsWebBootstrapper>

diff --git a/BulkPDF/MainForm.Designer.cs b/BulkPDF/MainForm.Designer.cs
diff --git a/BulkPDF/MainForm.resx b/BulkPDF/MainForm.resx
diff --git a/BulkPDF/Properties/Resources.Designer.cs b/BulkPDF/Properties/Resources.Designer.cs
diff --git a/BulkPDF/Properties/Settings.Designer.cs b/BulkPDF/Properties/Settings.Designer.cs
diff --git a/BulkPDF/ShortcutCreator.cs b/BulkPDF/ShortcutCreator.cs
@@ -37,27 +37,27 @@ private void bSelectConfiguration_Click(object sender, EventArgs e)
 
         private void bCreateShortcut_Click(object sender, EventArgs e)
         {
-            if (!String.IsNullOrEmpty(configurationFilePath))
-            {
-                SaveFileDialog saveFileDialog = new SaveFileDialog();
-                saveFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
-                saveFileDialog.Filter = "Shortcut|*.lnk";
-                if (saveFileDialog.ShowDialog() == DialogResult.OK)
-                {
-                    WshShell wshShell = new WshShell();
-                    IWshShortcut shortcut = (IWshShortcut)wshShell.CreateShortcut(saveFileDialog.FileName + ".lnk");
-                    shortcut.Arguments = "\"" + configurationFilePath + "\" wait";
-                    shortcut.WorkingDirectory = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-                    shortcut.TargetPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\" + "BulkPDFConsole.exe"; ;
-                    shortcut.Save();
+            //if (!String.IsNullOrEmpty(configurationFilePath))
+            //{
+            //    SaveFileDialog saveFileDialog = new SaveFileDialog();
+            //    saveFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
+            //    saveFileDialog.Filter = "Shortcut|*.lnk";
+            //    if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            //    {
+            //        WshShell wshShell = new WshShell();
+            //        IWshShortcut shortcut = (IWshShortcut)wshShell.CreateShortcut(saveFileDialog.FileName + ".lnk");
+            //        shortcut.Arguments = "\"" + configurationFilePath + "\" wait";
+            //        shortcut.WorkingDirectory = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
+            //        shortcut.TargetPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\" + "BulkPDFConsole.exe"; ;
+            //        shortcut.Save();
 
-                    MessageBox.Show(Properties.Resources.MessageFinished);
-                }
-            }
-            else
-            {
-                MessageBox.Show(Properties.Resources.MessageSelectConfiguration);
-            }
+            //        MessageBox.Show(Properties.Resources.MessageFinished);
+            //    }
+            //}
+            //else
+            //{
+            //    MessageBox.Show(Properties.Resources.MessageSelectConfiguration);
+            //}
         }
     }
 }
diff --git a/BulkPDFConsole/App.config b/BulkPDFConsole/App.config
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
 
-    <supportedRuntime version="v2.0.50727" /></startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.5.5631.0" newVersion="2.5.5631.0" />
+        <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.5.5631.0" newVersion="2.5.5631.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/BulkPDFConsole/BulkPDFConsole.csproj b/BulkPDFConsole/BulkPDFConsole.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BulkPDFConsole</RootNamespace>
     <AssemblyName>BulkPDFConsole</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Logo.ico</ApplicationIcon>