Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] dotnet-cli build system #63

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

[WIP] dotnet-cli build system #63

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a6149e5
#61: initial support of .NET Core build system
ForNeVeR Sep 24, 2016
3a0feb0
#61: add test project to the build
ForNeVeR Sep 24, 2016
0bf1d51
#61: add test runner, fix test
ForNeVeR Sep 24, 2016
78db019
#61: replace some of csproj files with xproj
ForNeVeR Sep 24, 2016
f7472c8
#61: convert ConsoleClient to .NET core build system
ForNeVeR Sep 24, 2016
fbb7fe0
#61: convert all of the projects to dotnet-cli
ForNeVeR Sep 24, 2016
412ef41
#61: fix up the depencencies for VB.NET example
ForNeVeR Sep 24, 2016
66f6d4a
Merge branch 'develop' into 'feature/61-dotnet-core'
ForNeVeR Oct 1, 2016
d8a09d9
#46: port Test.Muzzle to dotnet-cli
ForNeVeR Oct 1, 2016
8e10b60
#46: fix Travis build configuration
ForNeVeR Oct 1, 2016
6bcf6dd
#46: update prerequisite documentation
ForNeVeR Oct 8, 2016
6faff96
#46: compile GUI example as winexe
ForNeVeR Oct 8, 2016
30dc23f
#46: use "debugType": "full" for now
ForNeVeR Oct 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 42 additions & 38 deletions JabberNet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{BFD2D7
paket.dependencies = paket.dependencies
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Test", "tests\JabberNet.Test\JabberNet.Test.csproj", "{76F923A3-5D99-45B9-9327-FBE56648A39F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Muzzle", "src\JabberNet.Muzzle\JabberNet.Muzzle.csproj", "{071A79A9-E23F-418F-A6B7-63D3A3E59EEB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Example", "examples\JabberNet.Example\JabberNet.Example.csproj", "{F7208FC2-C9FF-4019-96D8-E0F5001FDBFD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.ConsoleClient", "examples\JabberNet.ConsoleClient\JabberNet.ConsoleClient.csproj", "{049FB855-89C4-4539-9E5E-0996834D6A0E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet", "src\JabberNet\JabberNet.csproj", "{6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Netlib.Dns", "src\JabberNet.Netlib.Dns\JabberNet.Netlib.Dns.csproj", "{40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BBF059F0-722F-4DCC-AF7F-82054E8EF9F4}"
ProjectSection(SolutionItems) = preProject
Scripts\Build-Docs.ps1 = Scripts\Build-Docs.ps1
Expand Down Expand Up @@ -59,8 +47,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{
docs\templates\template.cshtml = docs\templates\template.cshtml
EndProjectSection
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "JabberNet.VbExample", "examples\JabberNet.VbExample\JabberNet.VbExample.vbproj", "{B5086B0D-C448-450F-945D-5DBE681F2EE7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{41BBF093-186E-44EE-9388-B7CE26F3D77E}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Expand All @@ -71,36 +57,54 @@ 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
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.ConsoleClient", "examples\JabberNet.ConsoleClient\JabberNet.ConsoleClient.xproj", "{3FD358A4-8603-4306-BB78-E6D92C6935B0}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.Example", "examples\JabberNet.Example\JabberNet.Example.xproj", "{0B0B4FD8-841E-4233-B3CA-E885093E35AE}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.Muzzle", "src\JabberNet.Muzzle\JabberNet.Muzzle.xproj", "{32830894-E2CD-4F17-8CD0-3FE1C693A162}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "JabberNet.VbExample", "examples\JabberNet.VbExample\JabberNet.VbExample.vbproj", "{B5086B0D-C448-450F-945D-5DBE681F2EE7}"
ProjectSection(ProjectDependencies) = postProject
{30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08} = {30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}
{32830894-E2CD-4F17-8CD0-3FE1C693A162} = {32830894-E2CD-4F17-8CD0-3FE1C693A162}
EndProjectSection
EndProject
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
{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
{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
{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
{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
{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
{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
{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
Expand Down
13 changes: 13 additions & 0 deletions Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,18 @@ $ xbuild /p:Configuration=Debug jabber-net.sln
$ mono ./packages/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./test/bin5/Debug/test.dll
```

.NET Core
---------

There's an alpha-level support for [.NET Core][dotnet-core] build system in the
project. To build the project using `dotnet`, invoke the following command:

```console
$ dotnet restore
$ dotnet build **/project.json
$ dotnet test tests/JabberNet.Test/project.json
```

Documentation
-------------

Expand Down Expand Up @@ -80,6 +92,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
Expand Down
Binary file removed examples/JabberNet.ConsoleClient/App.ico
View file
Open in desktop
Binary file not shown.
151 changes: 0 additions & 151 deletions examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj
View file
Open in desktop

This file was deleted.

19 changes: 19 additions & 0 deletions examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.xproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>3fd358a4-8603-4306-bb78-e6d92c6935b0</ProjectGuid>
<RootNamespace>JabberNet.ConsoleClient</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
3 changes: 0 additions & 3 deletions examples/JabberNet.ConsoleClient/app.config
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions examples/JabberNet.ConsoleClient/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "2.1.2-*",
"buildOptions": {
"debugType": "portable",
"emitEntryPoint": true
},
"frameworks": {
"net40": {}
},
"dependencies": {
"JabberNet": "*"
}
}
Loading