Skip to content

Commit

Permalink
#61: convert ConsoleClient to .NET core build system
Browse files Browse the repository at this point in the history
  • Loading branch information
ForNeVeR committed Sep 24, 2016
1 parent 78db019 commit f7472c8
Show file tree
Hide file tree
Showing 9 changed files with 133 additions and 165 deletions.
12 changes: 6 additions & 6 deletions JabberNet.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Binary file removed examples/JabberNet.ConsoleClient/App.ico
Binary file not shown.
152 changes: 0 additions & 152 deletions examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj

This file was deleted.

19 changes: 19 additions & 0 deletions examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.xproj
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

This file was deleted.

13 changes: 13 additions & 0 deletions examples/JabberNet.ConsoleClient/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "1.0.0-*",
"buildOptions": {
"debugType": "portable",
"emitEntryPoint": true
},
"frameworks": {
"net40": {}
},
"dependencies": {
"JabberNet": "*"
}
}
76 changes: 76 additions & 0 deletions examples/JabberNet.ConsoleClient/project.lock.json
Original file line number Diff line number Diff line change
@@ -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": {}
}
1 change: 1 addition & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"projects": [
"examples",
"src",
"tests"
]
Expand Down
22 changes: 18 additions & 4 deletions tests/JabberNet.Test/project.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
}
}
}
},
Expand Down Expand Up @@ -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": {
Expand Down

0 comments on commit f7472c8

Please sign in to comment.