diff --git a/GPW_Barcode.sln b/GPW_Barcode.sln index 79121e7..a533264 100644 --- a/GPW_Barcode.sln +++ b/GPW_Barcode.sln @@ -1,14 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34607.119 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GPW_Data", "GPW_Data\GPW_Data.csproj", "{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{A8543046-1C1B-4810-BC08-9AA7F9814BB0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "..\..\Steamware\SteamWareLib\SteamWare.csproj", "{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GPW_Barcode", "GPW_Barcode\GPW_Barcode.csproj", "{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}" EndProject Global @@ -125,50 +123,6 @@ Global {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Steamware|Any CPU.Build.0 = Release|Any CPU {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.WinLab|Any CPU.ActiveCfg = Release|Any CPU {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.WinLab|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_SP|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_SP|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_test|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_test|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.CMS|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.CMS|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.DEMO|Any CPU.ActiveCfg = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.DEMO|Any CPU.Build.0 = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.deploy|Any CPU.ActiveCfg = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.deploy|Any CPU.Build.0 = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01_SP|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01_SP|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01_TK|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01_TK|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02_SP|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02_SP|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02_TK|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02_TK|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.MoonProDemo-OVH|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.MoonProDemo-OVH|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.Build.0 = Release|Any CPU {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.218_SP|Any CPU.ActiveCfg = Release|Any CPU {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.218_SP|Any CPU.Build.0 = Release|Any CPU {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.218_test|Any CPU.ActiveCfg = Release|Any CPU diff --git a/GPW_Barcode/App_Readme/Elmah.txt b/GPW_Barcode/App_Readme/Elmah.txt deleted file mode 100644 index 784b309..0000000 --- a/GPW_Barcode/App_Readme/Elmah.txt +++ /dev/null @@ -1,15 +0,0 @@ -A new HTTP handler has been configured in your application for consulting the -error log and its feeds. It is reachable at elmah.axd under your application -root. If, for example, your application is deployed at http://www.example.com, -the URL for ELMAH would be http://www.example.com/elmah.axd. You can, of -course, change this path in your application's configuration file. - -ELMAH is also set up to be secure such that it can only be accessed locally. -You can enable remote access but then it is paramount that you secure access -to authorized users or/and roles only. This can be done using standard -authorization rules and configuration already built into ASP.NET. For more -information, see http://code.google.com/p/elmah/wiki/SecuringErrorLogPages on -the project site. - -Please review the commented out authorization section under - and make the appropriate changes. diff --git a/GPW_Barcode/Barcode.aspx.cs b/GPW_Barcode/Barcode.aspx.cs index 27a8ba4..13ca409 100644 --- a/GPW_Barcode/Barcode.aspx.cs +++ b/GPW_Barcode/Barcode.aspx.cs @@ -1,14 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; +using GPW_data; +using System; using System.Web.UI; -using System.Web.UI.WebControls; -using GPW_data; namespace GPW_Barcode { - public partial class Barcode : System.Web.UI.Page + public partial class Barcode : System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) { diff --git a/GPW_Barcode/Core/Compression/Snappy/lib/win/snappy32.dll b/GPW_Barcode/Core/Compression/Snappy/lib/win/snappy32.dll new file mode 100644 index 0000000..afc82ca Binary files /dev/null and b/GPW_Barcode/Core/Compression/Snappy/lib/win/snappy32.dll differ diff --git a/GPW_Barcode/Core/Compression/Snappy/lib/win/snappy64.dll b/GPW_Barcode/Core/Compression/Snappy/lib/win/snappy64.dll new file mode 100644 index 0000000..36cd5fe Binary files /dev/null and b/GPW_Barcode/Core/Compression/Snappy/lib/win/snappy64.dll differ diff --git a/GPW_Barcode/Core/Compression/Zstandard/lib/win/libzstd.dll b/GPW_Barcode/Core/Compression/Zstandard/lib/win/libzstd.dll new file mode 100644 index 0000000..e669123 Binary files /dev/null and b/GPW_Barcode/Core/Compression/Zstandard/lib/win/libzstd.dll differ diff --git a/GPW_Barcode/Default.aspx.cs b/GPW_Barcode/Default.aspx.cs index a86b75c..67a8567 100644 --- a/GPW_Barcode/Default.aspx.cs +++ b/GPW_Barcode/Default.aspx.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; namespace GPW.BarcodeArea { diff --git a/GPW_Barcode/GPW_Barcode.csproj b/GPW_Barcode/GPW_Barcode.csproj index 3ce5b91..7371d63 100644 --- a/GPW_Barcode/GPW_Barcode.csproj +++ b/GPW_Barcode/GPW_Barcode.csproj @@ -67,10 +67,6 @@ ..\packages\DnsClient.1.6.1\lib\net45\DnsClient.dll - - ..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll - True - ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll @@ -81,17 +77,20 @@ ..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll - - ..\packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + ..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll ..\packages\MongoDB.Bson.2.24.0\lib\netstandard2.0\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.24.0\lib\netstandard2.0\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.23.1\lib\netstandard2.0\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.24.0\lib\netstandard2.0\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.23.1\lib\netstandard2.0\MongoDB.Driver.Core.dll ..\packages\MongoDB.Libmongocrypt.1.8.2\lib\netstandard2.0\MongoDB.Libmongocrypt.dll @@ -129,6 +128,7 @@ ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + @@ -137,6 +137,11 @@ ..\packages\System.Diagnostics.PerformanceCounter.6.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll + + ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll + True + True + ..\packages\System.IO.Pipelines.6.0.3\lib\net461\System.IO.Pipelines.dll @@ -144,18 +149,24 @@ ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True + True + - - ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll - True - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll + True + True + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -165,6 +176,9 @@ + + ..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll True @@ -184,6 +198,9 @@ ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll True + + ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll + ..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll @@ -237,7 +254,6 @@ - @@ -519,6 +535,9 @@ + + + diff --git a/GPW_Barcode/Global.asax.cs b/GPW_Barcode/Global.asax.cs index 9cd8de8..3fc815e 100644 --- a/GPW_Barcode/Global.asax.cs +++ b/GPW_Barcode/Global.asax.cs @@ -1,11 +1,7 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Web; using System.Web.Optimization; using System.Web.Routing; -using System.Web.Security; -using System.Web.SessionState; namespace GPW_Barcode { diff --git a/GPW_Barcode/Web.config b/GPW_Barcode/Web.config index 88a5908..85f3da4 100644 --- a/GPW_Barcode/Web.config +++ b/GPW_Barcode/Web.config @@ -1,17 +1,10 @@ - + - - -
-
-
-
- - + - - + + - + - - + + - - - - - - - + + + - - - - + + + + - - - + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - + - - - - + + + + - - - - + + + + - - - + + + - + - - + + - + - - + + - - + + - + - - - - - + + + + + - + - - - - + + + + - + - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - - - + \ No newline at end of file diff --git a/GPW_Barcode/WebMasterPages/AjaxSimpleFullBCode.Master.cs b/GPW_Barcode/WebMasterPages/AjaxSimpleFullBCode.Master.cs index 9158efe..0ae0f0c 100644 --- a/GPW_Barcode/WebMasterPages/AjaxSimpleFullBCode.Master.cs +++ b/GPW_Barcode/WebMasterPages/AjaxSimpleFullBCode.Master.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; using System.Web.UI; -using System.Web.UI.WebControls; namespace GPW.WebMasterPages { diff --git a/GPW_Barcode/WebUserControls/mod_bCodeTimb.ascx.cs b/GPW_Barcode/WebUserControls/mod_bCodeTimb.ascx.cs index d1b15d0..f619291 100644 --- a/GPW_Barcode/WebUserControls/mod_bCodeTimb.ascx.cs +++ b/GPW_Barcode/WebUserControls/mod_bCodeTimb.ascx.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; +using GPW_data; using SteamWare; -using GPW_data; +using System; +using System.Web.UI; namespace GPW.WebUserControls { diff --git a/GPW_Barcode/WebUserControls/mod_menuBottomFullBCode.ascx.cs b/GPW_Barcode/WebUserControls/mod_menuBottomFullBCode.ascx.cs index ba372c8..3475716 100644 --- a/GPW_Barcode/WebUserControls/mod_menuBottomFullBCode.ascx.cs +++ b/GPW_Barcode/WebUserControls/mod_menuBottomFullBCode.ascx.cs @@ -1,16 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; +using GPW_data; using SteamWare; -using GPW_data; +using System; using System.Configuration; +using System.Web.UI; namespace GPW.WebUserControls { - public partial class mod_menuBottomFullBCode : System.Web.UI.UserControl + public partial class mod_menuBottomFullBCode : System.Web.UI.UserControl { protected void Page_Load(object sender, EventArgs e) diff --git a/GPW_Barcode/packages.config b/GPW_Barcode/packages.config index cf32fc6..f20701a 100644 --- a/GPW_Barcode/packages.config +++ b/GPW_Barcode/packages.config @@ -9,8 +9,6 @@ - - @@ -21,11 +19,12 @@ - + + - - + + @@ -38,22 +37,26 @@ - + + - + + + + diff --git a/GPW_data/App.config b/GPW_data/App.config index d708a50..657ef13 100644 --- a/GPW_data/App.config +++ b/GPW_data/App.config @@ -1,83 +1,83 @@ - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/packages/elmah.1.2.2/Readme.txt b/packages/elmah.1.2.2/Readme.txt deleted file mode 100644 index 784b309..0000000 --- a/packages/elmah.1.2.2/Readme.txt +++ /dev/null @@ -1,15 +0,0 @@ -A new HTTP handler has been configured in your application for consulting the -error log and its feeds. It is reachable at elmah.axd under your application -root. If, for example, your application is deployed at http://www.example.com, -the URL for ELMAH would be http://www.example.com/elmah.axd. You can, of -course, change this path in your application's configuration file. - -ELMAH is also set up to be secure such that it can only be accessed locally. -You can enable remote access but then it is paramount that you secure access -to authorized users or/and roles only. This can be done using standard -authorization rules and configuration already built into ASP.NET. For more -information, see http://code.google.com/p/elmah/wiki/SecuringErrorLogPages on -the project site. - -Please review the commented out authorization section under - and make the appropriate changes. diff --git a/packages/elmah.1.2.2/content/App_Readme/Elmah.txt b/packages/elmah.1.2.2/content/App_Readme/Elmah.txt deleted file mode 100644 index 784b309..0000000 --- a/packages/elmah.1.2.2/content/App_Readme/Elmah.txt +++ /dev/null @@ -1,15 +0,0 @@ -A new HTTP handler has been configured in your application for consulting the -error log and its feeds. It is reachable at elmah.axd under your application -root. If, for example, your application is deployed at http://www.example.com, -the URL for ELMAH would be http://www.example.com/elmah.axd. You can, of -course, change this path in your application's configuration file. - -ELMAH is also set up to be secure such that it can only be accessed locally. -You can enable remote access but then it is paramount that you secure access -to authorized users or/and roles only. This can be done using standard -authorization rules and configuration already built into ASP.NET. For more -information, see http://code.google.com/p/elmah/wiki/SecuringErrorLogPages on -the project site. - -Please review the commented out authorization section under - and make the appropriate changes. diff --git a/packages/elmah.1.2.2/content/web.config.transform b/packages/elmah.1.2.2/content/web.config.transform deleted file mode 100644 index 364c347..0000000 --- a/packages/elmah.1.2.2/content/web.config.transform +++ /dev/null @@ -1,59 +0,0 @@ - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/elmah.1.2.2/elmah.1.2.2.nupkg b/packages/elmah.1.2.2/elmah.1.2.2.nupkg deleted file mode 100644 index c56927b..0000000 Binary files a/packages/elmah.1.2.2/elmah.1.2.2.nupkg and /dev/null differ diff --git a/packages/elmah.corelibrary.1.2.2/elmah.corelibrary.1.2.2.nupkg b/packages/elmah.corelibrary.1.2.2/elmah.corelibrary.1.2.2.nupkg deleted file mode 100644 index 7ea3e09..0000000 Binary files a/packages/elmah.corelibrary.1.2.2/elmah.corelibrary.1.2.2.nupkg and /dev/null differ diff --git a/packages/elmah.corelibrary.1.2.2/lib/Elmah.dll b/packages/elmah.corelibrary.1.2.2/lib/Elmah.dll deleted file mode 100644 index 1851d9a..0000000 Binary files a/packages/elmah.corelibrary.1.2.2/lib/Elmah.dll and /dev/null differ