From a6149e5698bd6661962f25cf92d5178d5612a9f7 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sat, 24 Sep 2016 14:22:48 +0700 Subject: [PATCH 01/12] #61: initial support of .NET Core build system --- Readme.md | 12 ++++++ src/JabberNet.Netlib.Dns/project.json | 9 ++++ src/JabberNet.Netlib.Dns/project.lock.json | 14 ++++++ src/JabberNet/project.json | 20 +++++++++ src/JabberNet/project.lock.json | 50 ++++++++++++++++++++++ 5 files changed, 105 insertions(+) create mode 100644 src/JabberNet.Netlib.Dns/project.json create mode 100644 src/JabberNet.Netlib.Dns/project.lock.json create mode 100644 src/JabberNet/project.json create mode 100644 src/JabberNet/project.lock.json diff --git a/Readme.md b/Readme.md index d8f3013..dcda960 100644 --- a/Readme.md +++ b/Readme.md @@ -43,6 +43,17 @@ $ 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 +``` + Documentation ------------- @@ -80,6 +91,7 @@ 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://docs.microsoft.com/dotnet/ [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/src/JabberNet.Netlib.Dns/project.json b/src/JabberNet.Netlib.Dns/project.json new file mode 100644 index 0000000..3c0896d --- /dev/null +++ b/src/JabberNet.Netlib.Dns/project.json @@ -0,0 +1,9 @@ +{ + "version": "2.1.2-*", + "buildOptions": { + "debugType": "portable" + }, + "frameworks": { + "net45": {} + } +} diff --git a/src/JabberNet.Netlib.Dns/project.lock.json b/src/JabberNet.Netlib.Dns/project.lock.json new file mode 100644 index 0000000..13e443e --- /dev/null +++ b/src/JabberNet.Netlib.Dns/project.lock.json @@ -0,0 +1,14 @@ +{ + "locked": false, + "version": 2, + "targets": { + ".NETFramework,Version=v4.5": {} + }, + "libraries": {}, + "projectFileDependencyGroups": { + "": [], + ".NETFramework,Version=v4.5": [] + }, + "tools": {}, + "projectFileToolGroups": {} +} \ No newline at end of file diff --git a/src/JabberNet/project.json b/src/JabberNet/project.json new file mode 100644 index 0000000..b548a9b --- /dev/null +++ b/src/JabberNet/project.json @@ -0,0 +1,20 @@ +{ + "version": "2.1.2-*", + "buildOptions": { + "allowUnsafe": true, + "debugType": "portable" + }, + "dependencies": { + "zlib.net": "1.0.4", + "JabberNet.Netlib.Dns": "*" + }, + "frameworks": { + "net45": { + "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..00e6715 --- /dev/null +++ b/src/JabberNet/project.lock.json @@ -0,0 +1,50 @@ +{ + "locked": false, + "version": 2, + "targets": { + ".NETFramework,Version=v4.5": { + "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.5" + } + } + }, + "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" + } + }, + "projectFileDependencyGroups": { + "": [ + "JabberNet.Netlib.Dns", + "zlib.net >= 1.0.4" + ], + ".NETFramework,Version=v4.5": [ + "System.Drawing >= 4.0.0", + "System.Security >= 4.0.0", + "System.Xml >= 4.0.0" + ] + }, + "tools": {}, + "projectFileToolGroups": {} +} \ No newline at end of file From 3a0feb078b0cfade288f831c8458bca3cc696cc4 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sat, 24 Sep 2016 14:50:59 +0700 Subject: [PATCH 02/12] #61: add test project to the build --- global.json | 6 ++ src/JabberNet.Netlib.Dns/project.json | 2 +- src/JabberNet.Netlib.Dns/project.lock.json | 4 +- src/JabberNet/project.json | 3 +- src/JabberNet/project.lock.json | 6 +- tests/JabberNet.Test/project.json | 18 ++++ tests/JabberNet.Test/project.lock.json | 118 +++++++++++++++++++++ 7 files changed, 150 insertions(+), 7 deletions(-) create mode 100644 global.json create mode 100644 tests/JabberNet.Test/project.json create mode 100644 tests/JabberNet.Test/project.lock.json diff --git a/global.json b/global.json new file mode 100644 index 0000000..e6d6b3c --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "projects": [ + "src", + "tests" + ] +} diff --git a/src/JabberNet.Netlib.Dns/project.json b/src/JabberNet.Netlib.Dns/project.json index 3c0896d..3014a78 100644 --- a/src/JabberNet.Netlib.Dns/project.json +++ b/src/JabberNet.Netlib.Dns/project.json @@ -4,6 +4,6 @@ "debugType": "portable" }, "frameworks": { - "net45": {} + "net40": {} } } diff --git a/src/JabberNet.Netlib.Dns/project.lock.json b/src/JabberNet.Netlib.Dns/project.lock.json index 13e443e..6b3f820 100644 --- a/src/JabberNet.Netlib.Dns/project.lock.json +++ b/src/JabberNet.Netlib.Dns/project.lock.json @@ -2,12 +2,12 @@ "locked": false, "version": 2, "targets": { - ".NETFramework,Version=v4.5": {} + ".NETFramework,Version=v4.0": {} }, "libraries": {}, "projectFileDependencyGroups": { "": [], - ".NETFramework,Version=v4.5": [] + ".NETFramework,Version=v4.0": [] }, "tools": {}, "projectFileToolGroups": {} diff --git a/src/JabberNet/project.json b/src/JabberNet/project.json index b548a9b..e51ceeb 100644 --- a/src/JabberNet/project.json +++ b/src/JabberNet/project.json @@ -6,10 +6,11 @@ }, "dependencies": { "zlib.net": "1.0.4", + "JabberNet.Netlib.Dns": "*" }, "frameworks": { - "net45": { + "net40": { "frameworkAssemblies": { "System.Drawing": "4.0.0.0", "System.Security": "4.0.0.0", diff --git a/src/JabberNet/project.lock.json b/src/JabberNet/project.lock.json index 00e6715..382e5b0 100644 --- a/src/JabberNet/project.lock.json +++ b/src/JabberNet/project.lock.json @@ -2,7 +2,7 @@ "locked": false, "version": 2, "targets": { - ".NETFramework,Version=v4.5": { + ".NETFramework,Version=v4.0": { "zlib.net/1.0.4": { "type": "package", "compile": { @@ -14,7 +14,7 @@ }, "JabberNet.Netlib.Dns/2.1.2": { "type": "project", - "framework": ".NETFramework,Version=v4.5" + "framework": ".NETFramework,Version=v4.0" } } }, @@ -39,7 +39,7 @@ "JabberNet.Netlib.Dns", "zlib.net >= 1.0.4" ], - ".NETFramework,Version=v4.5": [ + ".NETFramework,Version=v4.0": [ "System.Drawing >= 4.0.0", "System.Security >= 4.0.0", "System.Xml >= 4.0.0" diff --git a/tests/JabberNet.Test/project.json b/tests/JabberNet.Test/project.json new file mode 100644 index 0000000..a2daab5 --- /dev/null +++ b/tests/JabberNet.Test/project.json @@ -0,0 +1,18 @@ +{ + "version": "2.1.2-*", + "buildOptions": { + "debugType": "portable" + }, + "dependencies": { + "NUnit": "3.4.1", + "RhinoMocks": "3.6.1", + + "JabberNet": "*" + }, + "frameworks": { + "net40": { + "frameworkAssemblies": { + } + } + } +} diff --git a/tests/JabberNet.Test/project.lock.json b/tests/JabberNet.Test/project.lock.json new file mode 100644 index 0000000..d5f9ed0 --- /dev/null +++ b/tests/JabberNet.Test/project.lock.json @@ -0,0 +1,118 @@ +{ + "locked": false, + "version": 2, + "targets": { + ".NETFramework,Version=v4.0": { + "NUnit/3.4.1": { + "type": "package", + "compile": { + "lib/net40/nunit.framework.dll": {} + }, + "runtime": { + "lib/net40/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" + ] + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "framework": ".NETFramework,Version=v4.0" + } + } + }, + "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" + }, + "JabberNet.Netlib.Dns/2.1.2": { + "type": "project", + "path": "../../src/JabberNet.Netlib.Dns/project.json" + } + }, + "projectFileDependencyGroups": { + "": [ + "JabberNet", + "NUnit >= 3.4.1", + "RhinoMocks >= 3.6.1" + ], + ".NETFramework,Version=v4.0": [] + }, + "tools": {}, + "projectFileToolGroups": {} +} \ No newline at end of file From 0bf1d514c2f9f9460b91ccb299c7074c4e56653d Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sat, 24 Sep 2016 15:09:14 +0700 Subject: [PATCH 03/12] #61: add test runner, fix test Change AsyncSocket to silently drop disposed connections. --- Readme.md | 1 + src/JabberNet/bedrock/net/AsyncSocket.cs | 17 +- src/JabberNet/project.lock.json | 15 +- tests/JabberNet.Test/project.json | 14 +- tests/JabberNet.Test/project.lock.json | 822 ++++++++++++++++++++++- 5 files changed, 841 insertions(+), 28 deletions(-) diff --git a/Readme.md b/Readme.md index dcda960..c84c543 100644 --- a/Readme.md +++ b/Readme.md @@ -52,6 +52,7 @@ 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 ``` Documentation 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.lock.json b/src/JabberNet/project.lock.json index 382e5b0..deb8754 100644 --- a/src/JabberNet/project.lock.json +++ b/src/JabberNet/project.lock.json @@ -1,20 +1,15 @@ { "locked": false, - "version": 2, + "version": 1, "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" } } }, @@ -28,10 +23,6 @@ "zlib.net.1.0.4.nupkg.sha512", "zlib.net.nuspec" ] - }, - "JabberNet.Netlib.Dns/2.1.2": { - "type": "project", - "path": "../JabberNet.Netlib.Dns/project.json" } }, "projectFileDependencyGroups": { @@ -44,7 +35,5 @@ "System.Security >= 4.0.0", "System.Xml >= 4.0.0" ] - }, - "tools": {}, - "projectFileToolGroups": {} + } } \ No newline at end of file diff --git a/tests/JabberNet.Test/project.json b/tests/JabberNet.Test/project.json index a2daab5..8d713b9 100644 --- a/tests/JabberNet.Test/project.json +++ b/tests/JabberNet.Test/project.json @@ -3,16 +3,18 @@ "buildOptions": { "debugType": "portable" }, + "frameworks": { + "net451": { + "frameworkAssemblies": { + } + } + }, "dependencies": { "NUnit": "3.4.1", "RhinoMocks": "3.6.1", + "dotnet-test-nunit": "3.4.0-beta-2", "JabberNet": "*" }, - "frameworks": { - "net40": { - "frameworkAssemblies": { - } - } - } + "testRunner": "nunit" } diff --git a/tests/JabberNet.Test/project.lock.json b/tests/JabberNet.Test/project.lock.json index d5f9ed0..6a8536b 100644 --- a/tests/JabberNet.Test/project.lock.json +++ b/tests/JabberNet.Test/project.lock.json @@ -2,14 +2,263 @@ "locked": false, "version": 2, "targets": { - ".NETFramework,Version=v4.0": { + ".NETFramework,Version=v4.5.1": { + "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.Platforms": "1.0.1", + "NUnit.Portable.Agent": "3.4.0-beta-2" + }, + "compile": { + "lib/net451/dotnet-test-nunit.exe": {} + }, + "runtime": { + "lib/net451/dotnet-test-nunit.exe": {} + } + }, + "Microsoft.DiaSymReader/1.0.8": { + "type": "package", + "dependencies": { + "System.Diagnostics.Debug": "4.0.11", + "System.Runtime": "4.1.0", + "System.Runtime.InteropServices": "4.1.0" + }, + "compile": { + "lib/net20/Microsoft.DiaSymReader.dll": {} + }, + "runtime": { + "lib/net20/Microsoft.DiaSymReader.dll": {} + } + }, + "Microsoft.DiaSymReader.Native/1.4.0-rc2": { + "type": "package", + "runtimeTargets": { + "runtimes/win-x64/native/Microsoft.DiaSymReader.Native.amd64.dll": { + "assetType": "native", + "rid": "win-x64" + }, + "runtimes/win-x86/native/Microsoft.DiaSymReader.Native.x86.dll": { + "assetType": "native", + "rid": "win-x86" + }, + "runtimes/win/native/Microsoft.DiaSymReader.Native.amd64.dll": { + "assetType": "native", + "rid": "win" + }, + "runtimes/win/native/Microsoft.DiaSymReader.Native.arm.dll": { + "assetType": "native", + "rid": "win" + }, + "runtimes/win/native/Microsoft.DiaSymReader.Native.x86.dll": { + "assetType": "native", + "rid": "win" + }, + "runtimes/win8-arm/native/Microsoft.DiaSymReader.Native.arm.dll": { + "assetType": "native", + "rid": "win8-arm" + } + } + }, + "Microsoft.DotNet.InternalAbstractions/1.0.0": { + "type": "package", + "compile": { + "lib/net451/Microsoft.DotNet.InternalAbstractions.dll": {} + }, + "runtime": { + "lib/net451/Microsoft.DotNet.InternalAbstractions.dll": {} + } + }, + "Microsoft.DotNet.ProjectModel/1.0.0-rc3-003121": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.DependencyModel": "1.0.0", + "Newtonsoft.Json": "9.0.1", + "NuGet.Packaging": "3.5.0-beta2-1484", + "NuGet.RuntimeModel": "3.5.0-beta2-1484", + "System.Reflection.Metadata": "1.3.0" + }, + "compile": { + "lib/net451/Microsoft.DotNet.ProjectModel.dll": {} + }, + "runtime": { + "lib/net451/Microsoft.DotNet.ProjectModel.dll": {} + } + }, + "Microsoft.Extensions.DependencyModel/1.0.0": { + "type": "package", + "dependencies": { + "Microsoft.DotNet.InternalAbstractions": "1.0.0", + "Newtonsoft.Json": "9.0.1" + }, + "compile": { + "lib/net451/Microsoft.Extensions.DependencyModel.dll": {} + }, + "runtime": { + "lib/net451/Microsoft.Extensions.DependencyModel.dll": {} + } + }, + "Microsoft.Extensions.Testing.Abstractions/1.0.0-preview2-003121": { + "type": "package", + "dependencies": { + "Microsoft.DiaSymReader": "1.0.8", + "Microsoft.DiaSymReader.Native": "1.4.0-rc2", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc3-003121", + "Newtonsoft.Json": "9.0.1" + }, + "compile": { + "lib/net451/Microsoft.Extensions.Testing.Abstractions.dll": {} + }, + "runtime": { + "lib/net451/Microsoft.Extensions.Testing.Abstractions.dll": {} + } + }, + "Microsoft.NETCore.Platforms/1.0.1": { + "type": "package", + "compile": { + "lib/netstandard1.0/_._": {} + }, + "runtime": { + "lib/netstandard1.0/_._": {} + } + }, + "Newtonsoft.Json/9.0.1": { + "type": "package", + "compile": { + "lib/net45/Newtonsoft.Json.dll": {} + }, + "runtime": { + "lib/net45/Newtonsoft.Json.dll": {} + } + }, + "NuGet.Common/3.5.0-beta2-1484": { + "type": "package", + "frameworkAssemblies": [ + "Microsoft.CSharp", + "System", + "System.Core", + "System.IO.Compression" + ], + "compile": { + "lib/net45/NuGet.Common.dll": {} + }, + "runtime": { + "lib/net45/NuGet.Common.dll": {} + } + }, + "NuGet.Frameworks/3.5.0-beta2-1484": { + "type": "package", + "compile": { + "lib/net45/NuGet.Frameworks.dll": {} + }, + "runtime": { + "lib/net45/NuGet.Frameworks.dll": {} + } + }, + "NuGet.Packaging/3.5.0-beta2-1484": { + "type": "package", + "dependencies": { + "NuGet.Common": "3.5.0-beta2-1484", + "NuGet.Packaging.Core": "3.5.0-beta2-1484" + }, + "frameworkAssemblies": [ + "System.IO.Compression", + "System.Xml", + "System.Xml.Linq" + ], + "compile": { + "lib/net45/NuGet.Packaging.dll": {} + }, + "runtime": { + "lib/net45/NuGet.Packaging.dll": {} + } + }, + "NuGet.Packaging.Core/3.5.0-beta2-1484": { + "type": "package", + "dependencies": { + "NuGet.Common": "3.5.0-beta2-1484", + "NuGet.Packaging.Core.Types": "3.5.0-beta2-1484" + }, + "frameworkAssemblies": [ + "System.IO.Compression", + "System.Xml", + "System.Xml.Linq" + ], + "compile": { + "lib/net45/NuGet.Packaging.Core.dll": {} + }, + "runtime": { + "lib/net45/NuGet.Packaging.Core.dll": {} + } + }, + "NuGet.Packaging.Core.Types/3.5.0-beta2-1484": { + "type": "package", + "dependencies": { + "NuGet.Frameworks": "3.5.0-beta2-1484", + "NuGet.Versioning": "3.5.0-beta2-1484" + }, + "compile": { + "lib/net45/NuGet.Packaging.Core.Types.dll": {} + }, + "runtime": { + "lib/net45/NuGet.Packaging.Core.Types.dll": {} + } + }, + "NuGet.RuntimeModel/3.5.0-beta2-1484": { + "type": "package", + "dependencies": { + "Newtonsoft.Json": "6.0.4", + "NuGet.Frameworks": "3.5.0-beta2-1484", + "NuGet.Versioning": "3.5.0-beta2-1484" + }, + "compile": { + "lib/net45/NuGet.RuntimeModel.dll": {} + }, + "runtime": { + "lib/net45/NuGet.RuntimeModel.dll": {} + } + }, + "NuGet.Versioning/3.5.0-beta2-1484": { + "type": "package", + "compile": { + "lib/net45/NuGet.Versioning.dll": {} + }, + "runtime": { + "lib/net45/NuGet.Versioning.dll": {} + } + }, "NUnit/3.4.1": { "type": "package", "compile": { - "lib/net40/nunit.framework.dll": {} + "lib/net45/nunit.framework.dll": {} }, "runtime": { - "lib/net40/nunit.framework.dll": {} + "lib/net45/nunit.framework.dll": {} + } + }, + "NUnit.Portable.Agent/3.4.0-beta-2": { + "type": "package", + "frameworkAssemblies": [ + "System.Globalization", + "System.Linq", + "System.ObjectModel", + "System.Reflection", + "System.Reflection.Extensions", + "System.Runtime", + "System.Runtime.Extensions", + "System.Runtime.Serialization.Primitives", + "System.Text.RegularExpressions", + "System.Threading", + "System.Xml", + "System.Xml.Linq", + "System.Xml.XDocument" + ], + "compile": { + "lib/net45/NUnit.Portable.Agent.dll": {} + }, + "runtime": { + "lib/net45/NUnit.Portable.Agent.dll": {} } }, "RhinoMocks/3.6.1": { @@ -21,6 +270,66 @@ "lib/net/Rhino.Mocks.dll": {} } }, + "System.Collections.Immutable/1.2.0": { + "type": "package", + "compile": { + "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} + }, + "runtime": { + "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} + } + }, + "System.Diagnostics.Debug/4.0.11": { + "type": "package", + "frameworkAssemblies": [ + "System" + ], + "compile": { + "ref/net45/_._": {} + }, + "runtime": { + "lib/net45/_._": {} + } + }, + "System.Reflection.Metadata/1.3.0": { + "type": "package", + "dependencies": { + "System.Collections.Immutable": "1.2.0" + }, + "compile": { + "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} + }, + "runtime": { + "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} + } + }, + "System.Runtime/4.1.0": { + "type": "package", + "frameworkAssemblies": [ + "System", + "System.ComponentModel.Composition", + "System.Core" + ], + "compile": { + "ref/net45/_._": {} + }, + "runtime": { + "lib/net45/_._": {} + } + }, + "System.Runtime.InteropServices/4.1.0": { + "type": "package", + "frameworkAssemblies": [ + "System", + "System.Core" + ], + "compile": { + "ref/net45/_._": {} + }, + "runtime": { + "lib/net45/_._": {} + } + }, "zlib.net/1.0.4": { "type": "package", "compile": { @@ -50,6 +359,223 @@ } }, "libraries": { + "dotnet-test-nunit/3.4.0-beta-2": { + "sha512": "za5Bip/Ollig+8pwQi/Lrvi0oVaoBYf2oMrha8+vjfyBWGAa0kSFMCVgrGTt2JyzrYtk9SKzwG3OLHQKuXcwlg==", + "type": "package", + "path": "dotnet-test-nunit/3.4.0-beta-2", + "files": [ + "dotnet-test-nunit.3.4.0-beta-2.nupkg.sha512", + "dotnet-test-nunit.nuspec", + "lib/net451/dotnet-test-nunit.exe", + "lib/netcoreapp1.0/dotnet-test-nunit.dll", + "lib/netcoreapp1.0/dotnet-test-nunit.runtimeconfig.json" + ] + }, + "Microsoft.DiaSymReader/1.0.8": { + "sha512": "ABLULVhCAiyBFLBT5xX6vB4NhZDgwUylGRQK+zW5nZn2rbh1f8LOnFZ9gVSxzL6qOzPNb32Nu3QZ43iZerHOxA==", + "type": "package", + "path": "Microsoft.DiaSymReader/1.0.8", + "files": [ + "Microsoft.DiaSymReader.1.0.8.nupkg.sha512", + "Microsoft.DiaSymReader.nuspec", + "lib/net20/Microsoft.DiaSymReader.dll", + "lib/net20/Microsoft.DiaSymReader.xml", + "lib/netstandard1.1/Microsoft.DiaSymReader.dll", + "lib/netstandard1.1/Microsoft.DiaSymReader.xml", + "lib/portable-net45+win8/Microsoft.DiaSymReader.dll", + "lib/portable-net45+win8/Microsoft.DiaSymReader.xml" + ] + }, + "Microsoft.DiaSymReader.Native/1.4.0-rc2": { + "sha512": "KIQOG+U6btTHL5KkXYofMpyCzVx+6EcDPS9GBRGGhlrTjJqcqAM6a6a0D0Dur/HPnAdmGLtSHVjCDZijGJFCAA==", + "type": "package", + "path": "Microsoft.DiaSymReader.Native/1.4.0-rc2", + "files": [ + "Microsoft.DiaSymReader.Native.1.4.0-rc2.nupkg.sha512", + "Microsoft.DiaSymReader.Native.nuspec", + "build/Microsoft.DiaSymReader.Native.props", + "runtimes/win-x64/native/Microsoft.DiaSymReader.Native.amd64.dll", + "runtimes/win-x86/native/Microsoft.DiaSymReader.Native.x86.dll", + "runtimes/win/native/Microsoft.DiaSymReader.Native.amd64.dll", + "runtimes/win/native/Microsoft.DiaSymReader.Native.arm.dll", + "runtimes/win/native/Microsoft.DiaSymReader.Native.x86.dll", + "runtimes/win8-arm/native/Microsoft.DiaSymReader.Native.arm.dll" + ] + }, + "Microsoft.DotNet.InternalAbstractions/1.0.0": { + "sha512": "AAguUq7YyKk3yDWPoWA8DrLZvURxB/LrDdTn1h5lmPeznkFUpfC3p459w5mQYQE0qpquf/CkSQZ0etiV5vRHFA==", + "type": "package", + "path": "Microsoft.DotNet.InternalAbstractions/1.0.0", + "files": [ + "Microsoft.DotNet.InternalAbstractions.1.0.0.nupkg.sha512", + "Microsoft.DotNet.InternalAbstractions.nuspec", + "lib/net451/Microsoft.DotNet.InternalAbstractions.dll", + "lib/netstandard1.3/Microsoft.DotNet.InternalAbstractions.dll" + ] + }, + "Microsoft.DotNet.ProjectModel/1.0.0-rc3-003121": { + "sha512": "wnWw5KsKinG2wWxdoQIJXZlMFvPNhL7WmIyW9q6xrZFUi/uld5PC3ksq2QDZepF148FUjCIyTP+TnRwU3RJqUg==", + "type": "package", + "path": "Microsoft.DotNet.ProjectModel/1.0.0-rc3-003121", + "files": [ + "Microsoft.DotNet.ProjectModel.1.0.0-rc3-003121.nupkg.sha512", + "Microsoft.DotNet.ProjectModel.nuspec", + "lib/net451/Microsoft.DotNet.ProjectModel.dll", + "lib/netstandard1.6/Microsoft.DotNet.ProjectModel.dll" + ] + }, + "Microsoft.Extensions.DependencyModel/1.0.0": { + "sha512": "n55Y2T4qMgCNMrJaqAN+nlG2EH4XL+e9uxIg4vdFsQeF+L8UKxRdD3C35Bt+xk3vO3Zwp3g+6KFq2VPH2COSmg==", + "type": "package", + "path": "Microsoft.Extensions.DependencyModel/1.0.0", + "files": [ + "Microsoft.Extensions.DependencyModel.1.0.0.nupkg.sha512", + "Microsoft.Extensions.DependencyModel.nuspec", + "lib/net451/Microsoft.Extensions.DependencyModel.dll", + "lib/netstandard1.6/Microsoft.Extensions.DependencyModel.dll" + ] + }, + "Microsoft.Extensions.Testing.Abstractions/1.0.0-preview2-003121": { + "sha512": "q3Uq07d6LbYr0NiX5Dz9GCbXJv4vkmSbUvFEmov3Vo4prZWjhFzF+byk2tWAEEqtZ6ereMYXBUt99wCTtANk6Q==", + "type": "package", + "path": "Microsoft.Extensions.Testing.Abstractions/1.0.0-preview2-003121", + "files": [ + "Microsoft.Extensions.Testing.Abstractions.1.0.0-preview2-003121.nupkg.sha512", + "Microsoft.Extensions.Testing.Abstractions.nuspec", + "lib/net451/Microsoft.Extensions.Testing.Abstractions.dll", + "lib/netstandard1.6/Microsoft.Extensions.Testing.Abstractions.dll" + ] + }, + "Microsoft.NETCore.Platforms/1.0.1": { + "sha512": "2G6OjjJzwBfNOO8myRV/nFrbTw5iA+DEm0N+qUqhrOmaVtn4pC77h38I1jsXGw5VH55+dPfQsqHD0We9sCl9FQ==", + "type": "package", + "path": "Microsoft.NETCore.Platforms/1.0.1", + "files": [ + "Microsoft.NETCore.Platforms.1.0.1.nupkg.sha512", + "Microsoft.NETCore.Platforms.nuspec", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "lib/netstandard1.0/_._", + "runtime.json" + ] + }, + "Newtonsoft.Json/9.0.1": { + "sha512": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", + "type": "package", + "path": "Newtonsoft.Json/9.0.1", + "files": [ + "Newtonsoft.Json.9.0.1.nupkg.sha512", + "Newtonsoft.Json.nuspec", + "lib/net20/Newtonsoft.Json.dll", + "lib/net20/Newtonsoft.Json.xml", + "lib/net35/Newtonsoft.Json.dll", + "lib/net35/Newtonsoft.Json.xml", + "lib/net40/Newtonsoft.Json.dll", + "lib/net40/Newtonsoft.Json.xml", + "lib/net45/Newtonsoft.Json.dll", + "lib/net45/Newtonsoft.Json.xml", + "lib/netstandard1.0/Newtonsoft.Json.dll", + "lib/netstandard1.0/Newtonsoft.Json.xml", + "lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll", + "lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml", + "lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll", + "lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.xml", + "tools/install.ps1" + ] + }, + "NuGet.Common/3.5.0-beta2-1484": { + "sha512": "rLBmcZOPVF7Mne/LumDNACZZyI5B67hjylt+Z/WSEUQ/IXE9nLv8IVL0+T9xljIaSSQCjO8cOtmJ6ztqrsQKcQ==", + "type": "package", + "path": "NuGet.Common/3.5.0-beta2-1484", + "files": [ + "NuGet.Common.3.5.0-beta2-1484.nupkg.sha512", + "NuGet.Common.nuspec", + "lib/net45/NuGet.Common.dll", + "lib/net45/NuGet.Common.xml", + "lib/netstandard1.3/NuGet.Common.dll", + "lib/netstandard1.3/NuGet.Common.xml" + ] + }, + "NuGet.Frameworks/3.5.0-beta2-1484": { + "sha512": "AZoX0c05qgSfx0IOGTbLXa2fD7eM2WUqKP3osMMvSxK+tOGmctHuFlvjXxMHBv9yg0/13KdH0osV/zI7+SjzOA==", + "type": "package", + "path": "NuGet.Frameworks/3.5.0-beta2-1484", + "files": [ + "NuGet.Frameworks.3.5.0-beta2-1484.nupkg.sha512", + "NuGet.Frameworks.nuspec", + "lib/net40-client/NuGet.Frameworks.dll", + "lib/net40-client/NuGet.Frameworks.xml", + "lib/net45/NuGet.Frameworks.dll", + "lib/net45/NuGet.Frameworks.xml", + "lib/netstandard1.3/NuGet.Frameworks.dll", + "lib/netstandard1.3/NuGet.Frameworks.xml" + ] + }, + "NuGet.Packaging/3.5.0-beta2-1484": { + "sha512": "/+7d3vvCel4KhJo6AyOneg07fbAkUsy/ORgIaxW3nNdJubCXSrAdg1wfQpwzBygmErjrPcdYzzk2y2Sc6m7hwQ==", + "type": "package", + "path": "NuGet.Packaging/3.5.0-beta2-1484", + "files": [ + "NuGet.Packaging.3.5.0-beta2-1484.nupkg.sha512", + "NuGet.Packaging.nuspec", + "lib/net45/NuGet.Packaging.dll", + "lib/net45/NuGet.Packaging.xml", + "lib/netstandard1.3/NuGet.Packaging.dll", + "lib/netstandard1.3/NuGet.Packaging.xml" + ] + }, + "NuGet.Packaging.Core/3.5.0-beta2-1484": { + "sha512": "Lsz2lgYH0mdOvuL8C3G4XLm9EaAheBOqrgLgnBNxCeLGLU+n+Zu8Lt6K1bpzgkeKyTyAhJdWbv/3lS4w7s04gw==", + "type": "package", + "path": "NuGet.Packaging.Core/3.5.0-beta2-1484", + "files": [ + "NuGet.Packaging.Core.3.5.0-beta2-1484.nupkg.sha512", + "NuGet.Packaging.Core.nuspec", + "lib/net45/NuGet.Packaging.Core.dll", + "lib/net45/NuGet.Packaging.Core.xml", + "lib/netstandard1.3/NuGet.Packaging.Core.dll", + "lib/netstandard1.3/NuGet.Packaging.Core.xml" + ] + }, + "NuGet.Packaging.Core.Types/3.5.0-beta2-1484": { + "sha512": "4mEXZBoe/RKTDVQGwdrl/f5gqolU2d1JWjpbGdQv5EG/xQCC8IQ8FTNYzk0+ydV/vuRM1yaNe+6UQ90nGE+1kQ==", + "type": "package", + "path": "NuGet.Packaging.Core.Types/3.5.0-beta2-1484", + "files": [ + "NuGet.Packaging.Core.Types.3.5.0-beta2-1484.nupkg.sha512", + "NuGet.Packaging.Core.Types.nuspec", + "lib/net45/NuGet.Packaging.Core.Types.dll", + "lib/net45/NuGet.Packaging.Core.Types.xml", + "lib/netstandard1.3/NuGet.Packaging.Core.Types.dll", + "lib/netstandard1.3/NuGet.Packaging.Core.Types.xml" + ] + }, + "NuGet.RuntimeModel/3.5.0-beta2-1484": { + "sha512": "vg29WbKcExD9AJrKMr7NB9pnp+0MTAcDHB6gFHCqRynSo6jgjC8q+ZPAlxC115rQiO8fqzOEP59Q8hx20anUtA==", + "type": "package", + "path": "NuGet.RuntimeModel/3.5.0-beta2-1484", + "files": [ + "NuGet.RuntimeModel.3.5.0-beta2-1484.nupkg.sha512", + "NuGet.RuntimeModel.nuspec", + "lib/net45/NuGet.RuntimeModel.dll", + "lib/net45/NuGet.RuntimeModel.xml", + "lib/netstandard1.3/NuGet.RuntimeModel.dll", + "lib/netstandard1.3/NuGet.RuntimeModel.xml" + ] + }, + "NuGet.Versioning/3.5.0-beta2-1484": { + "sha512": "Stok+SI5lWxOkTgZZM7jT4xuAZogm5+j85mKJeHSXb8o0OAbB+qDX9jkdM2wIEnjoR8R29J0nQYwk2Kl2lWFpA==", + "type": "package", + "path": "NuGet.Versioning/3.5.0-beta2-1484", + "files": [ + "NuGet.Versioning.3.5.0-beta2-1484.nupkg.sha512", + "NuGet.Versioning.nuspec", + "lib/net45/NuGet.Versioning.dll", + "lib/net45/NuGet.Versioning.xml", + "lib/netstandard1.0/NuGet.Versioning.dll", + "lib/netstandard1.0/NuGet.Versioning.xml" + ] + }, "NUnit/3.4.1": { "sha512": "G/9h/ENn8+GvT5DvBqVNrUhIWuxtAr0/oVGN2ljKVUw50EAZYBzeWSy9s6nqMswaQACpQzljql1sWQ/peE2eJg==", "type": "package", @@ -75,6 +601,17 @@ "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/nunit.framework.xml" ] }, + "NUnit.Portable.Agent/3.4.0-beta-2": { + "sha512": "ybpAVygz7TMj5FKvR/xnYncDOwwZ7omHFbwVRBVMHee5N8AIP2gebNVWPY4DoHFoJwtE2eZ/oBQBtf3/hiLx5w==", + "type": "package", + "path": "NUnit.Portable.Agent/3.4.0-beta-2", + "files": [ + "NUnit.Portable.Agent.3.4.0-beta-2.nupkg.sha512", + "NUnit.Portable.Agent.nuspec", + "lib/net45/NUnit.Portable.Agent.dll", + "lib/netstandard1.3/NUnit.Portable.Agent.dll" + ] + }, "RhinoMocks/3.6.1": { "sha512": "0HjdR7PVVUDz9Db5cLzU0Dquay8MhoCoZ8PJRZOo10Iysq4m+mjl2aaxc4eWztvZ6S1v/NYW5xv1qul0ToN21w==", "type": "package", @@ -86,6 +623,280 @@ "lib/net/Rhino.Mocks.xml" ] }, + "System.Collections.Immutable/1.2.0": { + "sha512": "Cma8cBW6di16ZLibL8LYQ+cLjGzoKxpOTu/faZfDcx94ZjAGq6Nv5RO7+T1YZXqEXTZP9rt1wLVEONVpURtUqw==", + "type": "package", + "path": "System.Collections.Immutable/1.2.0", + "files": [ + "System.Collections.Immutable.1.2.0.nupkg.sha512", + "System.Collections.Immutable.nuspec", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "lib/netstandard1.0/System.Collections.Immutable.dll", + "lib/netstandard1.0/System.Collections.Immutable.xml", + "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll", + "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml" + ] + }, + "System.Diagnostics.Debug/4.0.11": { + "sha512": "w5U95fVKHY4G8ASs/K5iK3J5LY+/dLFd4vKejsnI/ZhBsWS9hQakfx3Zr7lRWKg4tAw9r4iktyvsTagWkqYCiw==", + "type": "package", + "path": "System.Diagnostics.Debug/4.0.11", + "files": [ + "System.Diagnostics.Debug.4.0.11.nupkg.sha512", + "System.Diagnostics.Debug.nuspec", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "lib/MonoAndroid10/_._", + "lib/MonoTouch10/_._", + "lib/net45/_._", + "lib/portable-net45+win8+wp8+wpa81/_._", + "lib/win8/_._", + "lib/wp80/_._", + "lib/wpa81/_._", + "lib/xamarinios10/_._", + "lib/xamarinmac20/_._", + "lib/xamarintvos10/_._", + "lib/xamarinwatchos10/_._", + "ref/MonoAndroid10/_._", + "ref/MonoTouch10/_._", + "ref/net45/_._", + "ref/netcore50/System.Diagnostics.Debug.dll", + "ref/netcore50/System.Diagnostics.Debug.xml", + "ref/netcore50/de/System.Diagnostics.Debug.xml", + "ref/netcore50/es/System.Diagnostics.Debug.xml", + "ref/netcore50/fr/System.Diagnostics.Debug.xml", + "ref/netcore50/it/System.Diagnostics.Debug.xml", + "ref/netcore50/ja/System.Diagnostics.Debug.xml", + "ref/netcore50/ko/System.Diagnostics.Debug.xml", + "ref/netcore50/ru/System.Diagnostics.Debug.xml", + "ref/netcore50/zh-hans/System.Diagnostics.Debug.xml", + "ref/netcore50/zh-hant/System.Diagnostics.Debug.xml", + "ref/netstandard1.0/System.Diagnostics.Debug.dll", + "ref/netstandard1.0/System.Diagnostics.Debug.xml", + "ref/netstandard1.0/de/System.Diagnostics.Debug.xml", + "ref/netstandard1.0/es/System.Diagnostics.Debug.xml", + "ref/netstandard1.0/fr/System.Diagnostics.Debug.xml", + "ref/netstandard1.0/it/System.Diagnostics.Debug.xml", + "ref/netstandard1.0/ja/System.Diagnostics.Debug.xml", + "ref/netstandard1.0/ko/System.Diagnostics.Debug.xml", + "ref/netstandard1.0/ru/System.Diagnostics.Debug.xml", + "ref/netstandard1.0/zh-hans/System.Diagnostics.Debug.xml", + "ref/netstandard1.0/zh-hant/System.Diagnostics.Debug.xml", + "ref/netstandard1.3/System.Diagnostics.Debug.dll", + "ref/netstandard1.3/System.Diagnostics.Debug.xml", + "ref/netstandard1.3/de/System.Diagnostics.Debug.xml", + "ref/netstandard1.3/es/System.Diagnostics.Debug.xml", + "ref/netstandard1.3/fr/System.Diagnostics.Debug.xml", + "ref/netstandard1.3/it/System.Diagnostics.Debug.xml", + "ref/netstandard1.3/ja/System.Diagnostics.Debug.xml", + "ref/netstandard1.3/ko/System.Diagnostics.Debug.xml", + "ref/netstandard1.3/ru/System.Diagnostics.Debug.xml", + "ref/netstandard1.3/zh-hans/System.Diagnostics.Debug.xml", + "ref/netstandard1.3/zh-hant/System.Diagnostics.Debug.xml", + "ref/portable-net45+win8+wp8+wpa81/_._", + "ref/win8/_._", + "ref/wp80/_._", + "ref/wpa81/_._", + "ref/xamarinios10/_._", + "ref/xamarinmac20/_._", + "ref/xamarintvos10/_._", + "ref/xamarinwatchos10/_._" + ] + }, + "System.Reflection.Metadata/1.3.0": { + "sha512": "jMSCxA4LSyKBGRDm/WtfkO03FkcgRzHxwvQRib1bm2GZ8ifKM1MX1al6breGCEQK280mdl9uQS7JNPXRYk90jw==", + "type": "package", + "path": "System.Reflection.Metadata/1.3.0", + "files": [ + "System.Reflection.Metadata.1.3.0.nupkg.sha512", + "System.Reflection.Metadata.nuspec", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "lib/netstandard1.1/System.Reflection.Metadata.dll", + "lib/netstandard1.1/System.Reflection.Metadata.xml", + "lib/portable-net45+win8/System.Reflection.Metadata.dll", + "lib/portable-net45+win8/System.Reflection.Metadata.xml" + ] + }, + "System.Runtime/4.1.0": { + "sha512": "v6c/4Yaa9uWsq+JMhnOFewrYkgdNHNG2eMKuNqRn8P733rNXeRCGvV5FkkjBXn2dbVkPXOsO0xjsEeM1q2zC0g==", + "type": "package", + "path": "System.Runtime/4.1.0", + "files": [ + "System.Runtime.4.1.0.nupkg.sha512", + "System.Runtime.nuspec", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "lib/MonoAndroid10/_._", + "lib/MonoTouch10/_._", + "lib/net45/_._", + "lib/net462/System.Runtime.dll", + "lib/portable-net45+win8+wp80+wpa81/_._", + "lib/win8/_._", + "lib/wp80/_._", + "lib/wpa81/_._", + "lib/xamarinios10/_._", + "lib/xamarinmac20/_._", + "lib/xamarintvos10/_._", + "lib/xamarinwatchos10/_._", + "ref/MonoAndroid10/_._", + "ref/MonoTouch10/_._", + "ref/net45/_._", + "ref/net462/System.Runtime.dll", + "ref/netcore50/System.Runtime.dll", + "ref/netcore50/System.Runtime.xml", + "ref/netcore50/de/System.Runtime.xml", + "ref/netcore50/es/System.Runtime.xml", + "ref/netcore50/fr/System.Runtime.xml", + "ref/netcore50/it/System.Runtime.xml", + "ref/netcore50/ja/System.Runtime.xml", + "ref/netcore50/ko/System.Runtime.xml", + "ref/netcore50/ru/System.Runtime.xml", + "ref/netcore50/zh-hans/System.Runtime.xml", + "ref/netcore50/zh-hant/System.Runtime.xml", + "ref/netstandard1.0/System.Runtime.dll", + "ref/netstandard1.0/System.Runtime.xml", + "ref/netstandard1.0/de/System.Runtime.xml", + "ref/netstandard1.0/es/System.Runtime.xml", + "ref/netstandard1.0/fr/System.Runtime.xml", + "ref/netstandard1.0/it/System.Runtime.xml", + "ref/netstandard1.0/ja/System.Runtime.xml", + "ref/netstandard1.0/ko/System.Runtime.xml", + "ref/netstandard1.0/ru/System.Runtime.xml", + "ref/netstandard1.0/zh-hans/System.Runtime.xml", + "ref/netstandard1.0/zh-hant/System.Runtime.xml", + "ref/netstandard1.2/System.Runtime.dll", + "ref/netstandard1.2/System.Runtime.xml", + "ref/netstandard1.2/de/System.Runtime.xml", + "ref/netstandard1.2/es/System.Runtime.xml", + "ref/netstandard1.2/fr/System.Runtime.xml", + "ref/netstandard1.2/it/System.Runtime.xml", + "ref/netstandard1.2/ja/System.Runtime.xml", + "ref/netstandard1.2/ko/System.Runtime.xml", + "ref/netstandard1.2/ru/System.Runtime.xml", + "ref/netstandard1.2/zh-hans/System.Runtime.xml", + "ref/netstandard1.2/zh-hant/System.Runtime.xml", + "ref/netstandard1.3/System.Runtime.dll", + "ref/netstandard1.3/System.Runtime.xml", + "ref/netstandard1.3/de/System.Runtime.xml", + "ref/netstandard1.3/es/System.Runtime.xml", + "ref/netstandard1.3/fr/System.Runtime.xml", + "ref/netstandard1.3/it/System.Runtime.xml", + "ref/netstandard1.3/ja/System.Runtime.xml", + "ref/netstandard1.3/ko/System.Runtime.xml", + "ref/netstandard1.3/ru/System.Runtime.xml", + "ref/netstandard1.3/zh-hans/System.Runtime.xml", + "ref/netstandard1.3/zh-hant/System.Runtime.xml", + "ref/netstandard1.5/System.Runtime.dll", + "ref/netstandard1.5/System.Runtime.xml", + "ref/netstandard1.5/de/System.Runtime.xml", + "ref/netstandard1.5/es/System.Runtime.xml", + "ref/netstandard1.5/fr/System.Runtime.xml", + "ref/netstandard1.5/it/System.Runtime.xml", + "ref/netstandard1.5/ja/System.Runtime.xml", + "ref/netstandard1.5/ko/System.Runtime.xml", + "ref/netstandard1.5/ru/System.Runtime.xml", + "ref/netstandard1.5/zh-hans/System.Runtime.xml", + "ref/netstandard1.5/zh-hant/System.Runtime.xml", + "ref/portable-net45+win8+wp80+wpa81/_._", + "ref/win8/_._", + "ref/wp80/_._", + "ref/wpa81/_._", + "ref/xamarinios10/_._", + "ref/xamarinmac20/_._", + "ref/xamarintvos10/_._", + "ref/xamarinwatchos10/_._" + ] + }, + "System.Runtime.InteropServices/4.1.0": { + "sha512": "16eu3kjHS633yYdkjwShDHZLRNMKVi/s0bY8ODiqJ2RfMhDMAwxZaUaWVnZ2P71kr/or+X9o/xFWtNqz8ivieQ==", + "type": "package", + "path": "System.Runtime.InteropServices/4.1.0", + "files": [ + "System.Runtime.InteropServices.4.1.0.nupkg.sha512", + "System.Runtime.InteropServices.nuspec", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "lib/MonoAndroid10/_._", + "lib/MonoTouch10/_._", + "lib/net45/_._", + "lib/net462/System.Runtime.InteropServices.dll", + "lib/portable-net45+win8+wpa81/_._", + "lib/win8/_._", + "lib/wpa81/_._", + "lib/xamarinios10/_._", + "lib/xamarinmac20/_._", + "lib/xamarintvos10/_._", + "lib/xamarinwatchos10/_._", + "ref/MonoAndroid10/_._", + "ref/MonoTouch10/_._", + "ref/net45/_._", + "ref/net462/System.Runtime.InteropServices.dll", + "ref/netcore50/System.Runtime.InteropServices.dll", + "ref/netcore50/System.Runtime.InteropServices.xml", + "ref/netcore50/de/System.Runtime.InteropServices.xml", + "ref/netcore50/es/System.Runtime.InteropServices.xml", + "ref/netcore50/fr/System.Runtime.InteropServices.xml", + "ref/netcore50/it/System.Runtime.InteropServices.xml", + "ref/netcore50/ja/System.Runtime.InteropServices.xml", + "ref/netcore50/ko/System.Runtime.InteropServices.xml", + "ref/netcore50/ru/System.Runtime.InteropServices.xml", + "ref/netcore50/zh-hans/System.Runtime.InteropServices.xml", + "ref/netcore50/zh-hant/System.Runtime.InteropServices.xml", + "ref/netstandard1.1/System.Runtime.InteropServices.dll", + "ref/netstandard1.1/System.Runtime.InteropServices.xml", + "ref/netstandard1.1/de/System.Runtime.InteropServices.xml", + "ref/netstandard1.1/es/System.Runtime.InteropServices.xml", + "ref/netstandard1.1/fr/System.Runtime.InteropServices.xml", + "ref/netstandard1.1/it/System.Runtime.InteropServices.xml", + "ref/netstandard1.1/ja/System.Runtime.InteropServices.xml", + "ref/netstandard1.1/ko/System.Runtime.InteropServices.xml", + "ref/netstandard1.1/ru/System.Runtime.InteropServices.xml", + "ref/netstandard1.1/zh-hans/System.Runtime.InteropServices.xml", + "ref/netstandard1.1/zh-hant/System.Runtime.InteropServices.xml", + "ref/netstandard1.2/System.Runtime.InteropServices.dll", + "ref/netstandard1.2/System.Runtime.InteropServices.xml", + "ref/netstandard1.2/de/System.Runtime.InteropServices.xml", + "ref/netstandard1.2/es/System.Runtime.InteropServices.xml", + "ref/netstandard1.2/fr/System.Runtime.InteropServices.xml", + "ref/netstandard1.2/it/System.Runtime.InteropServices.xml", + "ref/netstandard1.2/ja/System.Runtime.InteropServices.xml", + "ref/netstandard1.2/ko/System.Runtime.InteropServices.xml", + "ref/netstandard1.2/ru/System.Runtime.InteropServices.xml", + "ref/netstandard1.2/zh-hans/System.Runtime.InteropServices.xml", + "ref/netstandard1.2/zh-hant/System.Runtime.InteropServices.xml", + "ref/netstandard1.3/System.Runtime.InteropServices.dll", + "ref/netstandard1.3/System.Runtime.InteropServices.xml", + "ref/netstandard1.3/de/System.Runtime.InteropServices.xml", + "ref/netstandard1.3/es/System.Runtime.InteropServices.xml", + "ref/netstandard1.3/fr/System.Runtime.InteropServices.xml", + "ref/netstandard1.3/it/System.Runtime.InteropServices.xml", + "ref/netstandard1.3/ja/System.Runtime.InteropServices.xml", + "ref/netstandard1.3/ko/System.Runtime.InteropServices.xml", + "ref/netstandard1.3/ru/System.Runtime.InteropServices.xml", + "ref/netstandard1.3/zh-hans/System.Runtime.InteropServices.xml", + "ref/netstandard1.3/zh-hant/System.Runtime.InteropServices.xml", + "ref/netstandard1.5/System.Runtime.InteropServices.dll", + "ref/netstandard1.5/System.Runtime.InteropServices.xml", + "ref/netstandard1.5/de/System.Runtime.InteropServices.xml", + "ref/netstandard1.5/es/System.Runtime.InteropServices.xml", + "ref/netstandard1.5/fr/System.Runtime.InteropServices.xml", + "ref/netstandard1.5/it/System.Runtime.InteropServices.xml", + "ref/netstandard1.5/ja/System.Runtime.InteropServices.xml", + "ref/netstandard1.5/ko/System.Runtime.InteropServices.xml", + "ref/netstandard1.5/ru/System.Runtime.InteropServices.xml", + "ref/netstandard1.5/zh-hans/System.Runtime.InteropServices.xml", + "ref/netstandard1.5/zh-hant/System.Runtime.InteropServices.xml", + "ref/portable-net45+win8+wpa81/_._", + "ref/win8/_._", + "ref/wpa81/_._", + "ref/xamarinios10/_._", + "ref/xamarinmac20/_._", + "ref/xamarintvos10/_._", + "ref/xamarinwatchos10/_._" + ] + }, "zlib.net/1.0.4": { "sha512": "ywKkVY1y20tGQsUnYgKupYm91L8GVrVgoEOFTjfR1Bb5Xiy5tBJu5SV9liIiW2h8/KQUBefE45vSythtNMmahQ==", "type": "package", @@ -109,9 +920,10 @@ "": [ "JabberNet", "NUnit >= 3.4.1", - "RhinoMocks >= 3.6.1" + "RhinoMocks >= 3.6.1", + "dotnet-test-nunit >= 3.4.0-beta-2" ], - ".NETFramework,Version=v4.0": [] + ".NETFramework,Version=v4.5.1": [] }, "tools": {}, "projectFileToolGroups": {} From 78db0199fc9c3f86fcfaf0032a8f6c8341f5a242 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sat, 24 Sep 2016 16:09:06 +0700 Subject: [PATCH 04/12] #61: replace some of csproj files with xproj --- JabberNet.sln | 36 +- .../JabberNet.ConsoleClient.csproj | 11 +- .../JabberNet.Example.csproj | 4 - .../JabberNet.VbExample.vbproj | 4 - src/JabberNet.Muzzle/JabberNet.Muzzle.csproj | 5 - .../JabberNet.Netlib.Dns.csproj | 93 ---- .../JabberNet.Netlib.Dns.xproj | 19 + src/JabberNet/JabberNet.csproj | 507 ------------------ src/JabberNet/JabberNet.xproj | 19 + src/JabberNet/project.lock.json | 22 +- tests/JabberNet.Test/JabberNet.Test.csproj | 288 ---------- tests/JabberNet.Test/JabberNet.Test.xproj | 19 + 12 files changed, 101 insertions(+), 926 deletions(-) delete mode 100644 src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.csproj create mode 100644 src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj delete mode 100644 src/JabberNet/JabberNet.csproj create mode 100644 src/JabberNet/JabberNet.xproj delete mode 100644 tests/JabberNet.Test/JabberNet.Test.csproj create mode 100644 tests/JabberNet.Test/JabberNet.Test.xproj diff --git a/JabberNet.sln b/JabberNet.sln index f015f75..aebcd81 100644 --- a/JabberNet.sln +++ b/JabberNet.sln @@ -7,18 +7,12 @@ 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 @@ -71,16 +65,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Readme.md = Readme.md EndProjectSection EndProject +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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|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 {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 @@ -93,18 +89,22 @@ Global {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 - {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 - {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 {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 + {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 + {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 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj b/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj index ee21e9f..d5094fd 100644 --- a/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj +++ b/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj @@ -106,11 +106,6 @@ System.XML - - JabberNet - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - @@ -141,6 +136,12 @@ + + + {30cf5f13-7cf2-4dac-a549-ee49bdec4c08} + JabberNet + + diff --git a/examples/JabberNet.Example/JabberNet.Example.csproj b/examples/JabberNet.Example/JabberNet.Example.csproj index 6926d3a..bfc65dc 100644 --- a/examples/JabberNet.Example/JabberNet.Example.csproj +++ b/examples/JabberNet.Example/JabberNet.Example.csproj @@ -175,10 +175,6 @@ - - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5} - JabberNet - {071A79A9-E23F-418F-A6B7-63D3A3E59EEB} JabberNet.Muzzle diff --git a/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj b/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj index 9281758..e654e81 100644 --- a/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj +++ b/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj @@ -157,10 +157,6 @@ - - {6cae854a-f202-4d2b-b10e-e8d8e81e5ef5} - JabberNet - {071a79a9-e23f-418f-a6b7-63d3a3e59eeb} JabberNet.Muzzle diff --git a/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj b/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj index 4c8c047..85961c3 100644 --- a/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj +++ b/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj @@ -113,11 +113,6 @@ System.XML - - JabberNet - {6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 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/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/project.lock.json b/src/JabberNet/project.lock.json index deb8754..d20c9d6 100644 --- a/src/JabberNet/project.lock.json +++ b/src/JabberNet/project.lock.json @@ -1,15 +1,26 @@ { "locked": false, - "version": 1, + "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": {} + } } } }, @@ -23,6 +34,11 @@ "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": { @@ -35,5 +51,7 @@ "System.Security >= 4.0.0", "System.Xml >= 4.0.0" ] - } + }, + "tools": {}, + "projectFileToolGroups": {} } \ 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 From f7472c8888e9360124833b4704fd59b26c1b3c14 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sat, 24 Sep 2016 16:18:10 +0700 Subject: [PATCH 05/12] #61: convert ConsoleClient to .NET core build system --- JabberNet.sln | 12 +- examples/JabberNet.ConsoleClient/App.ico | Bin 1078 -> 0 bytes .../JabberNet.ConsoleClient.csproj | 152 ------------------ .../JabberNet.ConsoleClient.xproj | 19 +++ examples/JabberNet.ConsoleClient/app.config | 3 - examples/JabberNet.ConsoleClient/project.json | 13 ++ .../JabberNet.ConsoleClient/project.lock.json | 76 +++++++++ global.json | 1 + tests/JabberNet.Test/project.lock.json | 22 ++- 9 files changed, 133 insertions(+), 165 deletions(-) delete mode 100644 examples/JabberNet.ConsoleClient/App.ico delete mode 100644 examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj create mode 100644 examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.xproj delete mode 100644 examples/JabberNet.ConsoleClient/app.config create mode 100644 examples/JabberNet.ConsoleClient/project.json create mode 100644 examples/JabberNet.ConsoleClient/project.lock.json diff --git a/JabberNet.sln b/JabberNet.sln index aebcd81..dad9398 100644 --- a/JabberNet.sln +++ b/JabberNet.sln @@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Muzzle", "src\Jab 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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BBF059F0-722F-4DCC-AF7F-82054E8EF9F4}" ProjectSection(SolutionItems) = preProject Scripts\Build-Docs.ps1 = Scripts\Build-Docs.ps1 @@ -71,6 +69,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet", "src\JabberNet\ 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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -85,10 +85,6 @@ Global {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 - {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 {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 @@ -105,6 +101,10 @@ Global {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 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/JabberNet.ConsoleClient/App.ico b/examples/JabberNet.ConsoleClient/App.ico deleted file mode 100644 index 3a5525fd794f7a7c5c8e6187f470ea3af38cd2b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1078 zcmeHHJr05}7=1t!Hp3A*8IHkVf+j?-!eHY14Gtcw1Eb*_9>Bq^zETJ@GKj{_2j4$w zo9}xCh!8{T3=X##Skq>ikMjsvB|y%crWBM2iW(4pI}c%z6%lW!=~4v77#3{z!dmB1 z__&l)-{KUYR+|8|;wB^R|9ET$J@(@=#rd^=)qs85?vAy(PSF5CyNkus435LVkZ$rj zNw|JG-P7^hF<(;#o*Vk}5R#e|^13tBbQkeF?djULtvqyxd3<{9 diff --git a/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj b/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj deleted file mode 100644 index d5094fd..0000000 --- a/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj +++ /dev/null @@ -1,152 +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 - - - - - - Code - - - Code - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - {30cf5f13-7cf2-4dac-a549-ee49bdec4c08} - JabberNet - - - - - - - - - - \ 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..7598d31 --- /dev/null +++ b/examples/JabberNet.ConsoleClient/project.json @@ -0,0 +1,13 @@ +{ + "version": "1.0.0-*", + "buildOptions": { + "debugType": "portable", + "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/global.json b/global.json index e6d6b3c..db18bbf 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,6 @@ { "projects": [ + "examples", "src", "tests" ] diff --git a/tests/JabberNet.Test/project.lock.json b/tests/JabberNet.Test/project.lock.json index 6a8536b..5c51db6 100644 --- a/tests/JabberNet.Test/project.lock.json +++ b/tests/JabberNet.Test/project.lock.json @@ -350,11 +350,23 @@ "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" + "framework": ".NETFramework,Version=v4.0", + "compile": { + "net40/JabberNet.Netlib.Dns.dll": {} + }, + "runtime": { + "net40/JabberNet.Netlib.Dns.dll": {} + } } } }, @@ -909,11 +921,13 @@ }, "JabberNet/2.1.2": { "type": "project", - "path": "../../src/JabberNet/project.json" + "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" + "path": "../../src/JabberNet.Netlib.Dns/project.json", + "msbuildProject": "../../src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj" } }, "projectFileDependencyGroups": { From fbb7fe084c8dd20dbc092d191f9cca8463dad6af Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sat, 24 Sep 2016 16:31:35 +0700 Subject: [PATCH 06/12] #61: convert all of the projects to dotnet-cli Exception is VB.NET project. --- JabberNet.sln | 36 +-- examples/JabberNet.ConsoleClient/project.json | 2 +- examples/JabberNet.Example/HAMMER.ICO | Bin 1078 -> 0 bytes .../JabberNet.Example.csproj | 210 ---------------- .../JabberNet.Example/JabberNet.Example.xproj | 19 ++ examples/JabberNet.Example/app.config | 5 - examples/JabberNet.Example/project.json | 18 ++ examples/JabberNet.Example/project.lock.json | 100 ++++++++ .../JabberNet.VbExample.xproj | 19 ++ src/JabberNet.Muzzle/JabberNet.Muzzle.csproj | 233 ------------------ src/JabberNet.Muzzle/JabberNet.Muzzle.xproj | 19 ++ src/JabberNet.Muzzle/project.json | 16 ++ src/JabberNet.Muzzle/project.lock.json | 78 ++++++ 13 files changed, 288 insertions(+), 467 deletions(-) delete mode 100644 examples/JabberNet.Example/HAMMER.ICO delete mode 100644 examples/JabberNet.Example/JabberNet.Example.csproj create mode 100644 examples/JabberNet.Example/JabberNet.Example.xproj delete mode 100644 examples/JabberNet.Example/app.config create mode 100644 examples/JabberNet.Example/project.json create mode 100644 examples/JabberNet.Example/project.lock.json create mode 100644 examples/JabberNet.VbExample/JabberNet.VbExample.xproj delete mode 100644 src/JabberNet.Muzzle/JabberNet.Muzzle.csproj create mode 100644 src/JabberNet.Muzzle/JabberNet.Muzzle.xproj create mode 100644 src/JabberNet.Muzzle/project.json create mode 100644 src/JabberNet.Muzzle/project.lock.json diff --git a/JabberNet.sln b/JabberNet.sln index dad9398..0a3a8d6 100644 --- a/JabberNet.sln +++ b/JabberNet.sln @@ -7,10 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{BFD2D7 paket.dependencies = paket.dependencies EndProjectSection 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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BBF059F0-722F-4DCC-AF7F-82054E8EF9F4}" ProjectSection(SolutionItems) = preProject Scripts\Build-Docs.ps1 = Scripts\Build-Docs.ps1 @@ -51,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 @@ -71,24 +65,18 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.Test", "tests\Jab 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("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.VbExample", "examples\JabberNet.VbExample\JabberNet.VbExample.xproj", "{B6C7EA07-AB8D-4126-A7E5-D7996D884EDF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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 - {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 - {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 {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 @@ -105,6 +93,18 @@ Global {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 + {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 + {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 + {B6C7EA07-AB8D-4126-A7E5-D7996D884EDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B6C7EA07-AB8D-4126-A7E5-D7996D884EDF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B6C7EA07-AB8D-4126-A7E5-D7996D884EDF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B6C7EA07-AB8D-4126-A7E5-D7996D884EDF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/JabberNet.ConsoleClient/project.json b/examples/JabberNet.ConsoleClient/project.json index 7598d31..4745b89 100644 --- a/examples/JabberNet.ConsoleClient/project.json +++ b/examples/JabberNet.ConsoleClient/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "2.1.2-*", "buildOptions": { "debugType": "portable", "emitEntryPoint": true diff --git a/examples/JabberNet.Example/HAMMER.ICO b/examples/JabberNet.Example/HAMMER.ICO deleted file mode 100644 index a7d37ad0e5ceef4979f53a1c3182fe8e04b26be7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1078 zcmc&yv2nvN41|;1QB~j(T;)7QMnXq*MkjV$N#mqMXLihklq}ij6uA_E4T4WRAPIb; z1HI7cbR@U07orcu^Yo?sHQlkx}gdE4FZ@d7hD|?N7D( z4vwE6`SM^K?@ZV@Z8iyCsoZ1P5s)u&M{o?k6<}Y}jsR?Xg7X=KwZO5KsdvmJIZj-9 zN4#0X%8ihTycOO~8bO0_$5SI{n5g4Uu#jxQPN;OL3%_-sU~9jWK!_K7#=-|7j)o^~ zcufA4E6!movgNbI%v-)%7|qK&KU0XcW~N_m-K!+t|fUip3d6UL?P4D-G-d$?}b z3l#T1=FfJWyYf%)Rp&GI&rKm}WT5L7uwwfworf-OVHtdakVq4oP-zFkJPk<)VP#1{ ppftS>(OhvXLLRjk>Tr2^@TeCX5j7e*B9b>==YE^F{$a{q`wa%kT6X{d diff --git a/examples/JabberNet.Example/JabberNet.Example.csproj b/examples/JabberNet.Example/JabberNet.Example.csproj deleted file mode 100644 index bfc65dc..0000000 --- a/examples/JabberNet.Example/JabberNet.Example.csproj +++ /dev/null @@ -1,210 +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 - - - - - {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..245c009 --- /dev/null +++ b/examples/JabberNet.Example/project.json @@ -0,0 +1,18 @@ +{ + "version": "2.1.2-*", + "buildOptions": { + "debugType": "portable", + "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.xproj b/examples/JabberNet.VbExample/JabberNet.VbExample.xproj new file mode 100644 index 0000000..93a6932 --- /dev/null +++ b/examples/JabberNet.VbExample/JabberNet.VbExample.xproj @@ -0,0 +1,19 @@ + + + + 14.0.25420 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + b6c7ea07-ab8d-4126-a7e5-d7996d884edf + JabberNet.VbExample + .\obj + .\bin\ + + + + 2.0 + + + \ No newline at end of file diff --git a/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj b/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj deleted file mode 100644 index 85961c3..0000000 --- a/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj +++ /dev/null @@ -1,233 +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 - - - - - 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..a807fec --- /dev/null +++ b/src/JabberNet.Muzzle/project.json @@ -0,0 +1,16 @@ +{ + "version": "2.1.2-*", + "buildOptions": { + "debugType": "portable" + }, + "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 From 412ef4118d68f869df535b96dcbf8a54a916768a Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sat, 24 Sep 2016 16:41:17 +0700 Subject: [PATCH 07/12] #61: fix up the depencencies for VB.NET example --- JabberNet.sln | 14 +++++++++----- .../JabberNet.VbExample.vbproj | 12 ++++++------ .../JabberNet.VbExample.xproj | 19 ------------------- 3 files changed, 15 insertions(+), 30 deletions(-) delete mode 100644 examples/JabberNet.VbExample/JabberNet.VbExample.xproj diff --git a/JabberNet.sln b/JabberNet.sln index 0a3a8d6..2705229 100644 --- a/JabberNet.sln +++ b/JabberNet.sln @@ -69,7 +69,11 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.Example", "exampl EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.Muzzle", "src\JabberNet.Muzzle\JabberNet.Muzzle.xproj", "{32830894-E2CD-4F17-8CD0-3FE1C693A162}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.VbExample", "examples\JabberNet.VbExample\JabberNet.VbExample.xproj", "{B6C7EA07-AB8D-4126-A7E5-D7996D884EDF}" +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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -101,10 +105,10 @@ Global {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 - {B6C7EA07-AB8D-4126-A7E5-D7996D884EDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6C7EA07-AB8D-4126-A7E5-D7996D884EDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6C7EA07-AB8D-4126-A7E5-D7996D884EDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6C7EA07-AB8D-4126-A7E5-D7996D884EDF}.Release|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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj b/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj index e654e81..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,12 +162,6 @@ true - - - {071a79a9-e23f-418f-a6b7-63d3a3e59eeb} - JabberNet.Muzzle - - diff --git a/examples/JabberNet.VbExample/JabberNet.VbExample.xproj b/examples/JabberNet.VbExample/JabberNet.VbExample.xproj deleted file mode 100644 index 93a6932..0000000 --- a/examples/JabberNet.VbExample/JabberNet.VbExample.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b6c7ea07-ab8d-4126-a7e5-d7996d884edf - JabberNet.VbExample - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file From d8a09d9fee2055f07899fb1848228a2da7e83b31 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sat, 1 Oct 2016 15:55:51 +0700 Subject: [PATCH 08/12] #46: port Test.Muzzle to dotnet-cli --- JabberNet.sln | 16 +- Readme.md | 1 + .../JabberNet.Test.Muzzle.fsproj | 103 --- .../JabberNet.Test.Muzzle.xproj | 19 + tests/JabberNet.Test.Muzzle/paket.references | 2 - tests/JabberNet.Test.Muzzle/project.json | 31 + tests/JabberNet.Test.Muzzle/project.lock.json | 220 +++++ tests/JabberNet.Test/project.json | 4 +- tests/JabberNet.Test/project.lock.json | 840 +----------------- 9 files changed, 307 insertions(+), 929 deletions(-) delete mode 100644 tests/JabberNet.Test.Muzzle/JabberNet.Test.Muzzle.fsproj create mode 100644 tests/JabberNet.Test.Muzzle/JabberNet.Test.Muzzle.xproj delete mode 100644 tests/JabberNet.Test.Muzzle/paket.references create mode 100644 tests/JabberNet.Test.Muzzle/project.json create mode 100644 tests/JabberNet.Test.Muzzle/project.lock.json diff --git a/JabberNet.sln b/JabberNet.sln index 2524b81..514120c 100644 --- a/JabberNet.sln +++ b/JabberNet.sln @@ -59,8 +59,6 @@ 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}" -EndProject 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}" @@ -79,6 +77,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "JabberNet.VbExample", "exam {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 Debug|Any CPU = Debug|Any CPU @@ -86,12 +86,6 @@ Global Travis|Any CPU = Travis|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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 = Release|Any CPU - {F53C28B5-F626-4083-9CE6-99C9A9FE860B}.Travis|Any CPU.Build.0 = Release|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 @@ -133,6 +127,12 @@ Global {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 = 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 = Debug|Any CPU + {AA5EF38F-ABCE-4997-B96F-0846E62E46B3}.Travis|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Readme.md b/Readme.md index 809d6e2..9dd403d 100644 --- a/Readme.md +++ b/Readme.md @@ -53,6 +53,7 @@ project. To build the project using `dotnet`, invoke the following command: $ dotnet restore $ dotnet build **/project.json $ dotnet test tests/JabberNet.Test/project.json +$ dotnet test tests/JabberNet.Test.Muzzle/project.json ``` Documentation 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/project.json b/tests/JabberNet.Test/project.json index 8d713b9..3a25ca4 100644 --- a/tests/JabberNet.Test/project.json +++ b/tests/JabberNet.Test/project.json @@ -12,9 +12,11 @@ "dependencies": { "NUnit": "3.4.1", "RhinoMocks": "3.6.1", - "dotnet-test-nunit": "3.4.0-beta-2", "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 index 5c51db6..572d0b2 100644 --- a/tests/JabberNet.Test/project.lock.json +++ b/tests/JabberNet.Test/project.lock.json @@ -3,231 +3,6 @@ "version": 2, "targets": { ".NETFramework,Version=v4.5.1": { - "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.Platforms": "1.0.1", - "NUnit.Portable.Agent": "3.4.0-beta-2" - }, - "compile": { - "lib/net451/dotnet-test-nunit.exe": {} - }, - "runtime": { - "lib/net451/dotnet-test-nunit.exe": {} - } - }, - "Microsoft.DiaSymReader/1.0.8": { - "type": "package", - "dependencies": { - "System.Diagnostics.Debug": "4.0.11", - "System.Runtime": "4.1.0", - "System.Runtime.InteropServices": "4.1.0" - }, - "compile": { - "lib/net20/Microsoft.DiaSymReader.dll": {} - }, - "runtime": { - "lib/net20/Microsoft.DiaSymReader.dll": {} - } - }, - "Microsoft.DiaSymReader.Native/1.4.0-rc2": { - "type": "package", - "runtimeTargets": { - "runtimes/win-x64/native/Microsoft.DiaSymReader.Native.amd64.dll": { - "assetType": "native", - "rid": "win-x64" - }, - "runtimes/win-x86/native/Microsoft.DiaSymReader.Native.x86.dll": { - "assetType": "native", - "rid": "win-x86" - }, - "runtimes/win/native/Microsoft.DiaSymReader.Native.amd64.dll": { - "assetType": "native", - "rid": "win" - }, - "runtimes/win/native/Microsoft.DiaSymReader.Native.arm.dll": { - "assetType": "native", - "rid": "win" - }, - "runtimes/win/native/Microsoft.DiaSymReader.Native.x86.dll": { - "assetType": "native", - "rid": "win" - }, - "runtimes/win8-arm/native/Microsoft.DiaSymReader.Native.arm.dll": { - "assetType": "native", - "rid": "win8-arm" - } - } - }, - "Microsoft.DotNet.InternalAbstractions/1.0.0": { - "type": "package", - "compile": { - "lib/net451/Microsoft.DotNet.InternalAbstractions.dll": {} - }, - "runtime": { - "lib/net451/Microsoft.DotNet.InternalAbstractions.dll": {} - } - }, - "Microsoft.DotNet.ProjectModel/1.0.0-rc3-003121": { - "type": "package", - "dependencies": { - "Microsoft.Extensions.DependencyModel": "1.0.0", - "Newtonsoft.Json": "9.0.1", - "NuGet.Packaging": "3.5.0-beta2-1484", - "NuGet.RuntimeModel": "3.5.0-beta2-1484", - "System.Reflection.Metadata": "1.3.0" - }, - "compile": { - "lib/net451/Microsoft.DotNet.ProjectModel.dll": {} - }, - "runtime": { - "lib/net451/Microsoft.DotNet.ProjectModel.dll": {} - } - }, - "Microsoft.Extensions.DependencyModel/1.0.0": { - "type": "package", - "dependencies": { - "Microsoft.DotNet.InternalAbstractions": "1.0.0", - "Newtonsoft.Json": "9.0.1" - }, - "compile": { - "lib/net451/Microsoft.Extensions.DependencyModel.dll": {} - }, - "runtime": { - "lib/net451/Microsoft.Extensions.DependencyModel.dll": {} - } - }, - "Microsoft.Extensions.Testing.Abstractions/1.0.0-preview2-003121": { - "type": "package", - "dependencies": { - "Microsoft.DiaSymReader": "1.0.8", - "Microsoft.DiaSymReader.Native": "1.4.0-rc2", - "Microsoft.DotNet.ProjectModel": "1.0.0-rc3-003121", - "Newtonsoft.Json": "9.0.1" - }, - "compile": { - "lib/net451/Microsoft.Extensions.Testing.Abstractions.dll": {} - }, - "runtime": { - "lib/net451/Microsoft.Extensions.Testing.Abstractions.dll": {} - } - }, - "Microsoft.NETCore.Platforms/1.0.1": { - "type": "package", - "compile": { - "lib/netstandard1.0/_._": {} - }, - "runtime": { - "lib/netstandard1.0/_._": {} - } - }, - "Newtonsoft.Json/9.0.1": { - "type": "package", - "compile": { - "lib/net45/Newtonsoft.Json.dll": {} - }, - "runtime": { - "lib/net45/Newtonsoft.Json.dll": {} - } - }, - "NuGet.Common/3.5.0-beta2-1484": { - "type": "package", - "frameworkAssemblies": [ - "Microsoft.CSharp", - "System", - "System.Core", - "System.IO.Compression" - ], - "compile": { - "lib/net45/NuGet.Common.dll": {} - }, - "runtime": { - "lib/net45/NuGet.Common.dll": {} - } - }, - "NuGet.Frameworks/3.5.0-beta2-1484": { - "type": "package", - "compile": { - "lib/net45/NuGet.Frameworks.dll": {} - }, - "runtime": { - "lib/net45/NuGet.Frameworks.dll": {} - } - }, - "NuGet.Packaging/3.5.0-beta2-1484": { - "type": "package", - "dependencies": { - "NuGet.Common": "3.5.0-beta2-1484", - "NuGet.Packaging.Core": "3.5.0-beta2-1484" - }, - "frameworkAssemblies": [ - "System.IO.Compression", - "System.Xml", - "System.Xml.Linq" - ], - "compile": { - "lib/net45/NuGet.Packaging.dll": {} - }, - "runtime": { - "lib/net45/NuGet.Packaging.dll": {} - } - }, - "NuGet.Packaging.Core/3.5.0-beta2-1484": { - "type": "package", - "dependencies": { - "NuGet.Common": "3.5.0-beta2-1484", - "NuGet.Packaging.Core.Types": "3.5.0-beta2-1484" - }, - "frameworkAssemblies": [ - "System.IO.Compression", - "System.Xml", - "System.Xml.Linq" - ], - "compile": { - "lib/net45/NuGet.Packaging.Core.dll": {} - }, - "runtime": { - "lib/net45/NuGet.Packaging.Core.dll": {} - } - }, - "NuGet.Packaging.Core.Types/3.5.0-beta2-1484": { - "type": "package", - "dependencies": { - "NuGet.Frameworks": "3.5.0-beta2-1484", - "NuGet.Versioning": "3.5.0-beta2-1484" - }, - "compile": { - "lib/net45/NuGet.Packaging.Core.Types.dll": {} - }, - "runtime": { - "lib/net45/NuGet.Packaging.Core.Types.dll": {} - } - }, - "NuGet.RuntimeModel/3.5.0-beta2-1484": { - "type": "package", - "dependencies": { - "Newtonsoft.Json": "6.0.4", - "NuGet.Frameworks": "3.5.0-beta2-1484", - "NuGet.Versioning": "3.5.0-beta2-1484" - }, - "compile": { - "lib/net45/NuGet.RuntimeModel.dll": {} - }, - "runtime": { - "lib/net45/NuGet.RuntimeModel.dll": {} - } - }, - "NuGet.Versioning/3.5.0-beta2-1484": { - "type": "package", - "compile": { - "lib/net45/NuGet.Versioning.dll": {} - }, - "runtime": { - "lib/net45/NuGet.Versioning.dll": {} - } - }, "NUnit/3.4.1": { "type": "package", "compile": { @@ -237,30 +12,6 @@ "lib/net45/nunit.framework.dll": {} } }, - "NUnit.Portable.Agent/3.4.0-beta-2": { - "type": "package", - "frameworkAssemblies": [ - "System.Globalization", - "System.Linq", - "System.ObjectModel", - "System.Reflection", - "System.Reflection.Extensions", - "System.Runtime", - "System.Runtime.Extensions", - "System.Runtime.Serialization.Primitives", - "System.Text.RegularExpressions", - "System.Threading", - "System.Xml", - "System.Xml.Linq", - "System.Xml.XDocument" - ], - "compile": { - "lib/net45/NUnit.Portable.Agent.dll": {} - }, - "runtime": { - "lib/net45/NUnit.Portable.Agent.dll": {} - } - }, "RhinoMocks/3.6.1": { "type": "package", "compile": { @@ -270,66 +21,6 @@ "lib/net/Rhino.Mocks.dll": {} } }, - "System.Collections.Immutable/1.2.0": { - "type": "package", - "compile": { - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} - } - }, - "System.Diagnostics.Debug/4.0.11": { - "type": "package", - "frameworkAssemblies": [ - "System" - ], - "compile": { - "ref/net45/_._": {} - }, - "runtime": { - "lib/net45/_._": {} - } - }, - "System.Reflection.Metadata/1.3.0": { - "type": "package", - "dependencies": { - "System.Collections.Immutable": "1.2.0" - }, - "compile": { - "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} - }, - "runtime": { - "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} - } - }, - "System.Runtime/4.1.0": { - "type": "package", - "frameworkAssemblies": [ - "System", - "System.ComponentModel.Composition", - "System.Core" - ], - "compile": { - "ref/net45/_._": {} - }, - "runtime": { - "lib/net45/_._": {} - } - }, - "System.Runtime.InteropServices/4.1.0": { - "type": "package", - "frameworkAssemblies": [ - "System", - "System.Core" - ], - "compile": { - "ref/net45/_._": {} - }, - "runtime": { - "lib/net45/_._": {} - } - }, "zlib.net/1.0.4": { "type": "package", "compile": { @@ -371,223 +62,6 @@ } }, "libraries": { - "dotnet-test-nunit/3.4.0-beta-2": { - "sha512": "za5Bip/Ollig+8pwQi/Lrvi0oVaoBYf2oMrha8+vjfyBWGAa0kSFMCVgrGTt2JyzrYtk9SKzwG3OLHQKuXcwlg==", - "type": "package", - "path": "dotnet-test-nunit/3.4.0-beta-2", - "files": [ - "dotnet-test-nunit.3.4.0-beta-2.nupkg.sha512", - "dotnet-test-nunit.nuspec", - "lib/net451/dotnet-test-nunit.exe", - "lib/netcoreapp1.0/dotnet-test-nunit.dll", - "lib/netcoreapp1.0/dotnet-test-nunit.runtimeconfig.json" - ] - }, - "Microsoft.DiaSymReader/1.0.8": { - "sha512": "ABLULVhCAiyBFLBT5xX6vB4NhZDgwUylGRQK+zW5nZn2rbh1f8LOnFZ9gVSxzL6qOzPNb32Nu3QZ43iZerHOxA==", - "type": "package", - "path": "Microsoft.DiaSymReader/1.0.8", - "files": [ - "Microsoft.DiaSymReader.1.0.8.nupkg.sha512", - "Microsoft.DiaSymReader.nuspec", - "lib/net20/Microsoft.DiaSymReader.dll", - "lib/net20/Microsoft.DiaSymReader.xml", - "lib/netstandard1.1/Microsoft.DiaSymReader.dll", - "lib/netstandard1.1/Microsoft.DiaSymReader.xml", - "lib/portable-net45+win8/Microsoft.DiaSymReader.dll", - "lib/portable-net45+win8/Microsoft.DiaSymReader.xml" - ] - }, - "Microsoft.DiaSymReader.Native/1.4.0-rc2": { - "sha512": "KIQOG+U6btTHL5KkXYofMpyCzVx+6EcDPS9GBRGGhlrTjJqcqAM6a6a0D0Dur/HPnAdmGLtSHVjCDZijGJFCAA==", - "type": "package", - "path": "Microsoft.DiaSymReader.Native/1.4.0-rc2", - "files": [ - "Microsoft.DiaSymReader.Native.1.4.0-rc2.nupkg.sha512", - "Microsoft.DiaSymReader.Native.nuspec", - "build/Microsoft.DiaSymReader.Native.props", - "runtimes/win-x64/native/Microsoft.DiaSymReader.Native.amd64.dll", - "runtimes/win-x86/native/Microsoft.DiaSymReader.Native.x86.dll", - "runtimes/win/native/Microsoft.DiaSymReader.Native.amd64.dll", - "runtimes/win/native/Microsoft.DiaSymReader.Native.arm.dll", - "runtimes/win/native/Microsoft.DiaSymReader.Native.x86.dll", - "runtimes/win8-arm/native/Microsoft.DiaSymReader.Native.arm.dll" - ] - }, - "Microsoft.DotNet.InternalAbstractions/1.0.0": { - "sha512": "AAguUq7YyKk3yDWPoWA8DrLZvURxB/LrDdTn1h5lmPeznkFUpfC3p459w5mQYQE0qpquf/CkSQZ0etiV5vRHFA==", - "type": "package", - "path": "Microsoft.DotNet.InternalAbstractions/1.0.0", - "files": [ - "Microsoft.DotNet.InternalAbstractions.1.0.0.nupkg.sha512", - "Microsoft.DotNet.InternalAbstractions.nuspec", - "lib/net451/Microsoft.DotNet.InternalAbstractions.dll", - "lib/netstandard1.3/Microsoft.DotNet.InternalAbstractions.dll" - ] - }, - "Microsoft.DotNet.ProjectModel/1.0.0-rc3-003121": { - "sha512": "wnWw5KsKinG2wWxdoQIJXZlMFvPNhL7WmIyW9q6xrZFUi/uld5PC3ksq2QDZepF148FUjCIyTP+TnRwU3RJqUg==", - "type": "package", - "path": "Microsoft.DotNet.ProjectModel/1.0.0-rc3-003121", - "files": [ - "Microsoft.DotNet.ProjectModel.1.0.0-rc3-003121.nupkg.sha512", - "Microsoft.DotNet.ProjectModel.nuspec", - "lib/net451/Microsoft.DotNet.ProjectModel.dll", - "lib/netstandard1.6/Microsoft.DotNet.ProjectModel.dll" - ] - }, - "Microsoft.Extensions.DependencyModel/1.0.0": { - "sha512": "n55Y2T4qMgCNMrJaqAN+nlG2EH4XL+e9uxIg4vdFsQeF+L8UKxRdD3C35Bt+xk3vO3Zwp3g+6KFq2VPH2COSmg==", - "type": "package", - "path": "Microsoft.Extensions.DependencyModel/1.0.0", - "files": [ - "Microsoft.Extensions.DependencyModel.1.0.0.nupkg.sha512", - "Microsoft.Extensions.DependencyModel.nuspec", - "lib/net451/Microsoft.Extensions.DependencyModel.dll", - "lib/netstandard1.6/Microsoft.Extensions.DependencyModel.dll" - ] - }, - "Microsoft.Extensions.Testing.Abstractions/1.0.0-preview2-003121": { - "sha512": "q3Uq07d6LbYr0NiX5Dz9GCbXJv4vkmSbUvFEmov3Vo4prZWjhFzF+byk2tWAEEqtZ6ereMYXBUt99wCTtANk6Q==", - "type": "package", - "path": "Microsoft.Extensions.Testing.Abstractions/1.0.0-preview2-003121", - "files": [ - "Microsoft.Extensions.Testing.Abstractions.1.0.0-preview2-003121.nupkg.sha512", - "Microsoft.Extensions.Testing.Abstractions.nuspec", - "lib/net451/Microsoft.Extensions.Testing.Abstractions.dll", - "lib/netstandard1.6/Microsoft.Extensions.Testing.Abstractions.dll" - ] - }, - "Microsoft.NETCore.Platforms/1.0.1": { - "sha512": "2G6OjjJzwBfNOO8myRV/nFrbTw5iA+DEm0N+qUqhrOmaVtn4pC77h38I1jsXGw5VH55+dPfQsqHD0We9sCl9FQ==", - "type": "package", - "path": "Microsoft.NETCore.Platforms/1.0.1", - "files": [ - "Microsoft.NETCore.Platforms.1.0.1.nupkg.sha512", - "Microsoft.NETCore.Platforms.nuspec", - "ThirdPartyNotices.txt", - "dotnet_library_license.txt", - "lib/netstandard1.0/_._", - "runtime.json" - ] - }, - "Newtonsoft.Json/9.0.1": { - "sha512": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", - "type": "package", - "path": "Newtonsoft.Json/9.0.1", - "files": [ - "Newtonsoft.Json.9.0.1.nupkg.sha512", - "Newtonsoft.Json.nuspec", - "lib/net20/Newtonsoft.Json.dll", - "lib/net20/Newtonsoft.Json.xml", - "lib/net35/Newtonsoft.Json.dll", - "lib/net35/Newtonsoft.Json.xml", - "lib/net40/Newtonsoft.Json.dll", - "lib/net40/Newtonsoft.Json.xml", - "lib/net45/Newtonsoft.Json.dll", - "lib/net45/Newtonsoft.Json.xml", - "lib/netstandard1.0/Newtonsoft.Json.dll", - "lib/netstandard1.0/Newtonsoft.Json.xml", - "lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll", - "lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml", - "lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll", - "lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.xml", - "tools/install.ps1" - ] - }, - "NuGet.Common/3.5.0-beta2-1484": { - "sha512": "rLBmcZOPVF7Mne/LumDNACZZyI5B67hjylt+Z/WSEUQ/IXE9nLv8IVL0+T9xljIaSSQCjO8cOtmJ6ztqrsQKcQ==", - "type": "package", - "path": "NuGet.Common/3.5.0-beta2-1484", - "files": [ - "NuGet.Common.3.5.0-beta2-1484.nupkg.sha512", - "NuGet.Common.nuspec", - "lib/net45/NuGet.Common.dll", - "lib/net45/NuGet.Common.xml", - "lib/netstandard1.3/NuGet.Common.dll", - "lib/netstandard1.3/NuGet.Common.xml" - ] - }, - "NuGet.Frameworks/3.5.0-beta2-1484": { - "sha512": "AZoX0c05qgSfx0IOGTbLXa2fD7eM2WUqKP3osMMvSxK+tOGmctHuFlvjXxMHBv9yg0/13KdH0osV/zI7+SjzOA==", - "type": "package", - "path": "NuGet.Frameworks/3.5.0-beta2-1484", - "files": [ - "NuGet.Frameworks.3.5.0-beta2-1484.nupkg.sha512", - "NuGet.Frameworks.nuspec", - "lib/net40-client/NuGet.Frameworks.dll", - "lib/net40-client/NuGet.Frameworks.xml", - "lib/net45/NuGet.Frameworks.dll", - "lib/net45/NuGet.Frameworks.xml", - "lib/netstandard1.3/NuGet.Frameworks.dll", - "lib/netstandard1.3/NuGet.Frameworks.xml" - ] - }, - "NuGet.Packaging/3.5.0-beta2-1484": { - "sha512": "/+7d3vvCel4KhJo6AyOneg07fbAkUsy/ORgIaxW3nNdJubCXSrAdg1wfQpwzBygmErjrPcdYzzk2y2Sc6m7hwQ==", - "type": "package", - "path": "NuGet.Packaging/3.5.0-beta2-1484", - "files": [ - "NuGet.Packaging.3.5.0-beta2-1484.nupkg.sha512", - "NuGet.Packaging.nuspec", - "lib/net45/NuGet.Packaging.dll", - "lib/net45/NuGet.Packaging.xml", - "lib/netstandard1.3/NuGet.Packaging.dll", - "lib/netstandard1.3/NuGet.Packaging.xml" - ] - }, - "NuGet.Packaging.Core/3.5.0-beta2-1484": { - "sha512": "Lsz2lgYH0mdOvuL8C3G4XLm9EaAheBOqrgLgnBNxCeLGLU+n+Zu8Lt6K1bpzgkeKyTyAhJdWbv/3lS4w7s04gw==", - "type": "package", - "path": "NuGet.Packaging.Core/3.5.0-beta2-1484", - "files": [ - "NuGet.Packaging.Core.3.5.0-beta2-1484.nupkg.sha512", - "NuGet.Packaging.Core.nuspec", - "lib/net45/NuGet.Packaging.Core.dll", - "lib/net45/NuGet.Packaging.Core.xml", - "lib/netstandard1.3/NuGet.Packaging.Core.dll", - "lib/netstandard1.3/NuGet.Packaging.Core.xml" - ] - }, - "NuGet.Packaging.Core.Types/3.5.0-beta2-1484": { - "sha512": "4mEXZBoe/RKTDVQGwdrl/f5gqolU2d1JWjpbGdQv5EG/xQCC8IQ8FTNYzk0+ydV/vuRM1yaNe+6UQ90nGE+1kQ==", - "type": "package", - "path": "NuGet.Packaging.Core.Types/3.5.0-beta2-1484", - "files": [ - "NuGet.Packaging.Core.Types.3.5.0-beta2-1484.nupkg.sha512", - "NuGet.Packaging.Core.Types.nuspec", - "lib/net45/NuGet.Packaging.Core.Types.dll", - "lib/net45/NuGet.Packaging.Core.Types.xml", - "lib/netstandard1.3/NuGet.Packaging.Core.Types.dll", - "lib/netstandard1.3/NuGet.Packaging.Core.Types.xml" - ] - }, - "NuGet.RuntimeModel/3.5.0-beta2-1484": { - "sha512": "vg29WbKcExD9AJrKMr7NB9pnp+0MTAcDHB6gFHCqRynSo6jgjC8q+ZPAlxC115rQiO8fqzOEP59Q8hx20anUtA==", - "type": "package", - "path": "NuGet.RuntimeModel/3.5.0-beta2-1484", - "files": [ - "NuGet.RuntimeModel.3.5.0-beta2-1484.nupkg.sha512", - "NuGet.RuntimeModel.nuspec", - "lib/net45/NuGet.RuntimeModel.dll", - "lib/net45/NuGet.RuntimeModel.xml", - "lib/netstandard1.3/NuGet.RuntimeModel.dll", - "lib/netstandard1.3/NuGet.RuntimeModel.xml" - ] - }, - "NuGet.Versioning/3.5.0-beta2-1484": { - "sha512": "Stok+SI5lWxOkTgZZM7jT4xuAZogm5+j85mKJeHSXb8o0OAbB+qDX9jkdM2wIEnjoR8R29J0nQYwk2Kl2lWFpA==", - "type": "package", - "path": "NuGet.Versioning/3.5.0-beta2-1484", - "files": [ - "NuGet.Versioning.3.5.0-beta2-1484.nupkg.sha512", - "NuGet.Versioning.nuspec", - "lib/net45/NuGet.Versioning.dll", - "lib/net45/NuGet.Versioning.xml", - "lib/netstandard1.0/NuGet.Versioning.dll", - "lib/netstandard1.0/NuGet.Versioning.xml" - ] - }, "NUnit/3.4.1": { "sha512": "G/9h/ENn8+GvT5DvBqVNrUhIWuxtAr0/oVGN2ljKVUw50EAZYBzeWSy9s6nqMswaQACpQzljql1sWQ/peE2eJg==", "type": "package", @@ -613,17 +87,6 @@ "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/nunit.framework.xml" ] }, - "NUnit.Portable.Agent/3.4.0-beta-2": { - "sha512": "ybpAVygz7TMj5FKvR/xnYncDOwwZ7omHFbwVRBVMHee5N8AIP2gebNVWPY4DoHFoJwtE2eZ/oBQBtf3/hiLx5w==", - "type": "package", - "path": "NUnit.Portable.Agent/3.4.0-beta-2", - "files": [ - "NUnit.Portable.Agent.3.4.0-beta-2.nupkg.sha512", - "NUnit.Portable.Agent.nuspec", - "lib/net45/NUnit.Portable.Agent.dll", - "lib/netstandard1.3/NUnit.Portable.Agent.dll" - ] - }, "RhinoMocks/3.6.1": { "sha512": "0HjdR7PVVUDz9Db5cLzU0Dquay8MhoCoZ8PJRZOo10Iysq4m+mjl2aaxc4eWztvZ6S1v/NYW5xv1qul0ToN21w==", "type": "package", @@ -635,280 +98,6 @@ "lib/net/Rhino.Mocks.xml" ] }, - "System.Collections.Immutable/1.2.0": { - "sha512": "Cma8cBW6di16ZLibL8LYQ+cLjGzoKxpOTu/faZfDcx94ZjAGq6Nv5RO7+T1YZXqEXTZP9rt1wLVEONVpURtUqw==", - "type": "package", - "path": "System.Collections.Immutable/1.2.0", - "files": [ - "System.Collections.Immutable.1.2.0.nupkg.sha512", - "System.Collections.Immutable.nuspec", - "ThirdPartyNotices.txt", - "dotnet_library_license.txt", - "lib/netstandard1.0/System.Collections.Immutable.dll", - "lib/netstandard1.0/System.Collections.Immutable.xml", - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll", - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml" - ] - }, - "System.Diagnostics.Debug/4.0.11": { - "sha512": "w5U95fVKHY4G8ASs/K5iK3J5LY+/dLFd4vKejsnI/ZhBsWS9hQakfx3Zr7lRWKg4tAw9r4iktyvsTagWkqYCiw==", - "type": "package", - "path": "System.Diagnostics.Debug/4.0.11", - "files": [ - "System.Diagnostics.Debug.4.0.11.nupkg.sha512", - "System.Diagnostics.Debug.nuspec", - "ThirdPartyNotices.txt", - "dotnet_library_license.txt", - "lib/MonoAndroid10/_._", - "lib/MonoTouch10/_._", - "lib/net45/_._", - "lib/portable-net45+win8+wp8+wpa81/_._", - "lib/win8/_._", - "lib/wp80/_._", - "lib/wpa81/_._", - "lib/xamarinios10/_._", - "lib/xamarinmac20/_._", - "lib/xamarintvos10/_._", - "lib/xamarinwatchos10/_._", - "ref/MonoAndroid10/_._", - "ref/MonoTouch10/_._", - "ref/net45/_._", - "ref/netcore50/System.Diagnostics.Debug.dll", - "ref/netcore50/System.Diagnostics.Debug.xml", - "ref/netcore50/de/System.Diagnostics.Debug.xml", - "ref/netcore50/es/System.Diagnostics.Debug.xml", - "ref/netcore50/fr/System.Diagnostics.Debug.xml", - "ref/netcore50/it/System.Diagnostics.Debug.xml", - "ref/netcore50/ja/System.Diagnostics.Debug.xml", - "ref/netcore50/ko/System.Diagnostics.Debug.xml", - "ref/netcore50/ru/System.Diagnostics.Debug.xml", - "ref/netcore50/zh-hans/System.Diagnostics.Debug.xml", - "ref/netcore50/zh-hant/System.Diagnostics.Debug.xml", - "ref/netstandard1.0/System.Diagnostics.Debug.dll", - "ref/netstandard1.0/System.Diagnostics.Debug.xml", - "ref/netstandard1.0/de/System.Diagnostics.Debug.xml", - "ref/netstandard1.0/es/System.Diagnostics.Debug.xml", - "ref/netstandard1.0/fr/System.Diagnostics.Debug.xml", - "ref/netstandard1.0/it/System.Diagnostics.Debug.xml", - "ref/netstandard1.0/ja/System.Diagnostics.Debug.xml", - "ref/netstandard1.0/ko/System.Diagnostics.Debug.xml", - "ref/netstandard1.0/ru/System.Diagnostics.Debug.xml", - "ref/netstandard1.0/zh-hans/System.Diagnostics.Debug.xml", - "ref/netstandard1.0/zh-hant/System.Diagnostics.Debug.xml", - "ref/netstandard1.3/System.Diagnostics.Debug.dll", - "ref/netstandard1.3/System.Diagnostics.Debug.xml", - "ref/netstandard1.3/de/System.Diagnostics.Debug.xml", - "ref/netstandard1.3/es/System.Diagnostics.Debug.xml", - "ref/netstandard1.3/fr/System.Diagnostics.Debug.xml", - "ref/netstandard1.3/it/System.Diagnostics.Debug.xml", - "ref/netstandard1.3/ja/System.Diagnostics.Debug.xml", - "ref/netstandard1.3/ko/System.Diagnostics.Debug.xml", - "ref/netstandard1.3/ru/System.Diagnostics.Debug.xml", - "ref/netstandard1.3/zh-hans/System.Diagnostics.Debug.xml", - "ref/netstandard1.3/zh-hant/System.Diagnostics.Debug.xml", - "ref/portable-net45+win8+wp8+wpa81/_._", - "ref/win8/_._", - "ref/wp80/_._", - "ref/wpa81/_._", - "ref/xamarinios10/_._", - "ref/xamarinmac20/_._", - "ref/xamarintvos10/_._", - "ref/xamarinwatchos10/_._" - ] - }, - "System.Reflection.Metadata/1.3.0": { - "sha512": "jMSCxA4LSyKBGRDm/WtfkO03FkcgRzHxwvQRib1bm2GZ8ifKM1MX1al6breGCEQK280mdl9uQS7JNPXRYk90jw==", - "type": "package", - "path": "System.Reflection.Metadata/1.3.0", - "files": [ - "System.Reflection.Metadata.1.3.0.nupkg.sha512", - "System.Reflection.Metadata.nuspec", - "ThirdPartyNotices.txt", - "dotnet_library_license.txt", - "lib/netstandard1.1/System.Reflection.Metadata.dll", - "lib/netstandard1.1/System.Reflection.Metadata.xml", - "lib/portable-net45+win8/System.Reflection.Metadata.dll", - "lib/portable-net45+win8/System.Reflection.Metadata.xml" - ] - }, - "System.Runtime/4.1.0": { - "sha512": "v6c/4Yaa9uWsq+JMhnOFewrYkgdNHNG2eMKuNqRn8P733rNXeRCGvV5FkkjBXn2dbVkPXOsO0xjsEeM1q2zC0g==", - "type": "package", - "path": "System.Runtime/4.1.0", - "files": [ - "System.Runtime.4.1.0.nupkg.sha512", - "System.Runtime.nuspec", - "ThirdPartyNotices.txt", - "dotnet_library_license.txt", - "lib/MonoAndroid10/_._", - "lib/MonoTouch10/_._", - "lib/net45/_._", - "lib/net462/System.Runtime.dll", - "lib/portable-net45+win8+wp80+wpa81/_._", - "lib/win8/_._", - "lib/wp80/_._", - "lib/wpa81/_._", - "lib/xamarinios10/_._", - "lib/xamarinmac20/_._", - "lib/xamarintvos10/_._", - "lib/xamarinwatchos10/_._", - "ref/MonoAndroid10/_._", - "ref/MonoTouch10/_._", - "ref/net45/_._", - "ref/net462/System.Runtime.dll", - "ref/netcore50/System.Runtime.dll", - "ref/netcore50/System.Runtime.xml", - "ref/netcore50/de/System.Runtime.xml", - "ref/netcore50/es/System.Runtime.xml", - "ref/netcore50/fr/System.Runtime.xml", - "ref/netcore50/it/System.Runtime.xml", - "ref/netcore50/ja/System.Runtime.xml", - "ref/netcore50/ko/System.Runtime.xml", - "ref/netcore50/ru/System.Runtime.xml", - "ref/netcore50/zh-hans/System.Runtime.xml", - "ref/netcore50/zh-hant/System.Runtime.xml", - "ref/netstandard1.0/System.Runtime.dll", - "ref/netstandard1.0/System.Runtime.xml", - "ref/netstandard1.0/de/System.Runtime.xml", - "ref/netstandard1.0/es/System.Runtime.xml", - "ref/netstandard1.0/fr/System.Runtime.xml", - "ref/netstandard1.0/it/System.Runtime.xml", - "ref/netstandard1.0/ja/System.Runtime.xml", - "ref/netstandard1.0/ko/System.Runtime.xml", - "ref/netstandard1.0/ru/System.Runtime.xml", - "ref/netstandard1.0/zh-hans/System.Runtime.xml", - "ref/netstandard1.0/zh-hant/System.Runtime.xml", - "ref/netstandard1.2/System.Runtime.dll", - "ref/netstandard1.2/System.Runtime.xml", - "ref/netstandard1.2/de/System.Runtime.xml", - "ref/netstandard1.2/es/System.Runtime.xml", - "ref/netstandard1.2/fr/System.Runtime.xml", - "ref/netstandard1.2/it/System.Runtime.xml", - "ref/netstandard1.2/ja/System.Runtime.xml", - "ref/netstandard1.2/ko/System.Runtime.xml", - "ref/netstandard1.2/ru/System.Runtime.xml", - "ref/netstandard1.2/zh-hans/System.Runtime.xml", - "ref/netstandard1.2/zh-hant/System.Runtime.xml", - "ref/netstandard1.3/System.Runtime.dll", - "ref/netstandard1.3/System.Runtime.xml", - "ref/netstandard1.3/de/System.Runtime.xml", - "ref/netstandard1.3/es/System.Runtime.xml", - "ref/netstandard1.3/fr/System.Runtime.xml", - "ref/netstandard1.3/it/System.Runtime.xml", - "ref/netstandard1.3/ja/System.Runtime.xml", - "ref/netstandard1.3/ko/System.Runtime.xml", - "ref/netstandard1.3/ru/System.Runtime.xml", - "ref/netstandard1.3/zh-hans/System.Runtime.xml", - "ref/netstandard1.3/zh-hant/System.Runtime.xml", - "ref/netstandard1.5/System.Runtime.dll", - "ref/netstandard1.5/System.Runtime.xml", - "ref/netstandard1.5/de/System.Runtime.xml", - "ref/netstandard1.5/es/System.Runtime.xml", - "ref/netstandard1.5/fr/System.Runtime.xml", - "ref/netstandard1.5/it/System.Runtime.xml", - "ref/netstandard1.5/ja/System.Runtime.xml", - "ref/netstandard1.5/ko/System.Runtime.xml", - "ref/netstandard1.5/ru/System.Runtime.xml", - "ref/netstandard1.5/zh-hans/System.Runtime.xml", - "ref/netstandard1.5/zh-hant/System.Runtime.xml", - "ref/portable-net45+win8+wp80+wpa81/_._", - "ref/win8/_._", - "ref/wp80/_._", - "ref/wpa81/_._", - "ref/xamarinios10/_._", - "ref/xamarinmac20/_._", - "ref/xamarintvos10/_._", - "ref/xamarinwatchos10/_._" - ] - }, - "System.Runtime.InteropServices/4.1.0": { - "sha512": "16eu3kjHS633yYdkjwShDHZLRNMKVi/s0bY8ODiqJ2RfMhDMAwxZaUaWVnZ2P71kr/or+X9o/xFWtNqz8ivieQ==", - "type": "package", - "path": "System.Runtime.InteropServices/4.1.0", - "files": [ - "System.Runtime.InteropServices.4.1.0.nupkg.sha512", - "System.Runtime.InteropServices.nuspec", - "ThirdPartyNotices.txt", - "dotnet_library_license.txt", - "lib/MonoAndroid10/_._", - "lib/MonoTouch10/_._", - "lib/net45/_._", - "lib/net462/System.Runtime.InteropServices.dll", - "lib/portable-net45+win8+wpa81/_._", - "lib/win8/_._", - "lib/wpa81/_._", - "lib/xamarinios10/_._", - "lib/xamarinmac20/_._", - "lib/xamarintvos10/_._", - "lib/xamarinwatchos10/_._", - "ref/MonoAndroid10/_._", - "ref/MonoTouch10/_._", - "ref/net45/_._", - "ref/net462/System.Runtime.InteropServices.dll", - "ref/netcore50/System.Runtime.InteropServices.dll", - "ref/netcore50/System.Runtime.InteropServices.xml", - "ref/netcore50/de/System.Runtime.InteropServices.xml", - "ref/netcore50/es/System.Runtime.InteropServices.xml", - "ref/netcore50/fr/System.Runtime.InteropServices.xml", - "ref/netcore50/it/System.Runtime.InteropServices.xml", - "ref/netcore50/ja/System.Runtime.InteropServices.xml", - "ref/netcore50/ko/System.Runtime.InteropServices.xml", - "ref/netcore50/ru/System.Runtime.InteropServices.xml", - "ref/netcore50/zh-hans/System.Runtime.InteropServices.xml", - "ref/netcore50/zh-hant/System.Runtime.InteropServices.xml", - "ref/netstandard1.1/System.Runtime.InteropServices.dll", - "ref/netstandard1.1/System.Runtime.InteropServices.xml", - "ref/netstandard1.1/de/System.Runtime.InteropServices.xml", - "ref/netstandard1.1/es/System.Runtime.InteropServices.xml", - "ref/netstandard1.1/fr/System.Runtime.InteropServices.xml", - "ref/netstandard1.1/it/System.Runtime.InteropServices.xml", - "ref/netstandard1.1/ja/System.Runtime.InteropServices.xml", - "ref/netstandard1.1/ko/System.Runtime.InteropServices.xml", - "ref/netstandard1.1/ru/System.Runtime.InteropServices.xml", - "ref/netstandard1.1/zh-hans/System.Runtime.InteropServices.xml", - "ref/netstandard1.1/zh-hant/System.Runtime.InteropServices.xml", - "ref/netstandard1.2/System.Runtime.InteropServices.dll", - "ref/netstandard1.2/System.Runtime.InteropServices.xml", - "ref/netstandard1.2/de/System.Runtime.InteropServices.xml", - "ref/netstandard1.2/es/System.Runtime.InteropServices.xml", - "ref/netstandard1.2/fr/System.Runtime.InteropServices.xml", - "ref/netstandard1.2/it/System.Runtime.InteropServices.xml", - "ref/netstandard1.2/ja/System.Runtime.InteropServices.xml", - "ref/netstandard1.2/ko/System.Runtime.InteropServices.xml", - "ref/netstandard1.2/ru/System.Runtime.InteropServices.xml", - "ref/netstandard1.2/zh-hans/System.Runtime.InteropServices.xml", - "ref/netstandard1.2/zh-hant/System.Runtime.InteropServices.xml", - "ref/netstandard1.3/System.Runtime.InteropServices.dll", - "ref/netstandard1.3/System.Runtime.InteropServices.xml", - "ref/netstandard1.3/de/System.Runtime.InteropServices.xml", - "ref/netstandard1.3/es/System.Runtime.InteropServices.xml", - "ref/netstandard1.3/fr/System.Runtime.InteropServices.xml", - "ref/netstandard1.3/it/System.Runtime.InteropServices.xml", - "ref/netstandard1.3/ja/System.Runtime.InteropServices.xml", - "ref/netstandard1.3/ko/System.Runtime.InteropServices.xml", - "ref/netstandard1.3/ru/System.Runtime.InteropServices.xml", - "ref/netstandard1.3/zh-hans/System.Runtime.InteropServices.xml", - "ref/netstandard1.3/zh-hant/System.Runtime.InteropServices.xml", - "ref/netstandard1.5/System.Runtime.InteropServices.dll", - "ref/netstandard1.5/System.Runtime.InteropServices.xml", - "ref/netstandard1.5/de/System.Runtime.InteropServices.xml", - "ref/netstandard1.5/es/System.Runtime.InteropServices.xml", - "ref/netstandard1.5/fr/System.Runtime.InteropServices.xml", - "ref/netstandard1.5/it/System.Runtime.InteropServices.xml", - "ref/netstandard1.5/ja/System.Runtime.InteropServices.xml", - "ref/netstandard1.5/ko/System.Runtime.InteropServices.xml", - "ref/netstandard1.5/ru/System.Runtime.InteropServices.xml", - "ref/netstandard1.5/zh-hans/System.Runtime.InteropServices.xml", - "ref/netstandard1.5/zh-hant/System.Runtime.InteropServices.xml", - "ref/portable-net45+win8+wpa81/_._", - "ref/win8/_._", - "ref/wpa81/_._", - "ref/xamarinios10/_._", - "ref/xamarinmac20/_._", - "ref/xamarintvos10/_._", - "ref/xamarinwatchos10/_._" - ] - }, "zlib.net/1.0.4": { "sha512": "ywKkVY1y20tGQsUnYgKupYm91L8GVrVgoEOFTjfR1Bb5Xiy5tBJu5SV9liIiW2h8/KQUBefE45vSythtNMmahQ==", "type": "package", @@ -934,11 +123,32 @@ "": [ "JabberNet", "NUnit >= 3.4.1", - "RhinoMocks >= 3.6.1", - "dotnet-test-nunit >= 3.4.0-beta-2" + "RhinoMocks >= 3.6.1" ], ".NETFramework,Version=v4.5.1": [] }, - "tools": {}, - "projectFileToolGroups": {} + "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 From 8e10b607ebbe4b978674b66b1432a716260215f6 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sat, 1 Oct 2016 15:59:46 +0700 Subject: [PATCH 09/12] #46: fix Travis build configuration --- JabberNet.sln | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/JabberNet.sln b/JabberNet.sln index 514120c..0414d0c 100644 --- a/JabberNet.sln +++ b/JabberNet.sln @@ -131,8 +131,7 @@ Global {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 = Debug|Any CPU - {AA5EF38F-ABCE-4997-B96F-0846E62E46B3}.Travis|Any CPU.Build.0 = Debug|Any CPU + {AA5EF38F-ABCE-4997-B96F-0846E62E46B3}.Travis|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 6bcf6dd8d237fd6a5da063e7f296c3136030dd5e Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sat, 8 Oct 2016 15:14:34 +0700 Subject: [PATCH 10/12] #46: update prerequisite documentation --- Readme.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index 9dd403d..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 -------------- @@ -93,7 +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://docs.microsoft.com/dotnet/ +[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 From 6faff964b8670e4c51772f985c299d65991737c4 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sat, 8 Oct 2016 18:45:55 +0700 Subject: [PATCH 11/12] #46: compile GUI example as winexe So it won't use Windows console subsystem. --- examples/JabberNet.Example/project.json | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/JabberNet.Example/project.json b/examples/JabberNet.Example/project.json index 245c009..fa3be2e 100644 --- a/examples/JabberNet.Example/project.json +++ b/examples/JabberNet.Example/project.json @@ -1,6 +1,7 @@ { "version": "2.1.2-*", "buildOptions": { + "additionalArguments": [ "/target:winexe" ], "debugType": "portable", "emitEntryPoint": true }, From 30dc23f099bcf9d24a38042b132a35008e15a95f Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Sat, 8 Oct 2016 18:53:04 +0700 Subject: [PATCH 12/12] #46: use "debugType": "full" for now It helps to debug in Visual Studio. --- examples/JabberNet.ConsoleClient/project.json | 1 - examples/JabberNet.Example/project.json | 1 - src/JabberNet.Muzzle/project.json | 3 --- src/JabberNet.Netlib.Dns/project.json | 3 --- src/JabberNet/project.json | 3 +-- tests/JabberNet.Test/project.json | 3 --- 6 files changed, 1 insertion(+), 13 deletions(-) diff --git a/examples/JabberNet.ConsoleClient/project.json b/examples/JabberNet.ConsoleClient/project.json index 4745b89..231ff82 100644 --- a/examples/JabberNet.ConsoleClient/project.json +++ b/examples/JabberNet.ConsoleClient/project.json @@ -1,7 +1,6 @@ { "version": "2.1.2-*", "buildOptions": { - "debugType": "portable", "emitEntryPoint": true }, "frameworks": { diff --git a/examples/JabberNet.Example/project.json b/examples/JabberNet.Example/project.json index fa3be2e..def3d4b 100644 --- a/examples/JabberNet.Example/project.json +++ b/examples/JabberNet.Example/project.json @@ -2,7 +2,6 @@ "version": "2.1.2-*", "buildOptions": { "additionalArguments": [ "/target:winexe" ], - "debugType": "portable", "emitEntryPoint": true }, "frameworks": { diff --git a/src/JabberNet.Muzzle/project.json b/src/JabberNet.Muzzle/project.json index a807fec..7706114 100644 --- a/src/JabberNet.Muzzle/project.json +++ b/src/JabberNet.Muzzle/project.json @@ -1,8 +1,5 @@ { "version": "2.1.2-*", - "buildOptions": { - "debugType": "portable" - }, "frameworks": { "net40": { "frameworkAssemblies": { diff --git a/src/JabberNet.Netlib.Dns/project.json b/src/JabberNet.Netlib.Dns/project.json index 3014a78..c9e3053 100644 --- a/src/JabberNet.Netlib.Dns/project.json +++ b/src/JabberNet.Netlib.Dns/project.json @@ -1,8 +1,5 @@ { "version": "2.1.2-*", - "buildOptions": { - "debugType": "portable" - }, "frameworks": { "net40": {} } diff --git a/src/JabberNet/project.json b/src/JabberNet/project.json index e51ceeb..904766a 100644 --- a/src/JabberNet/project.json +++ b/src/JabberNet/project.json @@ -1,8 +1,7 @@ { "version": "2.1.2-*", "buildOptions": { - "allowUnsafe": true, - "debugType": "portable" + "allowUnsafe": true }, "dependencies": { "zlib.net": "1.0.4", diff --git a/tests/JabberNet.Test/project.json b/tests/JabberNet.Test/project.json index 3a25ca4..912badb 100644 --- a/tests/JabberNet.Test/project.json +++ b/tests/JabberNet.Test/project.json @@ -1,8 +1,5 @@ { "version": "2.1.2-*", - "buildOptions": { - "debugType": "portable" - }, "frameworks": { "net451": { "frameworkAssemblies": {