From dc240e7ff9841f15e8acbe845156fa9c0383c4a2 Mon Sep 17 00:00:00 2001 From: S T Chan Date: Fri, 31 May 2019 03:51:57 -0400 Subject: [PATCH] Target framework changed to 4.6.1 --- PdfScribe/App.config | 22 +- PdfScribe/PdfScribe.csproj | 300 +++++++++--------- PdfScribe/Properties/Resources.Designer.cs | 143 +++++---- PdfScribeCore/PdfScribeCore.csproj | 226 ++++++------- .../PdfScribeInstallCustomAction.csproj | 205 ++++++------ 5 files changed, 457 insertions(+), 439 deletions(-) diff --git a/PdfScribe/App.config b/PdfScribe/App.config index 742d0a4..3b5a589 100644 --- a/PdfScribe/App.config +++ b/PdfScribe/App.config @@ -1,25 +1,21 @@ - + - -
+ +
- + - + - + - - - + + + diff --git a/PdfScribe/PdfScribe.csproj b/PdfScribe/PdfScribe.csproj index 5c453e6..0bef80a 100644 --- a/PdfScribe/PdfScribe.csproj +++ b/PdfScribe/PdfScribe.csproj @@ -1,154 +1,160 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2} - WinExe - Properties - PdfScribe - PdfScribe - v4.0 - - - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - PdfScribe.Program - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - - - true - bin\Debug\ - DEBUG;TRACE - full - AnyCPU - prompt - - - bin\Release\ - TRACE - true - pdbonly - AnyCPU - prompt - - - app.manifest - - - Resources\AdobeIcon.ico - - - - - - - - - - - - - - - PdfScribeSharedAssemblyInfo.cs - - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - Form - - - SetOutputFilename.cs - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SetOutputFilename.cs - - - Designer - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - gsdll64.dll - PreserveNewest - - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2} + WinExe + Properties + PdfScribe + PdfScribe + v4.6.1 + + + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + + + x86 + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + x86 + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + + + PdfScribe.Program + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + false + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + false + + + true + bin\Debug\ + DEBUG;TRACE + full + AnyCPU + prompt + false + + + bin\Release\ + TRACE + true + pdbonly + AnyCPU + prompt + false + + + app.manifest + + + Resources\AdobeIcon.ico + + + + + + + + + + + + + + + PdfScribeSharedAssemblyInfo.cs + + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + Form + + + SetOutputFilename.cs + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + SetOutputFilename.cs + + + Designer + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + gsdll64.dll + PreserveNewest + + + + + + + + --> \ No newline at end of file diff --git a/PdfScribe/Properties/Resources.Designer.cs b/PdfScribe/Properties/Resources.Designer.cs index 5b985b3..c8bbee2 100644 --- a/PdfScribe/Properties/Resources.Designer.cs +++ b/PdfScribe/Properties/Resources.Designer.cs @@ -1,70 +1,73 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.1008 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace PdfScribe.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PdfScribe.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - internal static System.Drawing.Icon AdobeIcon { - get { - object obj = ResourceManager.GetObject("AdobeIcon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - } -} +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace PdfScribe.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PdfScribe.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon AdobeIcon { + get { + object obj = ResourceManager.GetObject("AdobeIcon", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + } +} diff --git a/PdfScribeCore/PdfScribeCore.csproj b/PdfScribeCore/PdfScribeCore.csproj index eadb1d8..884d20c 100644 --- a/PdfScribeCore/PdfScribeCore.csproj +++ b/PdfScribeCore/PdfScribeCore.csproj @@ -1,117 +1,123 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003} - Library - Properties - PdfScribeCore - PdfScribeCore - v4.0 - - - 512 - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - true - true - false - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - true - true - false - - - - true - bin\Debug\ - DEBUG;TRACE - full - AnyCPU - prompt - true - true - false - - - bin\Release\ - TRACE - true - pdbonly - AnyCPU - prompt - true - true - - - - - - - - - - - - - - - - - - - - PdfScribeSharedAssemblyInfo.cs - - - - - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003} + Library + Properties + PdfScribeCore + PdfScribeCore + v4.6.1 + + + 512 + + + x86 + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + x86 + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + true + true + false + false + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + true + true + false + false + + + + true + bin\Debug\ + DEBUG;TRACE + full + AnyCPU + prompt + true + true + false + false + + + bin\Release\ + TRACE + true + pdbonly + AnyCPU + prompt + true + true + false + + + + + + + + + + + + + + + + + + + + PdfScribeSharedAssemblyInfo.cs + + + + + + + + + + + --> \ No newline at end of file diff --git a/PdfScribeInstallCustomAction/PdfScribeInstallCustomAction.csproj b/PdfScribeInstallCustomAction/PdfScribeInstallCustomAction.csproj index 6d62185..691aa0a 100644 --- a/PdfScribeInstallCustomAction/PdfScribeInstallCustomAction.csproj +++ b/PdfScribeInstallCustomAction/PdfScribeInstallCustomAction.csproj @@ -1,100 +1,107 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {E8679E1B-8C89-4201-97D5-7E43C5A486C9} - Library - Properties - PdfScribeInstallCustomAction - PdfScribeInstallCustomAction - v4.0 - 512 - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - true - true - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - true - true - - - true - bin\Debug\ - DEBUG;TRACE - full - AnyCPU - prompt - true - true - - - bin\Release\ - TRACE - true - pdbonly - AnyCPU - prompt - true - true - - - - - - - - - - - - - - - - - - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003} - PdfScribeCore - - - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {E8679E1B-8C89-4201-97D5-7E43C5A486C9} + Library + Properties + PdfScribeInstallCustomAction + PdfScribeInstallCustomAction + v4.6.1 + 512 + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + true + true + false + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + true + true + false + + + true + bin\Debug\ + DEBUG;TRACE + full + AnyCPU + prompt + true + true + false + + + bin\Release\ + TRACE + true + pdbonly + AnyCPU + prompt + true + true + false + + + + + + + + + + + + + + + + + + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003} + PdfScribeCore + + + + + + + + \ No newline at end of file