diff --git a/Common/ConfigurationExtension.cs b/Common/ConfigurationExtension.cs index b220da8..dca806c 100644 --- a/Common/ConfigurationExtension.cs +++ b/Common/ConfigurationExtension.cs @@ -231,59 +231,59 @@ public static Configuration GetCurrentConfiguration(this ConfigurationElement co return (Configuration)configProperty.GetValue(configElement, null); } -#if !NETSTANDARD2_0 - private static void ResetConfigurationForMono(AppDomain appDomain, string configFilePath) - { - appDomain.SetupInformation.ConfigurationFile = configFilePath; - - var configSystem = typeof(ConfigurationManager) - .GetField("configSystem", BindingFlags.Static | BindingFlags.NonPublic) - .GetValue(null); - - // clear previous state - typeof(ConfigurationManager) - .Assembly.GetTypes() - .Where(x => x.FullName == "System.Configuration.ClientConfigurationSystem") - .First() - .GetField("cfg", BindingFlags.Instance | BindingFlags.NonPublic) - .SetValue(configSystem, null); - } - - private static void ResetConfigurationForDotNet(AppDomain appDomain, string configFilePath) - { - appDomain.SetData("APP_CONFIG_FILE", configFilePath); - - // clear previous state - BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Static; - - typeof(ConfigurationManager) - .GetField("s_initState", flags) - .SetValue(null, 0); - - typeof(ConfigurationManager) - .GetField("s_configSystem", flags) - .SetValue(null, null); - - typeof(ConfigurationManager) - .Assembly.GetTypes() - .Where(x => x.FullName == "System.Configuration.ClientConfigPaths") - .First() - .GetField("s_current", flags) - .SetValue(null, null); - } - - /// - /// Reset application's configuration to a another config file - /// - /// the assosiated AppDomain - /// the config file path want to reset to - public static void ResetConfiguration(this AppDomain appDomain, string configFilePath) - { - if (Platform.IsMono) - ResetConfigurationForMono(appDomain, configFilePath); - else - ResetConfigurationForDotNet(appDomain, configFilePath); - } -#endif +//#if !NETSTANDARD2_0 + //private static void ResetConfigurationForMono(AppDomain appDomain, string configFilePath) + //{ + // appDomain.SetupInformation.ConfigurationFile = configFilePath; + + // var configSystem = typeof(ConfigurationManager) + // .GetField("configSystem", BindingFlags.Static | BindingFlags.NonPublic) + // .GetValue(null); + + // // clear previous state + // typeof(ConfigurationManager) + // .Assembly.GetTypes() + // .Where(x => x.FullName == "System.Configuration.ClientConfigurationSystem") + // .First() + // .GetField("cfg", BindingFlags.Instance | BindingFlags.NonPublic) + // .SetValue(configSystem, null); + //} + + //private static void ResetConfigurationForDotNet(AppDomain appDomain, string configFilePath) + //{ + // appDomain.SetData("APP_CONFIG_FILE", configFilePath); + + // // clear previous state + // BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Static; + + // typeof(ConfigurationManager) + // .GetField("s_initState", flags) + // .SetValue(null, 0); + + // typeof(ConfigurationManager) + // .GetField("s_configSystem", flags) + // .SetValue(null, null); + + // typeof(ConfigurationManager) + // .Assembly.GetTypes() + // .Where(x => x.FullName == "System.Configuration.ClientConfigPaths") + // .First() + // .GetField("s_current", flags) + // .SetValue(null, null); + //} + + ///// + ///// Reset application's configuration to a another config file + ///// + ///// the assosiated AppDomain + ///// the config file path want to reset to + //public static void ResetConfiguration(this AppDomain appDomain, string configFilePath) + //{ + // if (Platform.IsMono) + // ResetConfigurationForMono(appDomain, configFilePath); + // else + // ResetConfigurationForDotNet(appDomain, configFilePath); + //} +//#endif } } diff --git a/Common/SuperSocket.Common.csproj b/Common/SuperSocket.Common.csproj index 94fe8d2..75ba29f 100644 --- a/Common/SuperSocket.Common.csproj +++ b/Common/SuperSocket.Common.csproj @@ -1,11 +1,12 @@ - netstandard2.0 + netstandard2.1 + 1.0.1 - + diff --git a/Samples/00_superSocketLite_libs/netstandard2.1/RevDeBug.setup b/Samples/00_superSocketLite_libs/netstandard2.1/RevDeBug.setup new file mode 100644 index 0000000..d1bcbd7 --- /dev/null +++ b/Samples/00_superSocketLite_libs/netstandard2.1/RevDeBug.setup @@ -0,0 +1,8 @@ +Repository.Port=42742; +Repository.Address=127.0.0.1; +Application.Name=SuperSocket.SocketEngine; +SolutionName=SuperSocket.SocketEngine; +StateStorageClassName=LiveRecorder; +AuthorizationToken=; +Release=; +BacklogSize=1000; diff --git a/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.Common.dll b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.Common.dll new file mode 100644 index 0000000..1b718c9 Binary files /dev/null and b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.Common.dll differ diff --git a/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.Common.pdb b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.Common.pdb new file mode 100644 index 0000000..f386bfc Binary files /dev/null and b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.Common.pdb differ diff --git a/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketBase.dll b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketBase.dll new file mode 100644 index 0000000..e435da1 Binary files /dev/null and b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketBase.dll differ diff --git a/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketBase.pdb b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketBase.pdb new file mode 100644 index 0000000..889e64a Binary files /dev/null and b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketBase.pdb differ diff --git a/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.deps.json b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.deps.json new file mode 100644 index 0000000..eff2790 --- /dev/null +++ b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.deps.json @@ -0,0 +1,401 @@ +{ + "runtimeTarget": { + "name": ".NETStandard,Version=v2.1/", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETStandard,Version=v2.1": {}, + ".NETStandard,Version=v2.1/": { + "SuperSocket.SocketEngine/1.0.1": { + "dependencies": { + "SuperSocket.Common": "1.0.1", + "SuperSocket.SocketBase": "1.0.1", + "System.Diagnostics.PerformanceCounter": "4.6.0" + }, + "runtime": { + "SuperSocket.SocketEngine.dll": {} + } + }, + "Microsoft.Extensions.Configuration/2.1.0": { + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "2.1.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Configuration.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.Configuration.Abstractions/2.1.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.Configuration.Binder/2.1.0": { + "dependencies": { + "Microsoft.Extensions.Configuration": "2.1.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.0": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.Logging/2.1.0": { + "dependencies": { + "Microsoft.Extensions.Configuration.Binder": "2.1.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", + "Microsoft.Extensions.Logging.Abstractions": "2.1.0", + "Microsoft.Extensions.Options": "2.1.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Logging.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.Logging.Abstractions/2.1.0": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.Options/2.1.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", + "Microsoft.Extensions.Primitives": "2.1.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Options.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.Primitives/2.1.0": { + "dependencies": { + "System.Memory": "4.5.3", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "NLog/4.6.5": { + "runtime": { + "lib/netstandard2.0/NLog.dll": { + "assemblyVersion": "4.0.0.0", + "fileVersion": "4.6.5.10245" + } + } + }, + "NLog.Extensions.Logging/1.5.4": { + "dependencies": { + "Microsoft.Extensions.Logging": "2.1.0", + "NLog": "4.6.5" + }, + "runtime": { + "lib/netstandard2.0/NLog.Extensions.Logging.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.5.4.1106" + } + } + }, + "System.Buffers/4.4.0": { + "runtime": { + "lib/netstandard2.0/System.Buffers.dll": { + "assemblyVersion": "4.0.2.0", + "fileVersion": "4.6.25519.3" + } + } + }, + "System.Configuration.ConfigurationManager/4.6.0": { + "dependencies": { + "System.Security.Cryptography.ProtectedData": "4.6.0", + "System.Security.Permissions": "4.6.0" + }, + "runtime": { + "lib/netstandard2.0/System.Configuration.ConfigurationManager.dll": { + "assemblyVersion": "4.0.2.0", + "fileVersion": "4.700.19.46214" + } + } + }, + "System.Diagnostics.PerformanceCounter/4.6.0": { + "runtime": { + "lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll": { + "assemblyVersion": "4.0.1.0", + "fileVersion": "4.700.19.46214" + } + } + }, + "System.Memory/4.5.3": { + "dependencies": { + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" + }, + "runtime": { + "lib/netstandard2.0/System.Memory.dll": { + "assemblyVersion": "4.0.1.1", + "fileVersion": "4.6.27617.2" + } + } + }, + "System.Numerics.Vectors/4.4.0": { + "runtime": { + "lib/netstandard2.0/System.Numerics.Vectors.dll": { + "assemblyVersion": "4.1.3.0", + "fileVersion": "4.6.25519.3" + } + } + }, + "System.Runtime.CompilerServices.Unsafe/4.5.2": { + "runtime": { + "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": { + "assemblyVersion": "4.0.4.1", + "fileVersion": "4.6.26919.2" + } + } + }, + "System.Security.AccessControl/4.6.0": { + "dependencies": { + "System.Security.Principal.Windows": "4.6.0" + }, + "runtime": { + "lib/netstandard2.0/System.Security.AccessControl.dll": { + "assemblyVersion": "4.1.2.0", + "fileVersion": "4.700.19.46214" + } + } + }, + "System.Security.Cryptography.ProtectedData/4.6.0": { + "dependencies": { + "System.Memory": "4.5.3" + }, + "runtime": { + "lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll": { + "assemblyVersion": "4.0.4.0", + "fileVersion": "4.700.19.46214" + } + } + }, + "System.Security.Permissions/4.6.0": { + "dependencies": { + "System.Security.AccessControl": "4.6.0" + }, + "runtime": { + "lib/netstandard2.0/System.Security.Permissions.dll": { + "assemblyVersion": "4.0.2.0", + "fileVersion": "4.700.19.46214" + } + } + }, + "System.Security.Principal.Windows/4.6.0": { + "runtime": { + "lib/netstandard2.0/System.Security.Principal.Windows.dll": { + "assemblyVersion": "4.1.2.0", + "fileVersion": "4.700.19.46214" + } + } + }, + "SuperSocket.Common/1.0.1": { + "dependencies": { + "System.Configuration.ConfigurationManager": "4.6.0" + }, + "runtime": { + "SuperSocket.Common.dll": {} + } + }, + "SuperSocket.SocketBase/1.0.1": { + "dependencies": { + "NLog.Extensions.Logging": "1.5.4", + "SuperSocket.Common": "1.0.1" + }, + "runtime": { + "SuperSocket.SocketBase.dll": {} + } + } + } + }, + "libraries": { + "SuperSocket.SocketEngine/1.0.1": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Microsoft.Extensions.Configuration/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-5nnZYvEJXM0jNCoI7aYbjVU3CKNy6Yx09WLMSaa5ZhwaYh92/7uzgqn8Y97wQW2jOXeu4gqcS4FxPa/kMwVixQ==", + "path": "microsoft.extensions.configuration/2.1.0", + "hashPath": "microsoft.extensions.configuration.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.Configuration.Abstractions/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3aTLjQ1t+5h15MSqt1BzzwzVO8j13/NReFwn/r8nmwRBBw2U78b2On1j27L6S7G3QynPb90Itsvut0EIoZNfdw==", + "path": "microsoft.extensions.configuration.abstractions/2.1.0", + "hashPath": "microsoft.extensions.configuration.abstractions.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.Configuration.Binder/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-k9dHRKfmXjeHTAmafyQPB9LFoQbvfLcD7m/OAJ3R1LaIE5C92t12tOkU2Jprp5n1I8Nze0ja9zkBNYxLydxPRA==", + "path": "microsoft.extensions.configuration.binder/2.1.0", + "hashPath": "microsoft.extensions.configuration.binder.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-kDs/SngBdfZZRvbxu24sVqe22PSjCtLx7T1YOeJxs07Gnvb9rCNWwE/kjubRpS5N2AXu2ycxN/n6jeQF48vpkw==", + "path": "microsoft.extensions.dependencyinjection.abstractions/2.1.0", + "hashPath": "microsoft.extensions.dependencyinjection.abstractions.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.Logging/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-wHHLrOdhWQg7ApeFf63u2gm+qRxXYQ6RoO+RPRoU96aQLS2ox69VSmQSlpICsybpYQFN2rqVDioVRlE8xNbCyw==", + "path": "microsoft.extensions.logging/2.1.0", + "hashPath": "microsoft.extensions.logging.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.Logging.Abstractions/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-HbLd0SsVNQ7AiB4Fvsjy4juWXqALhYSFih1KLVuc3JqDe7OgOEPX4vx+G/jhvl+e+zat/sBS7yjWmtlQ/6rzCA==", + "path": "microsoft.extensions.logging.abstractions/2.1.0", + "hashPath": "microsoft.extensions.logging.abstractions.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.Options/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-rbdHap6oecNuTOlcEzkthuz+OqGVpF6hzqiz6jmb6BkAEGK62bnkvCboun0KWsEh8sbqKgxW4EGr4LO2m04QRw==", + "path": "microsoft.extensions.options/2.1.0", + "hashPath": "microsoft.extensions.options.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.Primitives/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3ym2d4KDRYNt77ybBPdjr4WoVST9UC7xUM/Xxr8iSKD9aj5A+GbmjaQrU0Oy2fERMfLF8dYm0wLJoNSq5lt5lA==", + "path": "microsoft.extensions.primitives/2.1.0", + "hashPath": "microsoft.extensions.primitives.2.1.0.nupkg.sha512" + }, + "NLog/4.6.5": { + "type": "package", + "serviceable": true, + "sha512": "sha512-DTVz1+irQo7IyXLwaGUj/jteTeCK5ZINZ92kzU+WKD6GQvObI53/CXj4mU88Hx2Z9QsvIjLhhPV3lAVdDK8ULg==", + "path": "nlog/4.6.5", + "hashPath": "nlog.4.6.5.nupkg.sha512" + }, + "NLog.Extensions.Logging/1.5.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-J72MUlcxJ/dITIdOIEeAUAXT93z1/yI7xY3U3r4cFLmJ/yJxm2BLzxJ/r7+Tpry/7s85N1HNXYG5OODRQhI96A==", + "path": "nlog.extensions.logging/1.5.4", + "hashPath": "nlog.extensions.logging.1.5.4.nupkg.sha512" + }, + "System.Buffers/4.4.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw==", + "path": "system.buffers/4.4.0", + "hashPath": "system.buffers.4.4.0.nupkg.sha512" + }, + "System.Configuration.ConfigurationManager/4.6.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-gkNklXxdmB3r4SQTUzRhESZAb3MotgDz24XYi2R/bIjJ10SF0KHJ/qTEwi9CLyIAOTjmCo8Vx8+rKldLaiW7Ig==", + "path": "system.configuration.configurationmanager/4.6.0", + "hashPath": "system.configuration.configurationmanager.4.6.0.nupkg.sha512" + }, + "System.Diagnostics.PerformanceCounter/4.6.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-hzNEIJ58VQtTlL12T3EZ7ChDBjDnVra1d4CICe5jM64AK1Lh7jqJvFTXTqp7l3ez2yIzfp/OJWKrQ4Glab4nLA==", + "path": "system.diagnostics.performancecounter/4.6.0", + "hashPath": "system.diagnostics.performancecounter.4.6.0.nupkg.sha512" + }, + "System.Memory/4.5.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", + "path": "system.memory/4.5.3", + "hashPath": "system.memory.4.5.3.nupkg.sha512" + }, + "System.Numerics.Vectors/4.4.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==", + "path": "system.numerics.vectors/4.4.0", + "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512" + }, + "System.Runtime.CompilerServices.Unsafe/4.5.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-wprSFgext8cwqymChhrBLu62LMg/1u92bU+VOwyfBimSPVFXtsNqEWC92Pf9ofzJFlk4IHmJA75EDJn1b2goAQ==", + "path": "system.runtime.compilerservices.unsafe/4.5.2", + "hashPath": "system.runtime.compilerservices.unsafe.4.5.2.nupkg.sha512" + }, + "System.Security.AccessControl/4.6.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-gmlk6khICtVhiUnVBBtlsH0H/5QFDqhTZgtpp3AX14wWE6OIE+BX95NLD+X4AolXnIy/oXpNNmXYnsNfW1KuDQ==", + "path": "system.security.accesscontrol/4.6.0", + "hashPath": "system.security.accesscontrol.4.6.0.nupkg.sha512" + }, + "System.Security.Cryptography.ProtectedData/4.6.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-zdCsTOakmbAQVyOI6+ZadvXZgzSiFiY5nXAfGUQNGrz3ofc9sjehpXRvqYb3vWUsvloYFILSpiQCjiZVFKRBjA==", + "path": "system.security.cryptography.protecteddata/4.6.0", + "hashPath": "system.security.cryptography.protecteddata.4.6.0.nupkg.sha512" + }, + "System.Security.Permissions/4.6.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-W3Uxog9KCZAmGYsOFHgJnb7L2q+SDbxS3vGnFHmErUnXuIjWYpIh1KVTlua7qmPdrlRCkAcTF9dImv+jciBPOQ==", + "path": "system.security.permissions/4.6.0", + "hashPath": "system.security.permissions.4.6.0.nupkg.sha512" + }, + "System.Security.Principal.Windows/4.6.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Mdukseovp0YIGaz16FMH6nbfgZkrCFOJbtXQptv0aeBO9h775Ilb9+TDwLVTKikoW7y7CY7lpoXl9zmZ5G3ndA==", + "path": "system.security.principal.windows/4.6.0", + "hashPath": "system.security.principal.windows.4.6.0.nupkg.sha512" + }, + "SuperSocket.Common/1.0.1": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "SuperSocket.SocketBase/1.0.1": { + "type": "project", + "serviceable": false, + "sha512": "" + } + } +} \ No newline at end of file diff --git a/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.dll b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.dll new file mode 100644 index 0000000..85083a4 Binary files /dev/null and b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.dll differ diff --git a/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.pdb b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.pdb new file mode 100644 index 0000000..62b8b2b Binary files /dev/null and b/Samples/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.pdb differ diff --git a/Samples/BinaryPacketServer/BinaryPacketServer.csproj b/Samples/BinaryPacketServer/BinaryPacketServer.csproj index b1f0221..0f0c679 100644 --- a/Samples/BinaryPacketServer/BinaryPacketServer.csproj +++ b/Samples/BinaryPacketServer/BinaryPacketServer.csproj @@ -2,11 +2,11 @@ Exe - netcoreapp2.2 + netcoreapp3.0 - + diff --git a/Samples/Chat/CSBaseLib/CSBaseLib.csproj b/Samples/Chat/CSBaseLib/CSBaseLib.csproj index 8ce7483..22bd659 100644 --- a/Samples/Chat/CSBaseLib/CSBaseLib.csproj +++ b/Samples/Chat/CSBaseLib/CSBaseLib.csproj @@ -1,11 +1,11 @@ - netstandard2.0 + netstandard2.1 - + diff --git a/Samples/Chat/ChatServer/ChatServer.csproj b/Samples/Chat/ChatServer/ChatServer.csproj index acd6782..8ba3812 100644 --- a/Samples/Chat/ChatServer/ChatServer.csproj +++ b/Samples/Chat/ChatServer/ChatServer.csproj @@ -2,11 +2,11 @@ Exe - netcoreapp2.2 + netcoreapp3.0 - + diff --git a/Samples/Chat/CommonServerLib/CommonServerLib.csproj b/Samples/Chat/CommonServerLib/CommonServerLib.csproj index fc1a02e..507bc48 100644 --- a/Samples/Chat/CommonServerLib/CommonServerLib.csproj +++ b/Samples/Chat/CommonServerLib/CommonServerLib.csproj @@ -1,12 +1,12 @@ - netstandard2.0 + netstandard2.1 - - + + diff --git a/Samples/SimpleUDPServer/SimpleUDPServer.csproj b/Samples/SimpleUDPServer/SimpleUDPServer.csproj index 3821dc8..218314d 100644 --- a/Samples/SimpleUDPServer/SimpleUDPServer.csproj +++ b/Samples/SimpleUDPServer/SimpleUDPServer.csproj @@ -2,22 +2,22 @@ Exe - netcoreapp2.2 + netcoreapp3.0 - + - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.Common.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.Common.dll - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.SocketBase.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.SocketBase.dll - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.SocketEngine.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.SocketEngine.dll diff --git a/Samples/SwitchReceiveFilter/SwitchReceiveFilter.csproj b/Samples/SwitchReceiveFilter/SwitchReceiveFilter.csproj index 3821dc8..218314d 100644 --- a/Samples/SwitchReceiveFilter/SwitchReceiveFilter.csproj +++ b/Samples/SwitchReceiveFilter/SwitchReceiveFilter.csproj @@ -2,22 +2,22 @@ Exe - netcoreapp2.2 + netcoreapp3.0 - + - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.Common.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.Common.dll - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.SocketBase.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.SocketBase.dll - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.SocketEngine.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.SocketEngine.dll diff --git a/Samples/sendFailTestServer/sendFailTestServer.csproj b/Samples/sendFailTestServer/sendFailTestServer.csproj index 232954c..163613e 100644 --- a/Samples/sendFailTestServer/sendFailTestServer.csproj +++ b/Samples/sendFailTestServer/sendFailTestServer.csproj @@ -2,13 +2,13 @@ Exe - netcoreapp2.2 + netcoreapp3.0 - - - + + + diff --git a/SocketBase/SuperSocket.SocketBase.csproj b/SocketBase/SuperSocket.SocketBase.csproj index 35877c1..f3dee56 100644 --- a/SocketBase/SuperSocket.SocketBase.csproj +++ b/SocketBase/SuperSocket.SocketBase.csproj @@ -1,11 +1,12 @@  - netstandard2.0 + netstandard2.1 + 1.0.1 - + diff --git a/SocketEngine/AsyncStreamSocketSession.cs b/SocketEngine/AsyncStreamSocketSession.cs index af430d8..a41ec85 100644 --- a/SocketEngine/AsyncStreamSocketSession.cs +++ b/SocketEngine/AsyncStreamSocketSession.cs @@ -203,15 +203,9 @@ private IAsyncResult BeginInitStream(AsyncCallback asyncCallback) case (SslProtocols.None): m_Stream = new NetworkStream(Client); break; - case (SslProtocols.Default): case (SslProtocols.Tls): - case (SslProtocols.Ssl3): SslStream sslStream = CreateSslStream(certConfig); - result = sslStream.BeginAuthenticateAsServer(AppSession.AppServer.Certificate, certConfig.ClientCertificateRequired, SslProtocols.Default, false, asyncCallback, sslStream); - break; - case (SslProtocols.Ssl2): - SslStream ssl2Stream = CreateSslStream(certConfig); - result = ssl2Stream.BeginAuthenticateAsServer(AppSession.AppServer.Certificate, certConfig.ClientCertificateRequired, SslProtocols.Ssl2, false, asyncCallback, ssl2Stream); + result = sslStream.BeginAuthenticateAsServer(AppSession.AppServer.Certificate, certConfig.ClientCertificateRequired, SslProtocols.Tls, false, asyncCallback, sslStream); break; default: var unknownSslStream = CreateSslStream(certConfig); diff --git a/SocketEngine/SuperSocket.SocketEngine.csproj b/SocketEngine/SuperSocket.SocketEngine.csproj index c974d50..7a53e86 100644 --- a/SocketEngine/SuperSocket.SocketEngine.csproj +++ b/SocketEngine/SuperSocket.SocketEngine.csproj @@ -1,8 +1,9 @@  - netstandard2.0 + netstandard2.1 1.0.1 + 1.0.1 @@ -22,7 +23,7 @@ - + diff --git a/Tutorials/00_server_bins/run_ChatServer.bat b/Tutorials/00_server_bins/run_ChatServer.bat index bf91d95..5a1c375 100644 --- a/Tutorials/00_server_bins/run_ChatServer.bat +++ b/Tutorials/00_server_bins/run_ChatServer.bat @@ -1 +1 @@ -dotnet netcoreapp2.2\ChatServer.dll --uniqueID 1 --name ChatServer --port 32452 --maxConnectionNumber 256 --maxRequestLength 1024 --receiveBufferSize 16384 --sendBufferSize 16384 --roomMaxCount 100 --roomMaxUserCount 4 --roomStartNumber 0 \ No newline at end of file +dotnet netcoreapp3.0\ChatServer.dll --uniqueID 1 --name ChatServer --port 32452 --maxConnectionNumber 256 --maxRequestLength 1024 --receiveBufferSize 16384 --sendBufferSize 16384 --roomMaxCount 100 --roomMaxUserCount 4 --roomStartNumber 0 \ No newline at end of file diff --git a/Tutorials/00_server_bins/run_ChatServerEx.bat b/Tutorials/00_server_bins/run_ChatServerEx.bat index a5d0ebf..ef299d9 100644 --- a/Tutorials/00_server_bins/run_ChatServerEx.bat +++ b/Tutorials/00_server_bins/run_ChatServerEx.bat @@ -1 +1 @@ -dotnet netcoreapp2.2\ChatServerEx.dll --uniqueID 1 --name ChatServerEx --port 32452 --maxConnectionNumber 256 --maxRequestLength 1024 --receiveBufferSize 16384 --sendBufferSize 16384 --roomMaxCountPerThread 12 --roomThreadCount 4 --roomMaxUserCount 4 --roomStartNumber 0 --dbWorkerThreadCount 4 --redisAddres 192.168.0.10 \ No newline at end of file +dotnet netcoreapp3.0\ChatServerEx.dll --uniqueID 1 --name ChatServerEx --port 32452 --maxConnectionNumber 256 --maxRequestLength 1024 --receiveBufferSize 16384 --sendBufferSize 16384 --roomMaxCountPerThread 12 --roomThreadCount 4 --roomMaxUserCount 4 --roomStartNumber 0 --dbWorkerThreadCount 4 --redisAddres 192.168.0.10 \ No newline at end of file diff --git a/Tutorials/00_server_bins/run_EchoServer.bat b/Tutorials/00_server_bins/run_EchoServer.bat index eadf0e6..24b50fa 100644 --- a/Tutorials/00_server_bins/run_EchoServer.bat +++ b/Tutorials/00_server_bins/run_EchoServer.bat @@ -1 +1 @@ -dotnet netcoreapp2.2\EchoServer.dll \ No newline at end of file +dotnet netcoreapp3.0\EchoServer.dll \ No newline at end of file diff --git a/Tutorials/00_server_bins/run_EchoServerEx.bat b/Tutorials/00_server_bins/run_EchoServerEx.bat index 81e8656..ca14bc4 100644 --- a/Tutorials/00_server_bins/run_EchoServerEx.bat +++ b/Tutorials/00_server_bins/run_EchoServerEx.bat @@ -1 +1 @@ -dotnet netcoreapp2.2\EchoServerEx.dll --port 12021 --maxConnectionNumber 32 --name EchoServer \ No newline at end of file +dotnet netcoreapp3.0\EchoServerEx.dll --port 12021 --maxConnectionNumber 32 --name EchoServer \ No newline at end of file diff --git a/Tutorials/00_server_bins/run_MultiPortServer.bat b/Tutorials/00_server_bins/run_MultiPortServer.bat index 487a056..807081d 100644 --- a/Tutorials/00_server_bins/run_MultiPortServer.bat +++ b/Tutorials/00_server_bins/run_MultiPortServer.bat @@ -1 +1 @@ -dotnet netcoreapp2.2\MultiPortServer.dll --name1 clientSide --port1 32452 --maxConnectionNumber1 256 --name2 serverSide --port2 11021 --maxConnectionNumber2 16 \ No newline at end of file +dotnet netcoreapp3.0\MultiPortServer.dll --name1 clientSide --port1 32452 --maxConnectionNumber1 256 --name2 serverSide --port2 11021 --maxConnectionNumber2 16 \ No newline at end of file diff --git a/Tutorials/00_superSocketLite_libs/netstandard2.1/RevDeBug.setup b/Tutorials/00_superSocketLite_libs/netstandard2.1/RevDeBug.setup new file mode 100644 index 0000000..d1bcbd7 --- /dev/null +++ b/Tutorials/00_superSocketLite_libs/netstandard2.1/RevDeBug.setup @@ -0,0 +1,8 @@ +Repository.Port=42742; +Repository.Address=127.0.0.1; +Application.Name=SuperSocket.SocketEngine; +SolutionName=SuperSocket.SocketEngine; +StateStorageClassName=LiveRecorder; +AuthorizationToken=; +Release=; +BacklogSize=1000; diff --git a/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.Common.dll b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.Common.dll new file mode 100644 index 0000000..1b718c9 Binary files /dev/null and b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.Common.dll differ diff --git a/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.Common.pdb b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.Common.pdb new file mode 100644 index 0000000..f386bfc Binary files /dev/null and b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.Common.pdb differ diff --git a/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketBase.dll b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketBase.dll new file mode 100644 index 0000000..e435da1 Binary files /dev/null and b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketBase.dll differ diff --git a/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketBase.pdb b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketBase.pdb new file mode 100644 index 0000000..889e64a Binary files /dev/null and b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketBase.pdb differ diff --git a/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.deps.json b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.deps.json new file mode 100644 index 0000000..eff2790 --- /dev/null +++ b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.deps.json @@ -0,0 +1,401 @@ +{ + "runtimeTarget": { + "name": ".NETStandard,Version=v2.1/", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETStandard,Version=v2.1": {}, + ".NETStandard,Version=v2.1/": { + "SuperSocket.SocketEngine/1.0.1": { + "dependencies": { + "SuperSocket.Common": "1.0.1", + "SuperSocket.SocketBase": "1.0.1", + "System.Diagnostics.PerformanceCounter": "4.6.0" + }, + "runtime": { + "SuperSocket.SocketEngine.dll": {} + } + }, + "Microsoft.Extensions.Configuration/2.1.0": { + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "2.1.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Configuration.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.Configuration.Abstractions/2.1.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.Configuration.Binder/2.1.0": { + "dependencies": { + "Microsoft.Extensions.Configuration": "2.1.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.0": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.Logging/2.1.0": { + "dependencies": { + "Microsoft.Extensions.Configuration.Binder": "2.1.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", + "Microsoft.Extensions.Logging.Abstractions": "2.1.0", + "Microsoft.Extensions.Options": "2.1.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Logging.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.Logging.Abstractions/2.1.0": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.Options/2.1.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", + "Microsoft.Extensions.Primitives": "2.1.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Options.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "Microsoft.Extensions.Primitives/2.1.0": { + "dependencies": { + "System.Memory": "4.5.3", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.18136" + } + } + }, + "NLog/4.6.5": { + "runtime": { + "lib/netstandard2.0/NLog.dll": { + "assemblyVersion": "4.0.0.0", + "fileVersion": "4.6.5.10245" + } + } + }, + "NLog.Extensions.Logging/1.5.4": { + "dependencies": { + "Microsoft.Extensions.Logging": "2.1.0", + "NLog": "4.6.5" + }, + "runtime": { + "lib/netstandard2.0/NLog.Extensions.Logging.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.5.4.1106" + } + } + }, + "System.Buffers/4.4.0": { + "runtime": { + "lib/netstandard2.0/System.Buffers.dll": { + "assemblyVersion": "4.0.2.0", + "fileVersion": "4.6.25519.3" + } + } + }, + "System.Configuration.ConfigurationManager/4.6.0": { + "dependencies": { + "System.Security.Cryptography.ProtectedData": "4.6.0", + "System.Security.Permissions": "4.6.0" + }, + "runtime": { + "lib/netstandard2.0/System.Configuration.ConfigurationManager.dll": { + "assemblyVersion": "4.0.2.0", + "fileVersion": "4.700.19.46214" + } + } + }, + "System.Diagnostics.PerformanceCounter/4.6.0": { + "runtime": { + "lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll": { + "assemblyVersion": "4.0.1.0", + "fileVersion": "4.700.19.46214" + } + } + }, + "System.Memory/4.5.3": { + "dependencies": { + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" + }, + "runtime": { + "lib/netstandard2.0/System.Memory.dll": { + "assemblyVersion": "4.0.1.1", + "fileVersion": "4.6.27617.2" + } + } + }, + "System.Numerics.Vectors/4.4.0": { + "runtime": { + "lib/netstandard2.0/System.Numerics.Vectors.dll": { + "assemblyVersion": "4.1.3.0", + "fileVersion": "4.6.25519.3" + } + } + }, + "System.Runtime.CompilerServices.Unsafe/4.5.2": { + "runtime": { + "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": { + "assemblyVersion": "4.0.4.1", + "fileVersion": "4.6.26919.2" + } + } + }, + "System.Security.AccessControl/4.6.0": { + "dependencies": { + "System.Security.Principal.Windows": "4.6.0" + }, + "runtime": { + "lib/netstandard2.0/System.Security.AccessControl.dll": { + "assemblyVersion": "4.1.2.0", + "fileVersion": "4.700.19.46214" + } + } + }, + "System.Security.Cryptography.ProtectedData/4.6.0": { + "dependencies": { + "System.Memory": "4.5.3" + }, + "runtime": { + "lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll": { + "assemblyVersion": "4.0.4.0", + "fileVersion": "4.700.19.46214" + } + } + }, + "System.Security.Permissions/4.6.0": { + "dependencies": { + "System.Security.AccessControl": "4.6.0" + }, + "runtime": { + "lib/netstandard2.0/System.Security.Permissions.dll": { + "assemblyVersion": "4.0.2.0", + "fileVersion": "4.700.19.46214" + } + } + }, + "System.Security.Principal.Windows/4.6.0": { + "runtime": { + "lib/netstandard2.0/System.Security.Principal.Windows.dll": { + "assemblyVersion": "4.1.2.0", + "fileVersion": "4.700.19.46214" + } + } + }, + "SuperSocket.Common/1.0.1": { + "dependencies": { + "System.Configuration.ConfigurationManager": "4.6.0" + }, + "runtime": { + "SuperSocket.Common.dll": {} + } + }, + "SuperSocket.SocketBase/1.0.1": { + "dependencies": { + "NLog.Extensions.Logging": "1.5.4", + "SuperSocket.Common": "1.0.1" + }, + "runtime": { + "SuperSocket.SocketBase.dll": {} + } + } + } + }, + "libraries": { + "SuperSocket.SocketEngine/1.0.1": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Microsoft.Extensions.Configuration/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-5nnZYvEJXM0jNCoI7aYbjVU3CKNy6Yx09WLMSaa5ZhwaYh92/7uzgqn8Y97wQW2jOXeu4gqcS4FxPa/kMwVixQ==", + "path": "microsoft.extensions.configuration/2.1.0", + "hashPath": "microsoft.extensions.configuration.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.Configuration.Abstractions/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3aTLjQ1t+5h15MSqt1BzzwzVO8j13/NReFwn/r8nmwRBBw2U78b2On1j27L6S7G3QynPb90Itsvut0EIoZNfdw==", + "path": "microsoft.extensions.configuration.abstractions/2.1.0", + "hashPath": "microsoft.extensions.configuration.abstractions.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.Configuration.Binder/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-k9dHRKfmXjeHTAmafyQPB9LFoQbvfLcD7m/OAJ3R1LaIE5C92t12tOkU2Jprp5n1I8Nze0ja9zkBNYxLydxPRA==", + "path": "microsoft.extensions.configuration.binder/2.1.0", + "hashPath": "microsoft.extensions.configuration.binder.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-kDs/SngBdfZZRvbxu24sVqe22PSjCtLx7T1YOeJxs07Gnvb9rCNWwE/kjubRpS5N2AXu2ycxN/n6jeQF48vpkw==", + "path": "microsoft.extensions.dependencyinjection.abstractions/2.1.0", + "hashPath": "microsoft.extensions.dependencyinjection.abstractions.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.Logging/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-wHHLrOdhWQg7ApeFf63u2gm+qRxXYQ6RoO+RPRoU96aQLS2ox69VSmQSlpICsybpYQFN2rqVDioVRlE8xNbCyw==", + "path": "microsoft.extensions.logging/2.1.0", + "hashPath": "microsoft.extensions.logging.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.Logging.Abstractions/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-HbLd0SsVNQ7AiB4Fvsjy4juWXqALhYSFih1KLVuc3JqDe7OgOEPX4vx+G/jhvl+e+zat/sBS7yjWmtlQ/6rzCA==", + "path": "microsoft.extensions.logging.abstractions/2.1.0", + "hashPath": "microsoft.extensions.logging.abstractions.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.Options/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-rbdHap6oecNuTOlcEzkthuz+OqGVpF6hzqiz6jmb6BkAEGK62bnkvCboun0KWsEh8sbqKgxW4EGr4LO2m04QRw==", + "path": "microsoft.extensions.options/2.1.0", + "hashPath": "microsoft.extensions.options.2.1.0.nupkg.sha512" + }, + "Microsoft.Extensions.Primitives/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3ym2d4KDRYNt77ybBPdjr4WoVST9UC7xUM/Xxr8iSKD9aj5A+GbmjaQrU0Oy2fERMfLF8dYm0wLJoNSq5lt5lA==", + "path": "microsoft.extensions.primitives/2.1.0", + "hashPath": "microsoft.extensions.primitives.2.1.0.nupkg.sha512" + }, + "NLog/4.6.5": { + "type": "package", + "serviceable": true, + "sha512": "sha512-DTVz1+irQo7IyXLwaGUj/jteTeCK5ZINZ92kzU+WKD6GQvObI53/CXj4mU88Hx2Z9QsvIjLhhPV3lAVdDK8ULg==", + "path": "nlog/4.6.5", + "hashPath": "nlog.4.6.5.nupkg.sha512" + }, + "NLog.Extensions.Logging/1.5.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-J72MUlcxJ/dITIdOIEeAUAXT93z1/yI7xY3U3r4cFLmJ/yJxm2BLzxJ/r7+Tpry/7s85N1HNXYG5OODRQhI96A==", + "path": "nlog.extensions.logging/1.5.4", + "hashPath": "nlog.extensions.logging.1.5.4.nupkg.sha512" + }, + "System.Buffers/4.4.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw==", + "path": "system.buffers/4.4.0", + "hashPath": "system.buffers.4.4.0.nupkg.sha512" + }, + "System.Configuration.ConfigurationManager/4.6.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-gkNklXxdmB3r4SQTUzRhESZAb3MotgDz24XYi2R/bIjJ10SF0KHJ/qTEwi9CLyIAOTjmCo8Vx8+rKldLaiW7Ig==", + "path": "system.configuration.configurationmanager/4.6.0", + "hashPath": "system.configuration.configurationmanager.4.6.0.nupkg.sha512" + }, + "System.Diagnostics.PerformanceCounter/4.6.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-hzNEIJ58VQtTlL12T3EZ7ChDBjDnVra1d4CICe5jM64AK1Lh7jqJvFTXTqp7l3ez2yIzfp/OJWKrQ4Glab4nLA==", + "path": "system.diagnostics.performancecounter/4.6.0", + "hashPath": "system.diagnostics.performancecounter.4.6.0.nupkg.sha512" + }, + "System.Memory/4.5.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", + "path": "system.memory/4.5.3", + "hashPath": "system.memory.4.5.3.nupkg.sha512" + }, + "System.Numerics.Vectors/4.4.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==", + "path": "system.numerics.vectors/4.4.0", + "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512" + }, + "System.Runtime.CompilerServices.Unsafe/4.5.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-wprSFgext8cwqymChhrBLu62LMg/1u92bU+VOwyfBimSPVFXtsNqEWC92Pf9ofzJFlk4IHmJA75EDJn1b2goAQ==", + "path": "system.runtime.compilerservices.unsafe/4.5.2", + "hashPath": "system.runtime.compilerservices.unsafe.4.5.2.nupkg.sha512" + }, + "System.Security.AccessControl/4.6.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-gmlk6khICtVhiUnVBBtlsH0H/5QFDqhTZgtpp3AX14wWE6OIE+BX95NLD+X4AolXnIy/oXpNNmXYnsNfW1KuDQ==", + "path": "system.security.accesscontrol/4.6.0", + "hashPath": "system.security.accesscontrol.4.6.0.nupkg.sha512" + }, + "System.Security.Cryptography.ProtectedData/4.6.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-zdCsTOakmbAQVyOI6+ZadvXZgzSiFiY5nXAfGUQNGrz3ofc9sjehpXRvqYb3vWUsvloYFILSpiQCjiZVFKRBjA==", + "path": "system.security.cryptography.protecteddata/4.6.0", + "hashPath": "system.security.cryptography.protecteddata.4.6.0.nupkg.sha512" + }, + "System.Security.Permissions/4.6.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-W3Uxog9KCZAmGYsOFHgJnb7L2q+SDbxS3vGnFHmErUnXuIjWYpIh1KVTlua7qmPdrlRCkAcTF9dImv+jciBPOQ==", + "path": "system.security.permissions/4.6.0", + "hashPath": "system.security.permissions.4.6.0.nupkg.sha512" + }, + "System.Security.Principal.Windows/4.6.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Mdukseovp0YIGaz16FMH6nbfgZkrCFOJbtXQptv0aeBO9h775Ilb9+TDwLVTKikoW7y7CY7lpoXl9zmZ5G3ndA==", + "path": "system.security.principal.windows/4.6.0", + "hashPath": "system.security.principal.windows.4.6.0.nupkg.sha512" + }, + "SuperSocket.Common/1.0.1": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "SuperSocket.SocketBase/1.0.1": { + "type": "project", + "serviceable": false, + "sha512": "" + } + } +} \ No newline at end of file diff --git a/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.dll b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.dll new file mode 100644 index 0000000..85083a4 Binary files /dev/null and b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.dll differ diff --git a/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.pdb b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.pdb new file mode 100644 index 0000000..62b8b2b Binary files /dev/null and b/Tutorials/00_superSocketLite_libs/netstandard2.1/SuperSocket.SocketEngine.pdb differ diff --git a/Tutorials/CSBaseLib/CSBaseLib.csproj b/Tutorials/CSBaseLib/CSBaseLib.csproj index 8ce7483..22bd659 100644 --- a/Tutorials/CSBaseLib/CSBaseLib.csproj +++ b/Tutorials/CSBaseLib/CSBaseLib.csproj @@ -1,11 +1,11 @@ - netstandard2.0 + netstandard2.1 - + diff --git a/Tutorials/ChatServer/ChatServer.csproj b/Tutorials/ChatServer/ChatServer.csproj index aff9938..060abbf 100644 --- a/Tutorials/ChatServer/ChatServer.csproj +++ b/Tutorials/ChatServer/ChatServer.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp3.0 @@ -20,10 +20,10 @@ - - - - + + + + @@ -33,13 +33,13 @@ - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.Common.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.Common.dll - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.SocketBase.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.SocketBase.dll - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.SocketEngine.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.SocketEngine.dll diff --git a/Tutorials/ChatServerEx/ChatServerEx.csproj b/Tutorials/ChatServerEx/ChatServerEx.csproj index 588fd81..ac6fa86 100644 --- a/Tutorials/ChatServerEx/ChatServerEx.csproj +++ b/Tutorials/ChatServerEx/ChatServerEx.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp3.0 @@ -14,11 +14,11 @@ - - - - - + + + + + @@ -28,13 +28,13 @@ - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.Common.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.Common.dll - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.SocketBase.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.SocketBase.dll - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.SocketEngine.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.SocketEngine.dll diff --git a/Tutorials/EchoServer/EchoServer.csproj b/Tutorials/EchoServer/EchoServer.csproj index 80b71cb..e1b32c9 100644 --- a/Tutorials/EchoServer/EchoServer.csproj +++ b/Tutorials/EchoServer/EchoServer.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp3.0 diff --git a/Tutorials/EchoServerEx/EchoServerEx.csproj b/Tutorials/EchoServerEx/EchoServerEx.csproj index 9cd5df7..f0338b7 100644 --- a/Tutorials/EchoServerEx/EchoServerEx.csproj +++ b/Tutorials/EchoServerEx/EchoServerEx.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp3.0 @@ -18,9 +18,9 @@ - - - + + + diff --git a/Tutorials/GateServer_GameServer/00_server_bins/run_GateServer.bat b/Tutorials/GateServer_GameServer/00_server_bins/run_GateServer.bat index 91b7f57..198839b 100644 --- a/Tutorials/GateServer_GameServer/00_server_bins/run_GateServer.bat +++ b/Tutorials/GateServer_GameServer/00_server_bins/run_GateServer.bat @@ -1 +1 @@ -dotnet netcoreapp2.2\GateServer.dll --uniqueID 1 --name GateServer --port 11021 --maxConnectionNumber 256 --maxRequestLength 1024 --receiveBufferSize 16384 --sendBufferSize 16384 \ No newline at end of file +dotnet netcoreapp3.0\GateServer.dll --uniqueID 1 --name GateServer --port 11021 --maxConnectionNumber 256 --maxRequestLength 1024 --receiveBufferSize 16384 --sendBufferSize 16384 \ No newline at end of file diff --git a/Tutorials/GateServer_GameServer/CommonLib/CommonLib.csproj b/Tutorials/GateServer_GameServer/CommonLib/CommonLib.csproj index 8ce7483..22bd659 100644 --- a/Tutorials/GateServer_GameServer/CommonLib/CommonLib.csproj +++ b/Tutorials/GateServer_GameServer/CommonLib/CommonLib.csproj @@ -1,11 +1,11 @@ - netstandard2.0 + netstandard2.1 - + diff --git a/Tutorials/GateServer_GameServer/GateServer/GateServer.csproj b/Tutorials/GateServer_GameServer/GateServer/GateServer.csproj index 24960d5..46ff6fb 100644 --- a/Tutorials/GateServer_GameServer/GateServer/GateServer.csproj +++ b/Tutorials/GateServer_GameServer/GateServer/GateServer.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp3.0 @@ -20,10 +20,10 @@ - - - - + + + + @@ -33,13 +33,13 @@ - ..\..\00_superSocketLite_libs\netstandard2.0\SuperSocket.Common.dll + ..\..\00_superSocketLite_libs\netstandard2.1\SuperSocket.Common.dll - ..\..\00_superSocketLite_libs\netstandard2.0\SuperSocket.SocketBase.dll + ..\..\00_superSocketLite_libs\netstandard2.1\SuperSocket.SocketBase.dll - ..\..\00_superSocketLite_libs\netstandard2.0\SuperSocket.SocketEngine.dll + ..\..\00_superSocketLite_libs\netstandard2.1\SuperSocket.SocketEngine.dll diff --git a/Tutorials/MultiPortServer/MultiPortServer.csproj b/Tutorials/MultiPortServer/MultiPortServer.csproj index 9e33582..d8e1e8d 100644 --- a/Tutorials/MultiPortServer/MultiPortServer.csproj +++ b/Tutorials/MultiPortServer/MultiPortServer.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp3.0 @@ -14,20 +14,20 @@ - - - + + + - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.Common.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.Common.dll - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.SocketBase.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.SocketBase.dll - ..\00_superSocketLite_libs\netstandard2.0\SuperSocket.SocketEngine.dll + ..\00_superSocketLite_libs\netstandard2.1\SuperSocket.SocketEngine.dll