diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index 04d3e5c..aa4c97c 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -167,6 +167,21 @@ ..\packages\Microsoft.Owin.StaticFiles.4.2.0\lib\net45\Microsoft.Owin.StaticFiles.dll + + ..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Common.dll + + + ..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll + + + ..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Design.dll + + + ..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll + + + ..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.WinForms.dll + ..\packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 73b4481..dcfdbe7 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.11.27.0950")] -[assembly: AssemblyFileVersion("23.11.27.0950")] +[assembly: AssemblyVersion("23.12.06.1000")] +[assembly: AssemblyFileVersion("23.12.06.1000")] diff --git a/Project/SqlServerTypes/Loader.cs b/Project/SqlServerTypes/Loader.cs index b11d98d..92f9384 100644 --- a/Project/SqlServerTypes/Loader.cs +++ b/Project/SqlServerTypes/Loader.cs @@ -1,45 +1,45 @@ -//using System; -//using System.IO; -//using System.Runtime.InteropServices; +using System; +using System.IO; +using System.Runtime.InteropServices; -//namespace SqlServerTypes -//{ -// /// -// /// Utility methods related to CLR Types for SQL Server -// /// -// public class Utilities -// { -// [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] -// private static extern IntPtr LoadLibrary(string libname); +namespace SqlServerTypes +{ + /// + /// Utility methods related to CLR Types for SQL Server + /// + public class Utilities + { + [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] + private static extern IntPtr LoadLibrary(string libname); -// /// -// /// Loads the required native assemblies for the current architecture (x86 or x64) -// /// -// /// -// /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications -// /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. -// /// -// public static void LoadNativeAssemblies(string rootApplicationPath) -// { -// var nativeBinaryPath = IntPtr.Size > 4 -// ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") -// : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); + /// + /// Loads the required native assemblies for the current architecture (x86 or x64) + /// + /// + /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications + /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. + /// + public static void LoadNativeAssemblies(string rootApplicationPath) + { + var nativeBinaryPath = IntPtr.Size > 4 + ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") + : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); -// LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); -// LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); -// } + LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); + LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); + } -// private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) -// { -// var path = Path.Combine(nativeBinaryPath, assemblyName); -// var ptr = LoadLibrary(path); -// if (ptr == IntPtr.Zero) -// { -// throw new Exception(string.Format( -// "Error loading {0} (ErrorCode: {1})", -// assemblyName, -// Marshal.GetLastWin32Error())); -// } -// } -// } -//} \ No newline at end of file + private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) + { + var path = Path.Combine(nativeBinaryPath, assemblyName); + var ptr = LoadLibrary(path); + if (ptr == IntPtr.Zero) + { + throw new Exception(string.Format( + "Error loading {0} (ErrorCode: {1})", + assemblyName, + Marshal.GetLastWin32Error())); + } + } + } +} \ No newline at end of file diff --git a/Project/packages.config b/Project/packages.config index 4ffd783..3530ff2 100644 --- a/Project/packages.config +++ b/Project/packages.config @@ -18,8 +18,8 @@ - - + + diff --git a/SubProject/FBS0000/FBS0000.csproj b/SubProject/FBS0000/FBS0000.csproj index a5f8966..217fede 100644 --- a/SubProject/FBS0000/FBS0000.csproj +++ b/SubProject/FBS0000/FBS0000.csproj @@ -65,37 +65,34 @@ ..\..\DLL\libxl.net.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.Common.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Common.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.Design.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Design.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.WinForms.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.WinForms.dll ..\..\packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll - - ..\..\packages\NetOffice.Core.1.7.4.4\lib\net40\NetOffice.dll + + ..\..\packages\NetOfficeFw.Core.1.8.1\lib\net40\NetOffice.dll False - True - - ..\..\packages\NetOffice.Core.1.7.4.4\lib\net40\OfficeApi.dll + + ..\..\packages\NetOfficeFw.Core.1.8.1\lib\net40\OfficeApi.dll False - True - - ..\..\packages\NetOffice.Outlook.1.7.4.4\lib\net40\OutlookApi.dll + + ..\..\packages\NetOfficeFw.Outlook.1.8.1\lib\net40\OutlookApi.dll False - True @@ -113,10 +110,9 @@ - - ..\..\packages\NetOffice.Core.1.7.4.4\lib\net40\VBIDEApi.dll + + ..\..\packages\NetOfficeFw.Core.1.8.1\lib\net40\VBIDEApi.dll False - True @@ -247,7 +243,6 @@ rHolidaySummary.cs - Model_BS0000.tt diff --git a/SubProject/FBS0000/Model_BS0000.Designer.cs b/SubProject/FBS0000/Model_BS0000.Designer.cs index 650ca64..c11d704 100644 --- a/SubProject/FBS0000/Model_BS0000.Designer.cs +++ b/SubProject/FBS0000/Model_BS0000.Designer.cs @@ -1,4 +1,4 @@ -// 모델 'D:\Source\##### 완료아이템\(014) GroupWare\Source\SubProject\FBS0000\Model_BS0000.edmx'에 대해 T4 코드 생성이 사용됩니다. +// 모델 'D:\Source\##### 완료아이템\(0014) GroupWare\Source\SubProject\FBS0000\Model_BS0000.edmx'에 대해 T4 코드 생성이 사용됩니다. // 레거시 코드 생성을 사용하려면 '코드 생성 전략' 디자이너 속성의 값을 // 'Legacy ObjectContext'로 변경하십시오. 이 속성은 모델이 디자이너에서 열릴 때 // 속성 창에서 사용할 수 있습니다. diff --git a/SubProject/FBS0000/Properties/Resources.Designer.cs b/SubProject/FBS0000/Properties/Resources.Designer.cs index b1fc0a1..0a41c72 100644 --- a/SubProject/FBS0000/Properties/Resources.Designer.cs +++ b/SubProject/FBS0000/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace FBS0000.Properties { // 클래스에서 자동으로 생성되었습니다. // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/SubProject/FBS0000/Properties/Settings.Designer.cs b/SubProject/FBS0000/Properties/Settings.Designer.cs index 3608638..67d6cf9 100644 --- a/SubProject/FBS0000/Properties/Settings.Designer.cs +++ b/SubProject/FBS0000/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace FBS0000.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/SubProject/FBS0000/Properties/Settings.settings b/SubProject/FBS0000/Properties/Settings.settings index 83ece1a..700a7f5 100644 --- a/SubProject/FBS0000/Properties/Settings.settings +++ b/SubProject/FBS0000/Properties/Settings.settings @@ -4,7 +4,7 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> diff --git a/SubProject/FBS0000/SqlServerTypes/Loader.cs b/SubProject/FBS0000/SqlServerTypes/Loader.cs deleted file mode 100644 index b11d98d..0000000 --- a/SubProject/FBS0000/SqlServerTypes/Loader.cs +++ /dev/null @@ -1,45 +0,0 @@ -//using System; -//using System.IO; -//using System.Runtime.InteropServices; - -//namespace SqlServerTypes -//{ -// /// -// /// Utility methods related to CLR Types for SQL Server -// /// -// public class Utilities -// { -// [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] -// private static extern IntPtr LoadLibrary(string libname); - -// /// -// /// Loads the required native assemblies for the current architecture (x86 or x64) -// /// -// /// -// /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications -// /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. -// /// -// public static void LoadNativeAssemblies(string rootApplicationPath) -// { -// var nativeBinaryPath = IntPtr.Size > 4 -// ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") -// : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); - -// LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); -// LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); -// } - -// private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) -// { -// var path = Path.Combine(nativeBinaryPath, assemblyName); -// var ptr = LoadLibrary(path); -// if (ptr == IntPtr.Zero) -// { -// throw new Exception(string.Format( -// "Error loading {0} (ErrorCode: {1})", -// assemblyName, -// Marshal.GetLastWin32Error())); -// } -// } -// } -//} \ No newline at end of file diff --git a/SubProject/FBS0000/app.config b/SubProject/FBS0000/app.config index c58a74d..fb6f25f 100644 --- a/SubProject/FBS0000/app.config +++ b/SubProject/FBS0000/app.config @@ -1,27 +1,27 @@ - + -
+
- - - - - + + + + + - + - + - + - \ No newline at end of file + diff --git a/SubProject/FBS0000/packages.config b/SubProject/FBS0000/packages.config index 5870b1f..6dcd10a 100644 --- a/SubProject/FBS0000/packages.config +++ b/SubProject/FBS0000/packages.config @@ -2,8 +2,8 @@ - + - - + + \ No newline at end of file diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj index 964d165..cec68a3 100644 --- a/SubProject/FCM0000/FCM0000.csproj +++ b/SubProject/FCM0000/FCM0000.csproj @@ -69,40 +69,37 @@ ..\..\DLL\libxl.net.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.Common.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Common.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.Design.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Design.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.WinForms.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.WinForms.dll ..\..\packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll - - ..\..\packages\NetOffice.Core.1.7.4.4\lib\net40\NetOffice.dll + + ..\..\packages\NetOfficeFw.Core.1.8.1\lib\net40\NetOffice.dll False - True ..\..\packages\NetSpell.2.1.7\lib\NetSpell.SpellChecker.dll - - ..\..\packages\NetOffice.Core.1.7.4.4\lib\net40\OfficeApi.dll + + ..\..\packages\NetOfficeFw.Core.1.8.1\lib\net40\OfficeApi.dll False - True - - ..\..\packages\NetOffice.Outlook.1.7.4.4\lib\net40\OutlookApi.dll + + ..\..\packages\NetOfficeFw.Outlook.1.8.1\lib\net40\OutlookApi.dll False - True ..\..\packages\RichTextBoxEx.1.0.0\lib\PrintRichTextBox.dll @@ -123,10 +120,9 @@ - - ..\..\packages\NetOffice.Core.1.7.4.4\lib\net40\VBIDEApi.dll + + ..\..\packages\NetOfficeFw.Core.1.8.1\lib\net40\VBIDEApi.dll False - True @@ -250,7 +246,6 @@ fInventoryJagoPlace.cs - Form diff --git a/SubProject/FCM0000/Item/fItemAdd.Designer.cs b/SubProject/FCM0000/Item/fItemAdd.Designer.cs index 64c669d..dac4063 100644 --- a/SubProject/FCM0000/Item/fItemAdd.Designer.cs +++ b/SubProject/FCM0000/Item/fItemAdd.Designer.cs @@ -347,7 +347,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 30F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(669, 526); + this.ClientSize = new System.Drawing.Size(669, 520); this.Controls.Add(label5); this.Controls.Add(this.tbBarcode); this.Controls.Add(label4); @@ -377,8 +377,6 @@ this.Controls.Add(this.tbUnit); this.Font = new System.Drawing.Font("맑은 고딕", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8); - this.MaximizeBox = false; - this.MinimizeBox = false; this.MinimumSize = new System.Drawing.Size(685, 448); this.Name = "fItemAdd"; this.Text = "품목 추가"; diff --git a/SubProject/FCM0000/Item/fItemAdd.cs b/SubProject/FCM0000/Item/fItemAdd.cs index 20d8ec2..8114df5 100644 --- a/SubProject/FCM0000/Item/fItemAdd.cs +++ b/SubProject/FCM0000/Item/fItemAdd.cs @@ -51,7 +51,7 @@ namespace FCM0000.Item this.Location = new Point(0, 0); } this.Show(); - Application.DoEvents(); + //Application.DoEvents(); if (tbSid.Text.isEmpty()) tbSid.Focus(); else tbName.Focus(); diff --git a/SubProject/FCM0000/SqlServerTypes/Loader.cs b/SubProject/FCM0000/SqlServerTypes/Loader.cs deleted file mode 100644 index b11d98d..0000000 --- a/SubProject/FCM0000/SqlServerTypes/Loader.cs +++ /dev/null @@ -1,45 +0,0 @@ -//using System; -//using System.IO; -//using System.Runtime.InteropServices; - -//namespace SqlServerTypes -//{ -// /// -// /// Utility methods related to CLR Types for SQL Server -// /// -// public class Utilities -// { -// [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] -// private static extern IntPtr LoadLibrary(string libname); - -// /// -// /// Loads the required native assemblies for the current architecture (x86 or x64) -// /// -// /// -// /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications -// /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. -// /// -// public static void LoadNativeAssemblies(string rootApplicationPath) -// { -// var nativeBinaryPath = IntPtr.Size > 4 -// ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") -// : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); - -// LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); -// LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); -// } - -// private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) -// { -// var path = Path.Combine(nativeBinaryPath, assemblyName); -// var ptr = LoadLibrary(path); -// if (ptr == IntPtr.Zero) -// { -// throw new Exception(string.Format( -// "Error loading {0} (ErrorCode: {1})", -// assemblyName, -// Marshal.GetLastWin32Error())); -// } -// } -// } -//} \ No newline at end of file diff --git a/SubProject/FCM0000/packages.config b/SubProject/FCM0000/packages.config index 93c3455..490298a 100644 --- a/SubProject/FCM0000/packages.config +++ b/SubProject/FCM0000/packages.config @@ -1,9 +1,9 @@  - + - - + + \ No newline at end of file diff --git a/SubProject/FCOMMON/FCOMMON.csproj b/SubProject/FCOMMON/FCOMMON.csproj index ecea0a4..9b14ed9 100644 --- a/SubProject/FCOMMON/FCOMMON.csproj +++ b/SubProject/FCOMMON/FCOMMON.csproj @@ -52,19 +52,19 @@ - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.Common.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Common.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.Design.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Design.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.WinForms.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.WinForms.dll ..\..\packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll @@ -160,7 +160,6 @@ - diff --git a/SubProject/FCOMMON/SqlServerTypes/Loader.cs b/SubProject/FCOMMON/SqlServerTypes/Loader.cs deleted file mode 100644 index 92f9384..0000000 --- a/SubProject/FCOMMON/SqlServerTypes/Loader.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.IO; -using System.Runtime.InteropServices; - -namespace SqlServerTypes -{ - /// - /// Utility methods related to CLR Types for SQL Server - /// - public class Utilities - { - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - private static extern IntPtr LoadLibrary(string libname); - - /// - /// Loads the required native assemblies for the current architecture (x86 or x64) - /// - /// - /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications - /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. - /// - public static void LoadNativeAssemblies(string rootApplicationPath) - { - var nativeBinaryPath = IntPtr.Size > 4 - ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") - : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); - - LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); - LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); - } - - private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) - { - var path = Path.Combine(nativeBinaryPath, assemblyName); - var ptr = LoadLibrary(path); - if (ptr == IntPtr.Zero) - { - throw new Exception(string.Format( - "Error loading {0} (ErrorCode: {1})", - assemblyName, - Marshal.GetLastWin32Error())); - } - } - } -} \ No newline at end of file diff --git a/SubProject/FCOMMON/packages.config b/SubProject/FCOMMON/packages.config index c1f127b..3433bb7 100644 --- a/SubProject/FCOMMON/packages.config +++ b/SubProject/FCOMMON/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/SubProject/FED0000/Properties/Settings.Designer.cs b/SubProject/FED0000/Properties/Settings.Designer.cs index 9936b8b..cb26bd6 100644 --- a/SubProject/FED0000/Properties/Settings.Designer.cs +++ b/SubProject/FED0000/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace FED0000.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/SubProject/FED0000/Properties/Settings.settings b/SubProject/FED0000/Properties/Settings.settings index ea3f951..93ff237 100644 --- a/SubProject/FED0000/Properties/Settings.settings +++ b/SubProject/FED0000/Properties/Settings.settings @@ -1,10 +1,10 @@  - + <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> @@ -12,7 +12,7 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</ConnectionString> </SerializableConnectionString> Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123! diff --git a/SubProject/FED0000/app.config b/SubProject/FED0000/app.config index 3107aab..fa42649 100644 --- a/SubProject/FED0000/app.config +++ b/SubProject/FED0000/app.config @@ -5,8 +5,10 @@
- - + + diff --git a/SubProject/FEQ0000/FEQ0000.csproj b/SubProject/FEQ0000/FEQ0000.csproj index 1669487..a9d1e52 100644 --- a/SubProject/FEQ0000/FEQ0000.csproj +++ b/SubProject/FEQ0000/FEQ0000.csproj @@ -57,40 +57,34 @@ True - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.Common.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Common.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.Design.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Design.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll - - - ..\..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.WebDesign.DLL - - - ..\..\packages\Microsoft.ReportViewer.11.0.3366.16\lib\Microsoft.ReportViewer.WebForms.DLL + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.WinForms.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.WinForms.dll ..\..\packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll - - ..\..\packages\NetOfficeFw.Core.1.7.4.5\lib\net40\NetOffice.dll + + ..\..\packages\NetOfficeFw.Core.1.8.1\lib\net40\NetOffice.dll False - - ..\..\packages\NetOfficeFw.Core.1.7.4.5\lib\net40\OfficeApi.dll + + ..\..\packages\NetOfficeFw.Core.1.8.1\lib\net40\OfficeApi.dll False - - ..\..\packages\NetOfficeFw.Outlook.1.7.4.5\lib\net40\OutlookApi.dll + + ..\..\packages\NetOfficeFw.Outlook.1.8.1\lib\net40\OutlookApi.dll False @@ -109,8 +103,8 @@ - - ..\..\packages\NetOfficeFw.Core.1.7.4.5\lib\net40\VBIDEApi.dll + + ..\..\packages\NetOfficeFw.Core.1.8.1\lib\net40\VBIDEApi.dll False diff --git a/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs b/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs index 9df0174..01e0859 100644 --- a/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs +++ b/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs @@ -1,5 +1,4 @@ -using NetOffice.OfficeApi.Tools.Contribution; -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; diff --git a/SubProject/FEQ0000/app.config b/SubProject/FEQ0000/app.config index 57f24a3..21efc26 100644 --- a/SubProject/FEQ0000/app.config +++ b/SubProject/FEQ0000/app.config @@ -5,10 +5,8 @@
- - + + @@ -30,6 +28,14 @@ + + + + + + + + diff --git a/SubProject/FEQ0000/packages.config b/SubProject/FEQ0000/packages.config index 5411f0c..ada85e2 100644 --- a/SubProject/FEQ0000/packages.config +++ b/SubProject/FEQ0000/packages.config @@ -1,8 +1,7 @@  - - + - - + + \ No newline at end of file diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 519d199..7d23b26 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -62,40 +62,37 @@ ..\..\DLL\libxl.net.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.Common.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Common.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.Design.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Design.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.WinForms.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.WinForms.dll ..\..\packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll - - ..\..\packages\NetOffice.Core.1.7.4.4\lib\net40\NetOffice.dll + + ..\..\packages\NetOfficeFw.Core.1.8.1\lib\net40\NetOffice.dll False - True ..\..\packages\NetSpell.2.1.7\lib\NetSpell.SpellChecker.dll - - ..\..\packages\NetOffice.Core.1.7.4.4\lib\net40\OfficeApi.dll + + ..\..\packages\NetOfficeFw.Core.1.8.1\lib\net40\OfficeApi.dll False - True - - ..\..\packages\NetOffice.Outlook.1.7.4.4\lib\net40\OutlookApi.dll + + ..\..\packages\NetOfficeFw.Outlook.1.8.1\lib\net40\OutlookApi.dll False - True ..\..\packages\RichTextBoxEx.1.0.0\lib\PrintRichTextBox.dll @@ -122,10 +119,9 @@ ..\CMSControl\obj\Debug\UMSControl.dll - - ..\..\packages\NetOffice.Core.1.7.4.4\lib\net40\VBIDEApi.dll + + ..\..\packages\NetOfficeFw.Core.1.8.1\lib\net40\VBIDEApi.dll False - True diff --git a/SubProject/FPJ0000/packages.config b/SubProject/FPJ0000/packages.config index dae0b08..6188e87 100644 --- a/SubProject/FPJ0000/packages.config +++ b/SubProject/FPJ0000/packages.config @@ -2,10 +2,10 @@ - + - - + + \ No newline at end of file diff --git a/SubProject/FPM0000/FPM0000.csproj b/SubProject/FPM0000/FPM0000.csproj index 00e865a..8dad31a 100644 --- a/SubProject/FPM0000/FPM0000.csproj +++ b/SubProject/FPM0000/FPM0000.csproj @@ -51,19 +51,19 @@ - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.Common.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Common.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.Design.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.Design.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll - ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1449.0\lib\net40\Microsoft.ReportViewer.WinForms.dll + ..\..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\lib\net40\Microsoft.ReportViewer.WinForms.dll ..\..\packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll diff --git a/SubProject/FPM0000/packages.config b/SubProject/FPM0000/packages.config index 383fa6c..0df178f 100644 --- a/SubProject/FPM0000/packages.config +++ b/SubProject/FPM0000/packages.config @@ -1,7 +1,5 @@  - + - - \ No newline at end of file