diff --git a/LICENSE.txt b/LICENSE.txt index 8483e839..38c6bf23 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,55 +1,21 @@ - -Microsoft Public License (Ms-PL) - - -This license governs use of the accompanying software. If you use the software, you -accept this license. If you do not accept the license, do not use the software. - - -1. Definitions -The terms "reproduce," "reproduction," "derivative works," and "distribution" have the -same meaning here as under U.S. copyright law. -A "contribution" is the original software, or any additions or changes to the software. -A "contributor" is any person that distributes its contribution under this license. -"Licensed patents" are a contributor's patent claims that read directly on its contribution. - - -2. Grant of Rights -(A) Copyright Grant- Subject to the terms of this license, including the license conditions and - limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free - copyright license to reproduce its contribution, prepare derivative works of its contribution, - and distribute its contribution or any derivative works that you create. -(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations - in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under - its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose - of its contribution in the software or derivative works of the contribution in the software. - - -3. Conditions and Limitations -(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, - or trademarks. -(B) If you bring a patent claim against any contributor over patents that you claim are infringed by - the software, your patent license from such contributor to the software ends automatically. -(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, - and attribution notices that are present in the software. -(D) If you distribute any portion of the software in source code form, you may do so only under this - license by including a complete copy of this license with your distribution. If you distribute - any portion of the software in compiled or object code form, you may only do so under a license - that complies with this license. -(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express - warranties, guarantees or conditions. You may have additional consumer rights under your local laws - which this license cannot change. To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. - - - - - - - - - - - - - +The MIT License (MIT) + +Copyright (c) [year] [fullname] + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 68ebfba3..85e2f7c2 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ The easiest way to get started is to use the NuGet package. > Install-Package [Zeroconf](http://www.nuget.org/packages/Zeroconf) -Current Build Status: [![Build Status](https://dev.azure.com/onovotny/GitBuilds/_apis/build/status/Zeroconf%20-%20CI?branchName=master)](https://dev.azure.com/onovotny/GitBuilds/_build/latest?definitionId=37) +Current Build Status: [![Build Status](https://dev.azure.com/clairernovotny/GitBuilds/_apis/build/status/Zeroconf%20-%20CI?branchName=master)](https://dev.azure.com/clairernovotny/GitBuilds/_build/latest?definitionId=37) ## Usage diff --git a/Zeroconf/Zeroconf.csproj b/Zeroconf/Zeroconf.csproj index 7d57954d..bde8efad 100644 --- a/Zeroconf/Zeroconf.csproj +++ b/Zeroconf/Zeroconf.csproj @@ -1,11 +1,11 @@  netstandard2.0;net46 - Oren Novotny - http://opensource.org/licenses/ms-pl - https://github.com/onovotny/Zeroconf + Claire Novotny + MIT + https://github.com/novotnyllc/Zeroconf Bonjour support for .NET Standard 2.0, .NET Core, .NET Framework, Xamarin, and UWP - © Oren Novotny 2016-2019 + © Claire Novotny 2016-2020 zeroconf;bonjour;mdns;service;discovery;xamarin;netstandard;universal Zeroconf embedded @@ -24,6 +24,10 @@ + + true + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0f94919b..3aeb401c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,9 +1,9 @@ trigger: -- master +- main - rel/* pr: -- master +- main - rel/* @@ -21,7 +21,7 @@ stages: steps: - task: UseDotNet@2 inputs: - version: 3.0.x + version: 3.1.x - task: DotNetCoreCLI@2 inputs: @@ -79,7 +79,7 @@ stages: --secret "$(SignClientSecret)" ` --name "Zeroconf" ` --description "Zeroconf" ` - --descriptionUrl "https://github.com/onovotny/Zeroconf" + --descriptionUrl "https://github.com/novotnyllc/Zeroconf" displayName: Sign packages - publish: $(Pipeline.Workspace)/BuildPackages diff --git a/version.json b/version.json index edd9d623..d9139b1e 100644 --- a/version.json +++ b/version.json @@ -1,7 +1,7 @@ { - "version": "3.3", + "version": "3.4", "publicReleaseRefSpec": [ - "^refs/heads/master$", // we release out of master + "^refs/heads/main$", // we release out of master "^refs/heads/rel/v\\d+\\.\\d+" // we also release branches starting with rel/vN.N ], "nugetPackageVersion":{