diff --git a/JabberNet.sln b/JabberNet.sln index 7f8ac8b..0414d0c 100644 --- a/JabberNet.sln +++ b/JabberNet.sln @@ -7,18 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{BFD2D7 paket.dependencies = paket.dependencies EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Test", "tests\JabberNet.Test\JabberNet.Test.csproj", "{76F923A3-5D99-45B9-9327-FBE56648A39F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Muzzle", "src\JabberNet.Muzzle\JabberNet.Muzzle.csproj", "{071A79A9-E23F-418F-A6B7-63D3A3E59EEB}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Example", "examples\JabberNet.Example\JabberNet.Example.csproj", "{F7208FC2-C9FF-4019-96D8-E0F5001FDBFD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.ConsoleClient", "examples\JabberNet.ConsoleClient\JabberNet.ConsoleClient.csproj", "{049FB855-89C4-4539-9E5E-0996834D6A0E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet", "src\JabberNet\JabberNet.csproj", "{6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Netlib.Dns", "src\JabberNet.Netlib.Dns\JabberNet.Netlib.Dns.csproj", "{40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BBF059F0-722F-4DCC-AF7F-82054E8EF9F4}" ProjectSection(SolutionItems) = preProject Scripts\Build-Docs.ps1 = Scripts\Build-Docs.ps1 @@ -59,8 +47,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{ docs\templates\template.cshtml = docs\templates\template.cshtml EndProjectSection EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "JabberNet.VbExample", "examples\JabberNet.VbExample\JabberNet.VbExample.vbproj", "{B5086B0D-C448-450F-945D-5DBE681F2EE7}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{41BBF093-186E-44EE-9388-B7CE26F3D77E}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig @@ -73,7 +59,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Readme.md = Readme.md EndProjectSection EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JabberNet.Test.Muzzle", "tests\JabberNet.Test.Muzzle\JabberNet.Test.Muzzle.fsproj", "{F53C28B5-F626-4083-9CE6-99C9A9FE860B}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.Netlib.Dns", "src\JabberNet.Netlib.Dns\JabberNet.Netlib.Dns.xproj", "{E978BE1A-5654-4AE9-B5D3-8BE1A0056F1F}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet", "src\JabberNet\JabberNet.xproj", "{30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.Test", "tests\JabberNet.Test\JabberNet.Test.xproj", "{3F7B322B-BD5D-4DB7-8528-08A4FFE9E199}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.ConsoleClient", "examples\JabberNet.ConsoleClient\JabberNet.ConsoleClient.xproj", "{3FD358A4-8603-4306-BB78-E6D92C6935B0}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.Example", "examples\JabberNet.Example\JabberNet.Example.xproj", "{0B0B4FD8-841E-4233-B3CA-E885093E35AE}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.Muzzle", "src\JabberNet.Muzzle\JabberNet.Muzzle.xproj", "{32830894-E2CD-4F17-8CD0-3FE1C693A162}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "JabberNet.VbExample", "examples\JabberNet.VbExample\JabberNet.VbExample.vbproj", "{B5086B0D-C448-450F-945D-5DBE681F2EE7}" + ProjectSection(ProjectDependencies) = postProject + {30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08} = {30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08} + {32830894-E2CD-4F17-8CD0-3FE1C693A162} = {32830894-E2CD-4F17-8CD0-3FE1C693A162} + EndProjectSection +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.Test.Muzzle", "tests\JabberNet.Test.Muzzle\JabberNet.Test.Muzzle.xproj", "{AA5EF38F-ABCE-4997-B96F-0846E62E46B3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -82,53 +86,52 @@ Global Travis|Any CPU = Travis|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {76F923A3-5D99-45B9-9327-FBE56648A39F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76F923A3-5D99-45B9-9327-FBE56648A39F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76F923A3-5D99-45B9-9327-FBE56648A39F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76F923A3-5D99-45B9-9327-FBE56648A39F}.Release|Any CPU.Build.0 = Release|Any CPU - {76F923A3-5D99-45B9-9327-FBE56648A39F}.Travis|Any CPU.ActiveCfg = Debug|Any CPU - {76F923A3-5D99-45B9-9327-FBE56648A39F}.Travis|Any CPU.Build.0 = Debug|Any CPU - {071A79A9-E23F-418F-A6B7-63D3A3E59EEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {071A79A9-E23F-418F-A6B7-63D3A3E59EEB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {071A79A9-E23F-418F-A6B7-63D3A3E59EEB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {071A79A9-E23F-418F-A6B7-63D3A3E59EEB}.Release|Any CPU.Build.0 = Release|Any CPU - {071A79A9-E23F-418F-A6B7-63D3A3E59EEB}.Travis|Any CPU.ActiveCfg = Debug|Any CPU - {071A79A9-E23F-418F-A6B7-63D3A3E59EEB}.Travis|Any CPU.Build.0 = Debug|Any CPU - {F7208FC2-C9FF-4019-96D8-E0F5001FDBFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7208FC2-C9FF-4019-96D8-E0F5001FDBFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7208FC2-C9FF-4019-96D8-E0F5001FDBFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7208FC2-C9FF-4019-96D8-E0F5001FDBFD}.Release|Any CPU.Build.0 = Release|Any CPU - {F7208FC2-C9FF-4019-96D8-E0F5001FDBFD}.Travis|Any CPU.ActiveCfg = Debug|Any CPU - {F7208FC2-C9FF-4019-96D8-E0F5001FDBFD}.Travis|Any CPU.Build.0 = Debug|Any CPU - {049FB855-89C4-4539-9E5E-0996834D6A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {049FB855-89C4-4539-9E5E-0996834D6A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {049FB855-89C4-4539-9E5E-0996834D6A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {049FB855-89C4-4539-9E5E-0996834D6A0E}.Release|Any CPU.Build.0 = Release|Any CPU - {049FB855-89C4-4539-9E5E-0996834D6A0E}.Travis|Any CPU.ActiveCfg = Debug|Any CPU - {049FB855-89C4-4539-9E5E-0996834D6A0E}.Travis|Any CPU.Build.0 = Debug|Any CPU - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}.Release|Any CPU.Build.0 = Release|Any CPU - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}.Travis|Any CPU.ActiveCfg = Debug|Any CPU - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}.Travis|Any CPU.Build.0 = Debug|Any CPU - {40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Release|Any CPU.Build.0 = Release|Any CPU - {40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Travis|Any CPU.ActiveCfg = Debug|Any CPU - {40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Travis|Any CPU.Build.0 = Debug|Any CPU + {E978BE1A-5654-4AE9-B5D3-8BE1A0056F1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E978BE1A-5654-4AE9-B5D3-8BE1A0056F1F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E978BE1A-5654-4AE9-B5D3-8BE1A0056F1F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E978BE1A-5654-4AE9-B5D3-8BE1A0056F1F}.Release|Any CPU.Build.0 = Release|Any CPU + {E978BE1A-5654-4AE9-B5D3-8BE1A0056F1F}.Travis|Any CPU.ActiveCfg = Release|Any CPU + {E978BE1A-5654-4AE9-B5D3-8BE1A0056F1F}.Travis|Any CPU.Build.0 = Release|Any CPU + {30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}.Debug|Any CPU.Build.0 = Debug|Any CPU + {30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}.Release|Any CPU.ActiveCfg = Release|Any CPU + {30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}.Release|Any CPU.Build.0 = Release|Any CPU + {30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}.Travis|Any CPU.ActiveCfg = Release|Any CPU + {30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}.Travis|Any CPU.Build.0 = Release|Any CPU + {3F7B322B-BD5D-4DB7-8528-08A4FFE9E199}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F7B322B-BD5D-4DB7-8528-08A4FFE9E199}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F7B322B-BD5D-4DB7-8528-08A4FFE9E199}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F7B322B-BD5D-4DB7-8528-08A4FFE9E199}.Release|Any CPU.Build.0 = Release|Any CPU + {3F7B322B-BD5D-4DB7-8528-08A4FFE9E199}.Travis|Any CPU.ActiveCfg = Release|Any CPU + {3F7B322B-BD5D-4DB7-8528-08A4FFE9E199}.Travis|Any CPU.Build.0 = Release|Any CPU + {3FD358A4-8603-4306-BB78-E6D92C6935B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3FD358A4-8603-4306-BB78-E6D92C6935B0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3FD358A4-8603-4306-BB78-E6D92C6935B0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3FD358A4-8603-4306-BB78-E6D92C6935B0}.Release|Any CPU.Build.0 = Release|Any CPU + {3FD358A4-8603-4306-BB78-E6D92C6935B0}.Travis|Any CPU.ActiveCfg = Release|Any CPU + {3FD358A4-8603-4306-BB78-E6D92C6935B0}.Travis|Any CPU.Build.0 = Release|Any CPU + {0B0B4FD8-841E-4233-B3CA-E885093E35AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0B0B4FD8-841E-4233-B3CA-E885093E35AE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0B0B4FD8-841E-4233-B3CA-E885093E35AE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0B0B4FD8-841E-4233-B3CA-E885093E35AE}.Release|Any CPU.Build.0 = Release|Any CPU + {0B0B4FD8-841E-4233-B3CA-E885093E35AE}.Travis|Any CPU.ActiveCfg = Release|Any CPU + {0B0B4FD8-841E-4233-B3CA-E885093E35AE}.Travis|Any CPU.Build.0 = Release|Any CPU + {32830894-E2CD-4F17-8CD0-3FE1C693A162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {32830894-E2CD-4F17-8CD0-3FE1C693A162}.Debug|Any CPU.Build.0 = Debug|Any CPU + {32830894-E2CD-4F17-8CD0-3FE1C693A162}.Release|Any CPU.ActiveCfg = Release|Any CPU + {32830894-E2CD-4F17-8CD0-3FE1C693A162}.Release|Any CPU.Build.0 = Release|Any CPU + {32830894-E2CD-4F17-8CD0-3FE1C693A162}.Travis|Any CPU.ActiveCfg = Release|Any CPU + {32830894-E2CD-4F17-8CD0-3FE1C693A162}.Travis|Any CPU.Build.0 = Release|Any CPU {B5086B0D-C448-450F-945D-5DBE681F2EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B5086B0D-C448-450F-945D-5DBE681F2EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU {B5086B0D-C448-450F-945D-5DBE681F2EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU {B5086B0D-C448-450F-945D-5DBE681F2EE7}.Release|Any CPU.Build.0 = Release|Any CPU - {B5086B0D-C448-450F-945D-5DBE681F2EE7}.Travis|Any CPU.ActiveCfg = Debug|Any CPU - {F53C28B5-F626-4083-9CE6-99C9A9FE860B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F53C28B5-F626-4083-9CE6-99C9A9FE860B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F53C28B5-F626-4083-9CE6-99C9A9FE860B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F53C28B5-F626-4083-9CE6-99C9A9FE860B}.Release|Any CPU.Build.0 = Release|Any CPU - {F53C28B5-F626-4083-9CE6-99C9A9FE860B}.Travis|Any CPU.ActiveCfg = Debug|Any CPU - {F53C28B5-F626-4083-9CE6-99C9A9FE860B}.Travis|Any CPU.Build.0 = Debug|Any CPU + {B5086B0D-C448-450F-945D-5DBE681F2EE7}.Travis|Any CPU.ActiveCfg = Release|Any CPU + {AA5EF38F-ABCE-4997-B96F-0846E62E46B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AA5EF38F-ABCE-4997-B96F-0846E62E46B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AA5EF38F-ABCE-4997-B96F-0846E62E46B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AA5EF38F-ABCE-4997-B96F-0846E62E46B3}.Release|Any CPU.Build.0 = Release|Any CPU + {AA5EF38F-ABCE-4997-B96F-0846E62E46B3}.Travis|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Readme.md b/Readme.md index 5cecdbf..58197b7 100644 --- a/Readme.md +++ b/Readme.md @@ -6,8 +6,10 @@ Messaging and Presence Protocol (XMPP), also known as the Jabber. Client connections, server component connections, presence, service discovery, and the like. -Dependencies ------------- +Prerequisites +------------- + +### Package manager This project uses [Paket][paket] dependency manager. Before opening the solution or building the project, you should install Paket (or Paket bootstrapper) into @@ -23,6 +25,13 @@ Paket bootstrapper and call these commands automatically. Consult the script documentation to discover its parameters. +### Build system + +To build the project, you'll need [.NET Core build system][dotnet-core]. On +Windows, you'll also need to install [.NET 4.6.2 Developer +Pack][net-462-developer-pack] (can be installed [from +Chocolatey][net-462-developer-pack-choco]) to compile some of the tests. + Build and test -------------- @@ -43,6 +52,19 @@ $ xbuild /p:Configuration=Debug jabber-net.sln $ mono ./packages/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./test/bin5/Debug/test.dll ``` +.NET Core +--------- + +There's an alpha-level support for [.NET Core][dotnet-core] build system in the +project. To build the project using `dotnet`, invoke the following command: + +```console +$ dotnet restore +$ dotnet build **/project.json +$ dotnet test tests/JabberNet.Test/project.json +$ dotnet test tests/JabberNet.Test.Muzzle/project.json +``` + Documentation ------------- @@ -80,6 +102,9 @@ consult [Licensing.md][] for details on licensing of internal components. [Licensing.md]: ./Licensing.md [appveyor]: https://ci.appveyor.com/project/ForNeVeR/jabber-net/branch/develop +[dotnet-core]: https://www.microsoft.com/net/core +[net-462-developer-pack]: https://www.microsoft.com/en-us/download/details.aspx?id=53321 +[net-462-developer-pack-choco]: https://chocolatey.org/packages/netfx-4.6.2-devpack [nuget]: https://www.nuget.org/packages/jabber-net/ [paket]: https://fsprojects.github.io/Paket/index.html [travis]: https://travis-ci.org/ForNeVeR/Jabber-Net diff --git a/examples/JabberNet.ConsoleClient/App.ico b/examples/JabberNet.ConsoleClient/App.ico deleted file mode 100644 index 3a5525f..0000000 Binary files a/examples/JabberNet.ConsoleClient/App.ico and /dev/null differ diff --git a/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj b/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj deleted file mode 100644 index ee21e9f..0000000 --- a/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj +++ /dev/null @@ -1,151 +0,0 @@ - - - - Local - 8.0.50727 - 2.0 - {049FB855-89C4-4539-9E5E-0996834D6A0E} - Debug - AnyCPU - App.ico - - - JabberNet.ConsoleClient - - - JScript - Grid - IE50 - false - Exe - JabberNet.ConsoleClient - OnBuildSuccess - - - - - - - v4.0 - 2.0 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - bin\Debug\ - obj\ - obj\Debug\ - false - 285212672 - false - - - TRACE;DEBUG - - - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - false - AllRules.ruleset - - - bin\Release\ - obj\ - obj\Debug\ - false - 285212672 - false - - - TRACE - - - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - false - AllRules.ruleset - - - - System - - - System.XML - - - JabberNet - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - - - - Code - - - Code - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.xproj b/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.xproj new file mode 100644 index 0000000..32fabc7 --- /dev/null +++ b/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.xproj @@ -0,0 +1,19 @@ + + + + 14.0.25420 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 3fd358a4-8603-4306-bb78-e6d92c6935b0 + JabberNet.ConsoleClient + .\obj + .\bin\ + + + + 2.0 + + + \ No newline at end of file diff --git a/examples/JabberNet.ConsoleClient/app.config b/examples/JabberNet.ConsoleClient/app.config deleted file mode 100644 index e365603..0000000 --- a/examples/JabberNet.ConsoleClient/app.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/examples/JabberNet.ConsoleClient/project.json b/examples/JabberNet.ConsoleClient/project.json new file mode 100644 index 0000000..231ff82 --- /dev/null +++ b/examples/JabberNet.ConsoleClient/project.json @@ -0,0 +1,12 @@ +{ + "version": "2.1.2-*", + "buildOptions": { + "emitEntryPoint": true + }, + "frameworks": { + "net40": {} + }, + "dependencies": { + "JabberNet": "*" + } +} diff --git a/examples/JabberNet.ConsoleClient/project.lock.json b/examples/JabberNet.ConsoleClient/project.lock.json new file mode 100644 index 0000000..297452d --- /dev/null +++ b/examples/JabberNet.ConsoleClient/project.lock.json @@ -0,0 +1,76 @@ +{ + "locked": false, + "version": 2, + "targets": { + ".NETFramework,Version=v4.0": { + "zlib.net/1.0.4": { + "type": "package", + "compile": { + "lib/zlib.net.dll": {} + }, + "runtime": { + "lib/zlib.net.dll": {} + } + }, + "JabberNet/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "dependencies": { + "JabberNet.Netlib.Dns": "1.0.0", + "zlib.net": "1.0.4" + }, + "frameworkAssemblies": [ + "System.Drawing", + "System.Security", + "System.Xml" + ], + "compile": { + "net40/JabberNet.dll": {} + }, + "runtime": { + "net40/JabberNet.dll": {} + } + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "compile": { + "net40/JabberNet.Netlib.Dns.dll": {} + }, + "runtime": { + "net40/JabberNet.Netlib.Dns.dll": {} + } + } + } + }, + "libraries": { + "zlib.net/1.0.4": { + "sha512": "ywKkVY1y20tGQsUnYgKupYm91L8GVrVgoEOFTjfR1Bb5Xiy5tBJu5SV9liIiW2h8/KQUBefE45vSythtNMmahQ==", + "type": "package", + "path": "zlib.net/1.0.4", + "files": [ + "lib/zlib.net.dll", + "zlib.net.1.0.4.nupkg.sha512", + "zlib.net.nuspec" + ] + }, + "JabberNet/2.1.2": { + "type": "project", + "path": "../../src/JabberNet/project.json", + "msbuildProject": "../../src/JabberNet/JabberNet.xproj" + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "path": "../../src/JabberNet.Netlib.Dns/project.json", + "msbuildProject": "../../src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj" + } + }, + "projectFileDependencyGroups": { + "": [ + "JabberNet" + ], + ".NETFramework,Version=v4.0": [] + }, + "tools": {}, + "projectFileToolGroups": {} +} \ No newline at end of file diff --git a/examples/JabberNet.Example/HAMMER.ICO b/examples/JabberNet.Example/HAMMER.ICO deleted file mode 100644 index a7d37ad..0000000 Binary files a/examples/JabberNet.Example/HAMMER.ICO and /dev/null differ diff --git a/examples/JabberNet.Example/JabberNet.Example.csproj b/examples/JabberNet.Example/JabberNet.Example.csproj deleted file mode 100644 index 6926d3a..0000000 --- a/examples/JabberNet.Example/JabberNet.Example.csproj +++ /dev/null @@ -1,214 +0,0 @@ - - - - Local - 8.0.50727 - 2.0 - {F7208FC2-C9FF-4019-96D8-E0F5001FDBFD} - Debug - AnyCPU - HAMMER.ICO - - - JabberNet.Example - - - JScript - Grid - IE50 - false - WinExe - JabberNet.Example - OnBuildSuccess - JabberNet.Example.MainForm - - - - - v4.0 - 2.0 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - bin\Debug\ - obj\ - obj\Debug\ - false - 285212672 - false - - - TRACE;DEBUG - - - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - false - AllRules.ruleset - - - bin\Release\ - obj\ - obj\Debug\ - false - 285212672 - false - - - TRACE - - - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - false - AllRules.ruleset - - - - System - - - System.Drawing - - - System.Windows.Forms - - - System.XML - - - - - Form - - - Form - - - Code - - - Form - - - - Form - - - UserControl - - - Form - - - Form - - - UserControl - - - Designer - AddContact.cs - - - Designer - AddGroup.cs - - - Designer - ConferenceForm.cs - - - MainForm.cs - Designer - - - Designer - PubSubDisplay.cs - - - Designer - PubSubSubscribeForm.cs - - - SendMessage.cs - Designer - - - Designer - ServiceDisplay.cs - - - - - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5} - JabberNet - - - {071A79A9-E23F-418F-A6B7-63D3A3E59EEB} - JabberNet.Muzzle - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/JabberNet.Example/JabberNet.Example.xproj b/examples/JabberNet.Example/JabberNet.Example.xproj new file mode 100644 index 0000000..4eec0b7 --- /dev/null +++ b/examples/JabberNet.Example/JabberNet.Example.xproj @@ -0,0 +1,19 @@ + + + + 14.0.25420 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 0b0b4fd8-841e-4233-b3ca-e885093e35ae + JabberNet.Example + .\obj + .\bin\ + + + + 2.0 + + + \ No newline at end of file diff --git a/examples/JabberNet.Example/app.config b/examples/JabberNet.Example/app.config deleted file mode 100644 index 40fea1b..0000000 --- a/examples/JabberNet.Example/app.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/examples/JabberNet.Example/project.json b/examples/JabberNet.Example/project.json new file mode 100644 index 0000000..def3d4b --- /dev/null +++ b/examples/JabberNet.Example/project.json @@ -0,0 +1,18 @@ +{ + "version": "2.1.2-*", + "buildOptions": { + "additionalArguments": [ "/target:winexe" ], + "emitEntryPoint": true + }, + "frameworks": { + "net40": { + "frameworkAssemblies": { + "System.Windows.Forms": "4.0.0.0" + } + } + }, + "dependencies": { + "JabberNet": "*", + "JabberNet.Muzzle": "*" + } +} diff --git a/examples/JabberNet.Example/project.lock.json b/examples/JabberNet.Example/project.lock.json new file mode 100644 index 0000000..7cd3ad1 --- /dev/null +++ b/examples/JabberNet.Example/project.lock.json @@ -0,0 +1,100 @@ +{ + "locked": false, + "version": 2, + "targets": { + ".NETFramework,Version=v4.0": { + "zlib.net/1.0.4": { + "type": "package", + "compile": { + "lib/zlib.net.dll": {} + }, + "runtime": { + "lib/zlib.net.dll": {} + } + }, + "JabberNet/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "dependencies": { + "JabberNet.Netlib.Dns": "1.0.0", + "zlib.net": "1.0.4" + }, + "frameworkAssemblies": [ + "System.Drawing", + "System.Security", + "System.Xml" + ], + "compile": { + "net40/JabberNet.dll": {} + }, + "runtime": { + "net40/JabberNet.dll": {} + } + }, + "JabberNet.Muzzle/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "dependencies": { + "JabberNet": "1.0.0" + }, + "frameworkAssemblies": [ + "System.Windows.Forms" + ], + "compile": { + "net40/JabberNet.Muzzle.dll": {} + }, + "runtime": { + "net40/JabberNet.Muzzle.dll": {} + } + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "compile": { + "net40/JabberNet.Netlib.Dns.dll": {} + }, + "runtime": { + "net40/JabberNet.Netlib.Dns.dll": {} + } + } + } + }, + "libraries": { + "zlib.net/1.0.4": { + "sha512": "ywKkVY1y20tGQsUnYgKupYm91L8GVrVgoEOFTjfR1Bb5Xiy5tBJu5SV9liIiW2h8/KQUBefE45vSythtNMmahQ==", + "type": "package", + "path": "zlib.net/1.0.4", + "files": [ + "lib/zlib.net.dll", + "zlib.net.1.0.4.nupkg.sha512", + "zlib.net.nuspec" + ] + }, + "JabberNet/2.1.2": { + "type": "project", + "path": "../../src/JabberNet/project.json", + "msbuildProject": "../../src/JabberNet/JabberNet.xproj" + }, + "JabberNet.Muzzle/2.1.2": { + "type": "project", + "path": "../../src/JabberNet.Muzzle/project.json", + "msbuildProject": "../../src/JabberNet.Muzzle/JabberNet.Muzzle.xproj" + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "path": "../../src/JabberNet.Netlib.Dns/project.json", + "msbuildProject": "../../src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj" + } + }, + "projectFileDependencyGroups": { + "": [ + "JabberNet", + "JabberNet.Muzzle" + ], + ".NETFramework,Version=v4.0": [ + "System.Windows.Forms >= 4.0.0" + ] + }, + "tools": {}, + "projectFileToolGroups": {} +} \ No newline at end of file diff --git a/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj b/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj index 9281758..3ae4bc4 100644 --- a/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj +++ b/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj @@ -95,6 +95,12 @@ AllRules.ruleset + + ..\..\src\JabberNet\bin\Debug\net40\JabberNet.dll + + + ..\..\src\JabberNet.Muzzle\bin\Debug\net40\JabberNet.Muzzle.dll + System @@ -156,16 +162,6 @@ true - - - {6cae854a-f202-4d2b-b10e-e8d8e81e5ef5} - JabberNet - - - {071a79a9-e23f-418f-a6b7-63d3a3e59eeb} - JabberNet.Muzzle - - diff --git a/global.json b/global.json new file mode 100644 index 0000000..db18bbf --- /dev/null +++ b/global.json @@ -0,0 +1,7 @@ +{ + "projects": [ + "examples", + "src", + "tests" + ] +} diff --git a/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj b/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj deleted file mode 100644 index 76e06a1..0000000 --- a/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj +++ /dev/null @@ -1,239 +0,0 @@ - - - - Local - 8.0.50727 - 2.0 - {071A79A9-E23F-418F-A6B7-63D3A3E59EEB} - Debug - AnyCPU - - - - - JabberNet.Muzzle - - - JScript - Grid - IE50 - false - Library - JabberNet.Muzzle - OnBuildSuccess - - - - - - - true - v4.0 - 2.0 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - bin\Debug\ - obj\ - obj\Debug\ - false - 285212672 - false - - - TRACE;DEBUG - - - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - AllRules.ruleset - - - bin\Release\ - obj\ - obj\Debug\ - false - 285212672 - false - - - TRACE - - - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - AllRules.ruleset - - - - System - - - - System.Drawing - - - System.Windows.Forms - - - System.XML - - - JabberNet - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - - - Code - - - Component - - - Component - - - Form - - - Form - - - Form - - - - UserControl - - - UserControl - - - Form - - - Component - - - UserControl - - - UserControl - - - Form - - - UserControl - - - - BottomScrollRichText.cs - Designer - - - ClientLogin.cs - Designer - - - ComponentLogin.cs - Designer - - - Designer - InputBox.cs - - - JidMulti.cs - Designer - - - - Litmus.cs - Designer - - - Designer - OptionForm.cs - - - - RosterTree.cs - Designer - - - - StripChart.cs - Designer - - - XDataForm.cs - Designer - - - Designer - XmppDebugger.cs - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - \ No newline at end of file diff --git a/src/JabberNet.Muzzle/JabberNet.Muzzle.xproj b/src/JabberNet.Muzzle/JabberNet.Muzzle.xproj new file mode 100644 index 0000000..3d14959 --- /dev/null +++ b/src/JabberNet.Muzzle/JabberNet.Muzzle.xproj @@ -0,0 +1,19 @@ + + + + 14.0.25420 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 32830894-e2cd-4f17-8cd0-3fe1c693a162 + JabberNet.Muzzle + .\obj + .\bin\ + + + + 2.0 + + + \ No newline at end of file diff --git a/src/JabberNet.Muzzle/project.json b/src/JabberNet.Muzzle/project.json new file mode 100644 index 0000000..7706114 --- /dev/null +++ b/src/JabberNet.Muzzle/project.json @@ -0,0 +1,13 @@ +{ + "version": "2.1.2-*", + "frameworks": { + "net40": { + "frameworkAssemblies": { + "System.Windows.Forms": "4.0.0.0" + } + } + }, + "dependencies": { + "JabberNet": "*" + } +} diff --git a/src/JabberNet.Muzzle/project.lock.json b/src/JabberNet.Muzzle/project.lock.json new file mode 100644 index 0000000..36d3e33 --- /dev/null +++ b/src/JabberNet.Muzzle/project.lock.json @@ -0,0 +1,78 @@ +{ + "locked": false, + "version": 2, + "targets": { + ".NETFramework,Version=v4.0": { + "zlib.net/1.0.4": { + "type": "package", + "compile": { + "lib/zlib.net.dll": {} + }, + "runtime": { + "lib/zlib.net.dll": {} + } + }, + "JabberNet/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "dependencies": { + "JabberNet.Netlib.Dns": "1.0.0", + "zlib.net": "1.0.4" + }, + "frameworkAssemblies": [ + "System.Drawing", + "System.Security", + "System.Xml" + ], + "compile": { + "net40/JabberNet.dll": {} + }, + "runtime": { + "net40/JabberNet.dll": {} + } + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "compile": { + "net40/JabberNet.Netlib.Dns.dll": {} + }, + "runtime": { + "net40/JabberNet.Netlib.Dns.dll": {} + } + } + } + }, + "libraries": { + "zlib.net/1.0.4": { + "sha512": "ywKkVY1y20tGQsUnYgKupYm91L8GVrVgoEOFTjfR1Bb5Xiy5tBJu5SV9liIiW2h8/KQUBefE45vSythtNMmahQ==", + "type": "package", + "path": "zlib.net/1.0.4", + "files": [ + "lib/zlib.net.dll", + "zlib.net.1.0.4.nupkg.sha512", + "zlib.net.nuspec" + ] + }, + "JabberNet/2.1.2": { + "type": "project", + "path": "../JabberNet/project.json", + "msbuildProject": "../JabberNet/JabberNet.xproj" + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "path": "../JabberNet.Netlib.Dns/project.json", + "msbuildProject": "../JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj" + } + }, + "projectFileDependencyGroups": { + "": [ + "JabberNet" + ], + ".NETFramework,Version=v4.0": [ + "System.Windows.Forms >= 4.0.0" + ] + }, + "tools": {}, + "projectFileToolGroups": {} +} \ No newline at end of file diff --git a/src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.csproj b/src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.csproj deleted file mode 100644 index 32c9b1d..0000000 --- a/src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.csproj +++ /dev/null @@ -1,93 +0,0 @@ - - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1} - Library - Properties - JabberNet.Netlib.Dns - JabberNet.Netlib.Dns - false - - - v4.0 - - - 2.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - true - full - false - bin\Debug\ - TRACE;DEBUG - prompt - 4 - bin\Debug\JabberNet.Netlib.Dns.xml - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset - bin\Release\JabberNet.Netlib.Dns.xml - - - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - \ No newline at end of file diff --git a/src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj b/src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj new file mode 100644 index 0000000..b501dc4 --- /dev/null +++ b/src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj @@ -0,0 +1,19 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + e978be1a-5654-4ae9-b5d3-8be1a0056f1f + JabberNet.Netlib.Dns + .\obj + .\bin\ + + + + 2.0 + + + \ No newline at end of file diff --git a/src/JabberNet.Netlib.Dns/project.json b/src/JabberNet.Netlib.Dns/project.json new file mode 100644 index 0000000..c9e3053 --- /dev/null +++ b/src/JabberNet.Netlib.Dns/project.json @@ -0,0 +1,6 @@ +{ + "version": "2.1.2-*", + "frameworks": { + "net40": {} + } +} diff --git a/src/JabberNet.Netlib.Dns/project.lock.json b/src/JabberNet.Netlib.Dns/project.lock.json new file mode 100644 index 0000000..6b3f820 --- /dev/null +++ b/src/JabberNet.Netlib.Dns/project.lock.json @@ -0,0 +1,14 @@ +{ + "locked": false, + "version": 2, + "targets": { + ".NETFramework,Version=v4.0": {} + }, + "libraries": {}, + "projectFileDependencyGroups": { + "": [], + ".NETFramework,Version=v4.0": [] + }, + "tools": {}, + "projectFileToolGroups": {} +} \ No newline at end of file diff --git a/src/JabberNet/JabberNet.csproj b/src/JabberNet/JabberNet.csproj deleted file mode 100644 index bf4415d..0000000 --- a/src/JabberNet/JabberNet.csproj +++ /dev/null @@ -1,507 +0,0 @@ - - - - Local - 8.0.50727 - 2.0 - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5} - Debug - AnyCPU - - - - - jabber-net - JScript - Grid - IE50 - false - Library - - - OnBuildSuccess - - - - - - - true - - - bin5\Debug\ - obj\ - obj\Debug\ - false - 285212672 - false - - - TRACE;DEBUG;NET20 NO_SRV - TRACE;DEBUG;NO_SRV - 2005-jabber-net.xml - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - - - bin5\Release\ - obj\ - obj\Debug\ - false - 285212672 - false - - - TRACE;NET20 NO_SRV - TRACE;NO_SRV - 2005-jabber-net.xml - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - - - TRACE;DEBUG;NET20 - TRACE;DEBUG - AllRules.ruleset - bin\Debug\ - true - TRACE;DEBUG - bin\Debug\JabberNet.xml - false - - - TRACE - AllRules.ruleset - bin\Release\ - true - bin\Release\JabberNet.xml - false - - - JabberNet - - - - JabberNet - - - - System - - - - - System.XML - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - Code - - - - Code - - - Code - - - Code - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - Code - - - Code - - - - - - - - - - - - Code - - - - - - - - Code - - - Code - - - Code - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - Code - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - - Code - - - - - - - - - - - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - RosterManager.cs - - - - - - - - - - - - {40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1} - JabberNet.Netlib.Dns - - - - - - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - - - - - - false - v4.0 - 2.0 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - - - ..\..\packages\zlib.net\lib\zlib.net.dll - True - True - - - - - \ No newline at end of file diff --git a/src/JabberNet/JabberNet.xproj b/src/JabberNet/JabberNet.xproj new file mode 100644 index 0000000..f4f9d7d --- /dev/null +++ b/src/JabberNet/JabberNet.xproj @@ -0,0 +1,19 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 30cf5f13-7cf2-4dac-a549-ee49bdec4c08 + JabberNet + .\obj + .\bin\ + + + + 2.0 + + + \ No newline at end of file diff --git a/src/JabberNet/bedrock/net/AsyncSocket.cs b/src/JabberNet/bedrock/net/AsyncSocket.cs index f2d526a..a3fe6f7 100644 --- a/src/JabberNet/bedrock/net/AsyncSocket.cs +++ b/src/JabberNet/bedrock/net/AsyncSocket.cs @@ -472,10 +472,19 @@ public override void RequestAccept() /// private void ExecuteAccept(IAsyncResult ar) { - Socket cli = (Socket) m_sock.EndAccept(ar); - AsyncSocket cliCon = new AsyncSocket(m_watcher); - cliCon.m_sock = cli; - AcceptDone(cliCon); + try + { + var cli = m_sock.EndAccept(ar); + var cliCon = new AsyncSocket(m_watcher) + { + m_sock = cli + }; + AcceptDone(cliCon); + } + catch (ObjectDisposedException) + { + // Socket is already disposed; don't accept. + } } private void AcceptDone(AsyncSocket cliCon) diff --git a/src/JabberNet/project.json b/src/JabberNet/project.json new file mode 100644 index 0000000..904766a --- /dev/null +++ b/src/JabberNet/project.json @@ -0,0 +1,20 @@ +{ + "version": "2.1.2-*", + "buildOptions": { + "allowUnsafe": true + }, + "dependencies": { + "zlib.net": "1.0.4", + + "JabberNet.Netlib.Dns": "*" + }, + "frameworks": { + "net40": { + "frameworkAssemblies": { + "System.Drawing": "4.0.0.0", + "System.Security": "4.0.0.0", + "System.Xml": "4.0.0.0" + } + } + } +} diff --git a/src/JabberNet/project.lock.json b/src/JabberNet/project.lock.json new file mode 100644 index 0000000..d20c9d6 --- /dev/null +++ b/src/JabberNet/project.lock.json @@ -0,0 +1,57 @@ +{ + "locked": false, + "version": 2, + "targets": { + ".NETFramework,Version=v4.0": { + "zlib.net/1.0.4": { + "type": "package", + "compile": { + "lib/zlib.net.dll": {} + }, + "runtime": { + "lib/zlib.net.dll": {} + } + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "compile": { + "net40/JabberNet.Netlib.Dns.dll": {} + }, + "runtime": { + "net40/JabberNet.Netlib.Dns.dll": {} + } + } + } + }, + "libraries": { + "zlib.net/1.0.4": { + "sha512": "ywKkVY1y20tGQsUnYgKupYm91L8GVrVgoEOFTjfR1Bb5Xiy5tBJu5SV9liIiW2h8/KQUBefE45vSythtNMmahQ==", + "type": "package", + "path": "zlib.net/1.0.4", + "files": [ + "lib/zlib.net.dll", + "zlib.net.1.0.4.nupkg.sha512", + "zlib.net.nuspec" + ] + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "path": "../JabberNet.Netlib.Dns/project.json", + "msbuildProject": "../JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj" + } + }, + "projectFileDependencyGroups": { + "": [ + "JabberNet.Netlib.Dns", + "zlib.net >= 1.0.4" + ], + ".NETFramework,Version=v4.0": [ + "System.Drawing >= 4.0.0", + "System.Security >= 4.0.0", + "System.Xml >= 4.0.0" + ] + }, + "tools": {}, + "projectFileToolGroups": {} +} \ No newline at end of file diff --git a/tests/JabberNet.Test.Muzzle/JabberNet.Test.Muzzle.fsproj b/tests/JabberNet.Test.Muzzle/JabberNet.Test.Muzzle.fsproj deleted file mode 100644 index 1df9c59..0000000 --- a/tests/JabberNet.Test.Muzzle/JabberNet.Test.Muzzle.fsproj +++ /dev/null @@ -1,103 +0,0 @@ - - - - - Debug - AnyCPU - 2.0 - f53c28b5-f626-4083-9ce6-99c9a9fe860b - Library - JabberNet.Test.Muzzle - JabberNet.Test.Muzzle - v4.0 - 4.3.0.0 - true - JabberNet.Test.Muzzle - - - - true - full - false - false - bin\Debug\ - DEBUG;TRACE - 3 - bin\Debug\JabberNet.Test.Muzzle.XML - - - pdbonly - true - true - bin\Release\ - TRACE - 3 - bin\Release\JabberNet.Test.Muzzle.XML - - - - - True - - - - - - - - - - - - - - - JabberNet.Muzzle - {071a79a9-e23f-418f-a6b7-63d3a3e59eeb} - True - - - - 11 - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - - - - - ..\..\packages\NUnit\lib\net40\nunit.framework.dll - True - True - - - - - - - ..\..\packages\NUnit\lib\net45\nunit.framework.dll - True - True - - - - - \ No newline at end of file diff --git a/tests/JabberNet.Test.Muzzle/JabberNet.Test.Muzzle.xproj b/tests/JabberNet.Test.Muzzle/JabberNet.Test.Muzzle.xproj new file mode 100644 index 0000000..000f307 --- /dev/null +++ b/tests/JabberNet.Test.Muzzle/JabberNet.Test.Muzzle.xproj @@ -0,0 +1,19 @@ + + + + 14.0.25420 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + aa5ef38f-abce-4997-b96f-0846e62e46b3 + JabberNet.Test.Muzzle + .\obj + .\bin\ + + + + 2.0 + + + \ No newline at end of file diff --git a/tests/JabberNet.Test.Muzzle/paket.references b/tests/JabberNet.Test.Muzzle/paket.references deleted file mode 100644 index 415d57b..0000000 --- a/tests/JabberNet.Test.Muzzle/paket.references +++ /dev/null @@ -1,2 +0,0 @@ -FSharp.Core -NUnit diff --git a/tests/JabberNet.Test.Muzzle/project.json b/tests/JabberNet.Test.Muzzle/project.json new file mode 100644 index 0000000..0f7c88b --- /dev/null +++ b/tests/JabberNet.Test.Muzzle/project.json @@ -0,0 +1,31 @@ +{ + "version": "2.1.2-*", + "buildOptions": { + "compilerName": "fsc", + "compile": { + "includeFiles": [ + "AssemblyInfo.fs", + "Helpers.fs", + "ControlExtensionsTest.fs" + ] + } + }, + "frameworks": { + "net462": { + "frameworkAssemblies": { + "System.Numerics": "4.0.0.0" + } + } + }, + "dependencies": { + "FSharp.Core": "4.0.0.1", + "NUnit": "3.4.1", + + "JabberNet.Muzzle": "*" + }, + "tools": { + "dotnet-compile-fsc": "1.0.0-preview2-*", + "dotnet-test-nunit": "3.4.0-beta-2" + }, + "testRunner": "nunit" +} diff --git a/tests/JabberNet.Test.Muzzle/project.lock.json b/tests/JabberNet.Test.Muzzle/project.lock.json new file mode 100644 index 0000000..77800e2 --- /dev/null +++ b/tests/JabberNet.Test.Muzzle/project.lock.json @@ -0,0 +1,220 @@ +{ + "locked": false, + "version": 2, + "targets": { + ".NETFramework,Version=v4.6.2": { + "FSharp.Core/4.0.0.1": { + "type": "package", + "compile": { + "lib/net40/FSharp.Core.dll": {} + }, + "runtime": { + "lib/net40/FSharp.Core.dll": {} + } + }, + "NUnit/3.4.1": { + "type": "package", + "compile": { + "lib/net45/nunit.framework.dll": {} + }, + "runtime": { + "lib/net45/nunit.framework.dll": {} + } + }, + "zlib.net/1.0.4": { + "type": "package", + "compile": { + "lib/zlib.net.dll": {} + }, + "runtime": { + "lib/zlib.net.dll": {} + } + }, + "JabberNet/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "dependencies": { + "JabberNet.Netlib.Dns": "1.0.0", + "zlib.net": "1.0.4" + }, + "frameworkAssemblies": [ + "System.Drawing", + "System.Security", + "System.Xml" + ], + "compile": { + "net40/JabberNet.dll": {} + }, + "runtime": { + "net40/JabberNet.dll": {} + } + }, + "JabberNet.Muzzle/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "dependencies": { + "JabberNet": "1.0.0" + }, + "frameworkAssemblies": [ + "System.Windows.Forms" + ], + "compile": { + "net40/JabberNet.Muzzle.dll": {} + }, + "runtime": { + "net40/JabberNet.Muzzle.dll": {} + } + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "compile": { + "net40/JabberNet.Netlib.Dns.dll": {} + }, + "runtime": { + "net40/JabberNet.Netlib.Dns.dll": {} + } + } + } + }, + "libraries": { + "FSharp.Core/4.0.0.1": { + "sha512": "lNtlbbJ5hP8LEd7nKtTUiGEpLmHLWiU39x+0jq4rmRWG7Mgj6vYm+gmTOhtwpiPFX8j8zUsfLyA8AC7dZY75LQ==", + "type": "package", + "path": "FSharp.Core/4.0.0.1", + "files": [ + "FSharp.Core.4.0.0.1.nupkg.sha512", + "FSharp.Core.nuspec", + "lib/net20/FSharp.Core.dll", + "lib/net20/FSharp.Core.optdata", + "lib/net20/FSharp.Core.sigdata", + "lib/net20/FSharp.Core.xml", + "lib/net40/FSharp.Core.dll", + "lib/net40/FSharp.Core.optdata", + "lib/net40/FSharp.Core.sigdata", + "lib/net40/FSharp.Core.xml", + "lib/portable-net45+monoandroid10+monotouch10+xamarinios10/FSharp.Core.dll", + "lib/portable-net45+monoandroid10+monotouch10+xamarinios10/FSharp.Core.optdata", + "lib/portable-net45+monoandroid10+monotouch10+xamarinios10/FSharp.Core.sigdata", + "lib/portable-net45+monoandroid10+monotouch10+xamarinios10/FSharp.Core.xml", + "lib/portable-net45+netcore45+wp8/FSharp.Core.dll", + "lib/portable-net45+netcore45+wp8/FSharp.Core.optdata", + "lib/portable-net45+netcore45+wp8/FSharp.Core.sigdata", + "lib/portable-net45+netcore45+wp8/FSharp.Core.xml", + "lib/portable-net45+netcore45+wpa81+wp8/FSharp.Core.dll", + "lib/portable-net45+netcore45+wpa81+wp8/FSharp.Core.optdata", + "lib/portable-net45+netcore45+wpa81+wp8/FSharp.Core.sigdata", + "lib/portable-net45+netcore45+wpa81+wp8/FSharp.Core.xml", + "lib/portable-net45+netcore45/FSharp.Core.dll", + "lib/portable-net45+netcore45/FSharp.Core.optdata", + "lib/portable-net45+netcore45/FSharp.Core.sigdata", + "lib/portable-net45+netcore45/FSharp.Core.xml", + "lib/portable-net45+sl5+netcore45/FSharp.Core.dll", + "lib/portable-net45+sl5+netcore45/FSharp.Core.optdata", + "lib/portable-net45+sl5+netcore45/FSharp.Core.sigdata", + "lib/portable-net45+sl5+netcore45/FSharp.Core.xml" + ] + }, + "NUnit/3.4.1": { + "sha512": "G/9h/ENn8+GvT5DvBqVNrUhIWuxtAr0/oVGN2ljKVUw50EAZYBzeWSy9s6nqMswaQACpQzljql1sWQ/peE2eJg==", + "type": "package", + "path": "NUnit/3.4.1", + "files": [ + "CHANGES.txt", + "LICENSE.txt", + "NOTICES.txt", + "NUnit.3.4.1.nupkg.sha512", + "NUnit.nuspec", + "lib/dotnet/nunit.framework.dll", + "lib/dotnet/nunit.framework.xml", + "lib/net20/NUnit.System.Linq.dll", + "lib/net20/nunit.framework.dll", + "lib/net20/nunit.framework.xml", + "lib/net35/nunit.framework.dll", + "lib/net35/nunit.framework.xml", + "lib/net40/nunit.framework.dll", + "lib/net40/nunit.framework.xml", + "lib/net45/nunit.framework.dll", + "lib/net45/nunit.framework.xml", + "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/nunit.framework.dll", + "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/nunit.framework.xml" + ] + }, + "zlib.net/1.0.4": { + "sha512": "ywKkVY1y20tGQsUnYgKupYm91L8GVrVgoEOFTjfR1Bb5Xiy5tBJu5SV9liIiW2h8/KQUBefE45vSythtNMmahQ==", + "type": "package", + "path": "zlib.net/1.0.4", + "files": [ + "lib/zlib.net.dll", + "zlib.net.1.0.4.nupkg.sha512", + "zlib.net.nuspec" + ] + }, + "JabberNet/2.1.2": { + "type": "project", + "path": "../../src/JabberNet/project.json", + "msbuildProject": "../../src/JabberNet/JabberNet.xproj" + }, + "JabberNet.Muzzle/2.1.2": { + "type": "project", + "path": "../../src/JabberNet.Muzzle/project.json", + "msbuildProject": "../../src/JabberNet.Muzzle/JabberNet.Muzzle.xproj" + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "path": "../../src/JabberNet.Netlib.Dns/project.json", + "msbuildProject": "../../src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj" + } + }, + "projectFileDependencyGroups": { + "": [ + "FSharp.Core >= 4.0.0.1", + "JabberNet.Muzzle", + "NUnit >= 3.4.1" + ], + ".NETFramework,Version=v4.6.2": [ + "System.Numerics >= 4.0.0" + ] + }, + "tools": { + ".NETCoreApp,Version=v1.0": { + "dotnet-compile-fsc/1.0.0-preview2-020000": { + "type": "package", + "dependencies": { + "Microsoft.DotNet.Cli.Utils": "1.0.0-preview2-003121", + "Microsoft.DotNet.Compiler.Common": "1.0.0-preview2-003121", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc3-003121", + "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160629", + "Microsoft.NETCore.App": "1.0.0" + }, + "compile": { + "lib/netcoreapp1.0/dotnet-compile-fsc.dll": {} + }, + "runtime": { + "lib/netcoreapp1.0/dotnet-compile-fsc.dll": {} + } + }, + "dotnet-test-nunit/3.4.0-beta-2": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.DependencyModel": "1.0.0", + "Microsoft.Extensions.Testing.Abstractions": "1.0.0-preview2-003121", + "Microsoft.NETCore.App": "1.0.0", + "NUnit.Portable.Agent": "3.4.0-beta-2" + }, + "compile": { + "lib/netcoreapp1.0/dotnet-test-nunit.dll": {} + }, + "runtime": { + "lib/netcoreapp1.0/dotnet-test-nunit.dll": {} + } + } + } + }, + "projectFileToolGroups": { + ".NETCoreApp,Version=v1.0": [ + "dotnet-compile-fsc >= 1.0.0-preview2-*", + "dotnet-test-nunit >= 3.4.0-beta-2" + ] + } +} \ No newline at end of file diff --git a/tests/JabberNet.Test/JabberNet.Test.csproj b/tests/JabberNet.Test/JabberNet.Test.csproj deleted file mode 100644 index 1d73ecd..0000000 --- a/tests/JabberNet.Test/JabberNet.Test.csproj +++ /dev/null @@ -1,288 +0,0 @@ - - - - Local - 8.0.50727 - 2.0 - {76F923A3-5D99-45B9-9327-FBE56648A39F} - Debug - AnyCPU - - - - - JabberNet.Test - - - JScript - Grid - IE50 - false - Library - JabberNet.Test - OnBuildSuccess - - - - - - - v4.0 - 2.0 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - bin\Debug\ - obj\ - obj\Debug\ - false - 285212672 - false - - - TRACE;DEBUG - - - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - AllRules.ruleset - - - bin\Release\ - obj\ - obj\Debug\ - false - 285212672 - false - - - TRACE - - - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - false - AllRules.ruleset - - - - System - - - - System.XML - - - JabberNet - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - - - - Code - - - - Code - - - Code - - - Code - - - Code - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - - - - - - ..\..\packages\NUnit\lib\net40\nunit.framework.dll - True - True - - - - - - - ..\..\packages\NUnit\lib\net45\nunit.framework.dll - True - True - - - - - - - - - ..\..\packages\RhinoMocks\lib\net\Rhino.Mocks.dll - True - True - - - - - \ No newline at end of file diff --git a/tests/JabberNet.Test/JabberNet.Test.xproj b/tests/JabberNet.Test/JabberNet.Test.xproj new file mode 100644 index 0000000..bb4a44a --- /dev/null +++ b/tests/JabberNet.Test/JabberNet.Test.xproj @@ -0,0 +1,19 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 3f7b322b-bd5d-4db7-8528-08a4ffe9e199 + JabberNet.Test + .\obj + .\bin\ + + + + 2.0 + + + \ No newline at end of file diff --git a/tests/JabberNet.Test/project.json b/tests/JabberNet.Test/project.json new file mode 100644 index 0000000..912badb --- /dev/null +++ b/tests/JabberNet.Test/project.json @@ -0,0 +1,19 @@ +{ + "version": "2.1.2-*", + "frameworks": { + "net451": { + "frameworkAssemblies": { + } + } + }, + "dependencies": { + "NUnit": "3.4.1", + "RhinoMocks": "3.6.1", + + "JabberNet": "*" + }, + "tools": { + "dotnet-test-nunit": "3.4.0-beta-2" + }, + "testRunner": "nunit" +} diff --git a/tests/JabberNet.Test/project.lock.json b/tests/JabberNet.Test/project.lock.json new file mode 100644 index 0000000..572d0b2 --- /dev/null +++ b/tests/JabberNet.Test/project.lock.json @@ -0,0 +1,154 @@ +{ + "locked": false, + "version": 2, + "targets": { + ".NETFramework,Version=v4.5.1": { + "NUnit/3.4.1": { + "type": "package", + "compile": { + "lib/net45/nunit.framework.dll": {} + }, + "runtime": { + "lib/net45/nunit.framework.dll": {} + } + }, + "RhinoMocks/3.6.1": { + "type": "package", + "compile": { + "lib/net/Rhino.Mocks.dll": {} + }, + "runtime": { + "lib/net/Rhino.Mocks.dll": {} + } + }, + "zlib.net/1.0.4": { + "type": "package", + "compile": { + "lib/zlib.net.dll": {} + }, + "runtime": { + "lib/zlib.net.dll": {} + } + }, + "JabberNet/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "dependencies": { + "JabberNet.Netlib.Dns": "1.0.0", + "zlib.net": "1.0.4" + }, + "frameworkAssemblies": [ + "System.Drawing", + "System.Security", + "System.Xml" + ], + "compile": { + "net40/JabberNet.dll": {} + }, + "runtime": { + "net40/JabberNet.dll": {} + } + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0", + "compile": { + "net40/JabberNet.Netlib.Dns.dll": {} + }, + "runtime": { + "net40/JabberNet.Netlib.Dns.dll": {} + } + } + } + }, + "libraries": { + "NUnit/3.4.1": { + "sha512": "G/9h/ENn8+GvT5DvBqVNrUhIWuxtAr0/oVGN2ljKVUw50EAZYBzeWSy9s6nqMswaQACpQzljql1sWQ/peE2eJg==", + "type": "package", + "path": "NUnit/3.4.1", + "files": [ + "CHANGES.txt", + "LICENSE.txt", + "NOTICES.txt", + "NUnit.3.4.1.nupkg.sha512", + "NUnit.nuspec", + "lib/dotnet/nunit.framework.dll", + "lib/dotnet/nunit.framework.xml", + "lib/net20/NUnit.System.Linq.dll", + "lib/net20/nunit.framework.dll", + "lib/net20/nunit.framework.xml", + "lib/net35/nunit.framework.dll", + "lib/net35/nunit.framework.xml", + "lib/net40/nunit.framework.dll", + "lib/net40/nunit.framework.xml", + "lib/net45/nunit.framework.dll", + "lib/net45/nunit.framework.xml", + "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/nunit.framework.dll", + "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/nunit.framework.xml" + ] + }, + "RhinoMocks/3.6.1": { + "sha512": "0HjdR7PVVUDz9Db5cLzU0Dquay8MhoCoZ8PJRZOo10Iysq4m+mjl2aaxc4eWztvZ6S1v/NYW5xv1qul0ToN21w==", + "type": "package", + "path": "RhinoMocks/3.6.1", + "files": [ + "RhinoMocks.3.6.1.nupkg.sha512", + "RhinoMocks.nuspec", + "lib/net/Rhino.Mocks.dll", + "lib/net/Rhino.Mocks.xml" + ] + }, + "zlib.net/1.0.4": { + "sha512": "ywKkVY1y20tGQsUnYgKupYm91L8GVrVgoEOFTjfR1Bb5Xiy5tBJu5SV9liIiW2h8/KQUBefE45vSythtNMmahQ==", + "type": "package", + "path": "zlib.net/1.0.4", + "files": [ + "lib/zlib.net.dll", + "zlib.net.1.0.4.nupkg.sha512", + "zlib.net.nuspec" + ] + }, + "JabberNet/2.1.2": { + "type": "project", + "path": "../../src/JabberNet/project.json", + "msbuildProject": "../../src/JabberNet/JabberNet.xproj" + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "path": "../../src/JabberNet.Netlib.Dns/project.json", + "msbuildProject": "../../src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj" + } + }, + "projectFileDependencyGroups": { + "": [ + "JabberNet", + "NUnit >= 3.4.1", + "RhinoMocks >= 3.6.1" + ], + ".NETFramework,Version=v4.5.1": [] + }, + "tools": { + ".NETCoreApp,Version=v1.0": { + "dotnet-test-nunit/3.4.0-beta-2": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.DependencyModel": "1.0.0", + "Microsoft.Extensions.Testing.Abstractions": "1.0.0-preview2-003121", + "Microsoft.NETCore.App": "1.0.0", + "NUnit.Portable.Agent": "3.4.0-beta-2" + }, + "compile": { + "lib/netcoreapp1.0/dotnet-test-nunit.dll": {} + }, + "runtime": { + "lib/netcoreapp1.0/dotnet-test-nunit.dll": {} + } + } + } + }, + "projectFileToolGroups": { + ".NETCoreApp,Version=v1.0": [ + "dotnet-test-nunit >= 3.4.0-beta-2" + ] + } +} \ No newline at end of file