diff --git a/CHANGELOG.md b/CHANGELOG.md index a091337..1111651 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,31 @@ # Changelog -## [v1.0.2](https://github.com/nanoframework/System.Threading/tree/v1.0.2) (2021-07-15) +## [**Changes available only in 'Preview' NuGet packages:**](https://github.com/nanoframework/System.Threading/tree/HEAD) -[Full Changelog](https://github.com/nanoframework/System.Threading/compare/v1.0.1-preview.47...v1.0.2) +[Full Changelog](https://github.com/nanoframework/System.Threading/compare/v1.0.3-preview.9...HEAD) **Documentation and other chores:** +- Bumps nanoFramework.CoreLibrary from 1.11.6-preview.2 to 1.11.7 [\#51](https://github.com/nanoframework/System.Threading/pull/51) +- Update 1 nuget dependencies [\#50](https://github.com/nanoframework/System.Threading/pull/50) +- Update 1 nuget dependencies [\#49](https://github.com/nanoframework/System.Threading/pull/49) + +## [v1.0.3-preview.9](https://github.com/nanoframework/System.Threading/tree/v1.0.3-preview.9) (2021-11-30) + +[Full Changelog](https://github.com/nanoframework/System.Threading/compare/v1.0.2...v1.0.3-preview.9) + +**Documentation and other chores:** + +- Bumps nanoFramework.CoreLibrary from 1.10.5 to 1.11.6-preview.2 [\#48](https://github.com/nanoframework/System.Threading/pull/48) +- Update 1 nuget dependencies [\#47](https://github.com/nanoframework/System.Threading/pull/47) +- Update 1 nuget dependencies [\#45](https://github.com/nanoframework/System.Threading/pull/45) +- Update 1 nuget dependencies [\#43](https://github.com/nanoframework/System.Threading/pull/43) - Update 1 nuget dependencies [\#41](https://github.com/nanoframework/System.Threading/pull/41) +## [v1.0.2](https://github.com/nanoframework/System.Threading/tree/v1.0.2) (2021-07-15) + +[Full Changelog](https://github.com/nanoframework/System.Threading/compare/v1.0.1-preview.47...v1.0.2) + ## [v1.0.1-preview.47](https://github.com/nanoframework/System.Threading/tree/v1.0.1-preview.47) (2021-07-14) [Full Changelog](https://github.com/nanoframework/System.Threading/compare/v1.0.1-preview.42...v1.0.1-preview.47) diff --git a/README.md b/README.md index 5dc2c36..0c284cb 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-nanoframework.System.Threading&metric=alert_status)](https://sonarcloud.io/dashboard?id=nanoframework_lib-nanoframework.System.Threading) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-nanoframework.System.Threading&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=nanoframework_lib-nanoframework.System.Threading) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) [![NuGet](https://img.shields.io/nuget/dt/nanoFramework.System.Threading.svg?label=NuGet&style=flat&logo=nuget)](https://www.nuget.org/packages/nanoFramework.System.Threading/) [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/nanoframework/Home/blob/main/CONTRIBUTING.md) [![Discord](https://img.shields.io/discord/478725473862549535.svg?logo=discord&logoColor=white&label=Discord&color=7289DA)](https://discord.gg/gCyBu8T) -![nanoFramework logo](https://github.com/nanoframework/Home/blob/main/resources/logo/nanoFramework-repo-logo.png) +![nanoFramework logo](https://raw.githubusercontent.com/nanoframework/Home/main/resources/logo/nanoFramework-repo-logo.png) ----- -### Welcome to the **nanoFramework** System.Threading Library repository! +### Welcome to the .NET **nanoFramework** System.Threading Library repository ## Build status @@ -29,7 +29,7 @@ The **nanoFramework** Class Libraries are licensed under the [MIT license](LICEN ## Code of Conduct -This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community. +This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behaviour in our community. For more information see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct). ### .NET Foundation diff --git a/Tests/System.Threading.CancellationToken/System.Threading.CancellationToken.nfproj b/Tests/System.Threading.CancellationToken/System.Threading.CancellationToken.nfproj index 0cecd83..1c2e415 100644 --- a/Tests/System.Threading.CancellationToken/System.Threading.CancellationToken.nfproj +++ b/Tests/System.Threading.CancellationToken/System.Threading.CancellationToken.nfproj @@ -1,7 +1,7 @@ - + - $(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\ + $(MSBuildExtensionsPath)\nanoFramework\v1.0\ @@ -31,16 +31,16 @@ - - ..\..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll + + ..\..\packages\nanoFramework.CoreLibrary.1.11.7\lib\mscorlib.dll True - - ..\..\packages\nanoFramework.TestFramework.1.0.147\lib\nanoFramework.TestFramework.dll + + ..\..\packages\nanoFramework.TestFramework.1.0.163\lib\nanoFramework.TestFramework.dll True - ..\..\packages\nanoFramework.TestFramework.1.0.147\lib\nanoFramework.UnitTestLauncher.exe + ..\..\packages\nanoFramework.TestFramework.1.0.163\lib\nanoFramework.UnitTestLauncher.exe True @@ -58,11 +58,11 @@ - + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. - + - + \ No newline at end of file diff --git a/Tests/System.Threading.CancellationToken/packages.config b/Tests/System.Threading.CancellationToken/packages.config index be34a29..e4f2fe2 100644 --- a/Tests/System.Threading.CancellationToken/packages.config +++ b/Tests/System.Threading.CancellationToken/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/assets/nf-logo.png b/assets/nf-logo.png index 6f576ca..572c4ff 100644 Binary files a/assets/nf-logo.png and b/assets/nf-logo.png differ diff --git a/assets/readme.txt b/assets/readme.txt index bef5dec..661d32f 100644 --- a/assets/readme.txt +++ b/assets/readme.txt @@ -6,7 +6,7 @@ =================================================================================== -API docs: https://docs.nanoframework.net/api/nanoFramework.System.Threading.html +API docs: https://docs.nanoframework.net/api/System.Threading Browse our samples repository: https://github.com/nanoframework/samples diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6d5cd05..731118b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,11 +2,13 @@ trigger: branches: include: [main, develop, "release-*" ] paths: - exclude: [README.md, LICENSE.md, NuGet.Config, .github_changelog_generator, .gitignore] + exclude: [README.md, CHANGELOG.md, CODE_OF_CONDUCT.md, LICENSE.md, NuGet.Config, .github_changelog_generator, .gitignore] tags: include: ["v*"] # PR always trigger build +pr: + autoCancel: true # add nf-tools repo to resources (for Azure Pipelines templates) resources: @@ -21,7 +23,7 @@ pool: variables: DOTNET_NOLOGO: true - solution: '**/*.sln' + solution: 'nanoFramework.System.Threading.sln' buildPlatform: 'Any CPU' buildConfiguration: 'Release' nugetPackageName: 'nanoFramework.System.Threading' diff --git a/nanoFramework.System.Threading.nuspec b/nanoFramework.System.Threading.nuspec index 9ab8633..80650cc 100644 --- a/nanoFramework.System.Threading.nuspec +++ b/nanoFramework.System.Threading.nuspec @@ -5,20 +5,22 @@ $version$ nanoFramework.System.Threading nanoFramework project contributors - nanoFramework project contributors,dotnetfoundation + nanoframework,dotnetfoundation false LICENSE.md + docs\README.md false https://github.com/nanoframework/System.Threading images\nf-logo.png Copyright (c) .NET Foundation and Contributors - This package includes the nanoFramework.System.Threading assembly for .NET nanoFramework C# projects. This package requires a target with nanoFramework.System.Threading v$nativeVersion$ (checksum $checksum$). + This package includes the nanoFramework.System.Threading assembly for .NET nanoFramework C# projects. +This package requires a target with nanoFramework.System.Threading v$nativeVersion$ (checksum $checksum$). nanoFramework C# csharp netmf netnf nanoFramework.System.Threading sntp - + @@ -28,6 +30,7 @@ + diff --git a/nanoFramework.System.Threading/nanoFramework.System.Threading.nfproj b/nanoFramework.System.Threading/nanoFramework.System.Threading.nfproj index 573273f..bd0f53a 100644 --- a/nanoFramework.System.Threading/nanoFramework.System.Threading.nfproj +++ b/nanoFramework.System.Threading/nanoFramework.System.Threading.nfproj @@ -1,10 +1,10 @@ - + - $(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\ + $(MSBuildExtensionsPath)\nanoFramework\v1.0\ @@ -49,11 +49,6 @@ false - - - false - - @@ -67,8 +62,8 @@ - - ..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll + + ..\packages\nanoFramework.CoreLibrary.1.11.7\lib\mscorlib.dll True diff --git a/nanoFramework.System.Threading/packages.config b/nanoFramework.System.Threading/packages.config index f237968..ecd2d87 100644 --- a/nanoFramework.System.Threading/packages.config +++ b/nanoFramework.System.Threading/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/version.json b/version.json index d7c4ec8..104a932 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.0.2", + "version": "1.0.3", "assemblyVersion": { "precision": "revision" }, @@ -14,8 +14,7 @@ "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { - "setAllVariables": true, - "buildNumber": null + "setAllVariables": true }, "release": { "branchName": "release-v{version}",