Migrate to csproj (#16)

tmds · Dec 1, 2017 · 54cff66 · 54cff66
1 parent eba3d5d
commit 54cff66
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 213 deletions.
diff --git a/README.md b/README.md
@@ -1,69 +1,77 @@
+[![AppVeyor](https://ci.appveyor.com/api/projects/status/g2arq8vpwasvvu4t?svg=true)](https://ci.appveyor.com/project/tmds/tmds-mdns/branch/master)
+[![NuGet](https://img.shields.io/nuget/v/Tmds.MDns.svg)](https://www.nuget.org/packages/Tmds.MDns)
+
 Tmds.MDns
 =========
 
 This library allows to find services announced via multicast DNS (RFC6762 and RFC6763).
 
-AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/g2arq8vpwasvvu4t?svg=true)](https://ci.appveyor.com/project/tmds/tmds-mdns/branch/master)
+Version 0.7.0+ is compatible with .NET Core and .NET Framework 4.0+.
+Version 0.6 and below also supported .NET Framework 2.0, 3.5.
+Support for these versions was dropped due to a dotnet cli msbuild issue:
+https://github.com/Microsoft/msbuild/issues/1333.
 
 Example
 -------
 
 This examples shows how to use the ServiceBrowser class to find \_workstation.\_tcp_ types.
 
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Threading.Tasks;
-    using Tmds.MDns;
+```C#
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using Tmds.MDns;
 
-    namespace ServiceFinder
+namespace ServiceFinder
+{
+    class Program
     {
-        class Program
+        static void Main(string[] args)
         {
-            static void Main(string[] args)
+            string serviceType = "_workstation._tcp";
+            if (args.Length >= 1)
             {
-                string serviceType = "_workstation._tcp";
-                if (args.Length >= 1)
-                {
-                    serviceType = args[0];
-                }
-
-                ServiceBrowser serviceBrowser = new ServiceBrowser();
-                serviceBrowser.ServiceAdded += onServiceAdded;
-                serviceBrowser.ServiceRemoved += onServiceRemoved;
-                serviceBrowser.ServiceChanged += onServiceChanged;
-
-                Console.WriteLine("Browsing for type: {0}", serviceType);
-                serviceBrowser.StartBrowse(serviceType);
-                Console.ReadLine();
+                serviceType = args[0];
             }
 
-            static void onServiceChanged(object sender, ServiceAnnouncementEventArgs e)
-            {
-                printService('~', e.Announcement);
-            }
+            ServiceBrowser serviceBrowser = new ServiceBrowser();
+            serviceBrowser.ServiceAdded += onServiceAdded;
+            serviceBrowser.ServiceRemoved += onServiceRemoved;
+            serviceBrowser.ServiceChanged += onServiceChanged;
 
-            static void onServiceRemoved(object sender, ServiceAnnouncementEventArgs e)
-            {
-                printService('-', e.Announcement);
-            }
+            Console.WriteLine("Browsing for type: {0}", serviceType);
+            serviceBrowser.StartBrowse(serviceType);
+            Console.ReadLine();
+        }
 
-            static void onServiceAdded(object sender, ServiceAnnouncementEventArgs e)
-            {
-                printService('+', e.Announcement);
-            }
+        static void onServiceChanged(object sender, ServiceAnnouncementEventArgs e)
+        {
+            printService('~', e.Announcement);
+        }
 
-            static void printService(char startChar, ServiceAnnouncement service)
-            {
-                Console.WriteLine("{0} '{1}' on {2}", startChar, service.Instance, service.NetworkInterface.Name);
-                Console.WriteLine("\tHost: {0} ({1})", service.Hostname, string.Join(", ", service.Addresses));
-                Console.WriteLine("\tPort: {0}", service.Port);
-                Console.WriteLine("\tTxt : [{0}]", string.Join(", ", service.Txt));
-            }
+        static void onServiceRemoved(object sender, ServiceAnnouncementEventArgs e)
+        {
+            printService('-', e.Announcement);
+        }
+
+        static void onServiceAdded(object sender, ServiceAnnouncementEventArgs e)
+        {
+            printService('+', e.Announcement);
+        }
+
+        static void printService(char startChar, ServiceAnnouncement service)
+        {
+            Console.WriteLine("{0} '{1}' on {2}", startChar, service.Instance, service.NetworkInterface.Name);
+            Console.WriteLine("\tHost: {0} ({1})", service.Hostname, string.Join(", ", service.Addresses));
+            Console.WriteLine("\tPort: {0}", service.Port);
+            Console.WriteLine("\tTxt : [{0}]", string.Join(", ", service.Txt));
         }
     }
+}
+```
 
 Implementation
 --------------

diff --git a/Tmds.MDns.sln b/Tmds.MDns.sln
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 init:
   - git config --global core.autocrlf true
 build_script:
-  - build.cmd --quiet verify
+  - build.cmd
 clone_depth: 1
 test: off
 deploy: off

diff --git a/build.cmd b/build.cmd
@@ -1,2 +1,2 @@
-@ECHO OFF
-PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*; exit $LASTEXITCODE"
+dotnet restore src/Tmds.MDns
+dotnet pack -c Release src/Tmds.MDns
diff --git a/build.ps1 b/build.ps1
diff --git a/global.json b/global.json
diff --git a/samples/ServiceFinder/ServiceFinder.csproj b/samples/ServiceFinder/ServiceFinder.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Tmds.MDns\Tmds.MDns.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/samples/ServiceFinder/project.json b/samples/ServiceFinder/project.json
diff --git a/src/Tmds.MDns/Tmds.MDns.csproj b/src/Tmds.MDns/Tmds.MDns.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>This library allows to find services announced via multicast DNS (RFC6762 and RFC6763).</Description>
+    <AssemblyTitle>Tmds.MDns</AssemblyTitle>
+    <VersionPrefix>0.7.0</VersionPrefix>
+    <Authors>Tom Deseyn</Authors>
+    <TargetFrameworks>netstandard1.3;net45;net40</TargetFrameworks>
+    <AssemblyName>Tmds.MDns</AssemblyName>
+    <PackageId>Tmds.MDns</PackageId>
+    <PackageTags>mdns;avahi;zeroconf;rfc6762;rfc6763</PackageTags>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>git://github.com/tmds/Tmds.MDns</RepositoryUrl>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <PackageReference Include="System.Net.NetworkInformation" Version="4.1.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Tmds.MDns/Tmds.MDns.xproj b/src/Tmds.MDns/Tmds.MDns.xproj
diff --git a/src/Tmds.MDns/project.json b/src/Tmds.MDns/project.json