From e8ad6c3f7e7fcbcb5e5aaaaabdb9f08950cb717d Mon Sep 17 00:00:00 2001 From: josesimoes Date: Tue, 1 Jun 2021 11:33:02 +0100 Subject: [PATCH] Work CI-CD - Replace NuGet installer with template. - Various fixes in nuspecs. - Swap feed order in NuGet config. ***NO_CI*** --- .github_changelog_generator | 2 +- NuGet.Config | 2 +- README.md | 10 +++++----- azure-pipelines.yml | 13 +++++-------- nanoFramework.System.Text.nuspec | 7 +++---- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.github_changelog_generator b/.github_changelog_generator index b67564c..e609bbc 100644 --- a/.github_changelog_generator +++ b/.github_changelog_generator @@ -1,5 +1,5 @@ user=nanoframework -project=lib-nanoFramework.System.Text +project=System.Text issues=true add_issues_wo_labels=false add_pr_wo_labels=false diff --git a/NuGet.Config b/NuGet.Config index ef0bacf..0521fe6 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,7 +1,7 @@ - + diff --git a/README.md b/README.md index 0853e8e..91d8098 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-nanoFramework.System.Text&metric=alert_status)](https://sonarcloud.io/dashboard?id=nanoframework_lib-nanoFramework.System.Text) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-nanoFramework.System.Text&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=nanoframework_lib-nanoFramework.System.Text) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) [![NuGet](https://img.shields.io/nuget/dt/nanoFramework.System.Text.svg?label=NuGet&style=flat&logo=nuget)](https://www.nuget.org/packages/nanoFramework.System.Text/) [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/nanoframework/Home/blob/master/CONTRIBUTING.md) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-nanoFramework.System.Text&metric=alert_status)](https://sonarcloud.io/dashboard?id=nanoframework_lib-nanoFramework.System.Text) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-nanoFramework.System.Text&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=nanoframework_lib-nanoFramework.System.Text) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) [![NuGet](https://img.shields.io/nuget/dt/nanoFramework.System.Text.svg?label=NuGet&style=flat&logo=nuget)](https://www.nuget.org/packages/nanoFramework.System.Text/) [![#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/master/resources/logo/nanoFramework-repo-logo.png) +![nanoFramework logo](https://github.com/nanoframework/Home/blob/main/resources/logo/nanoFramework-repo-logo.png) ----- @@ -11,8 +11,8 @@ | Component | Build Status | NuGet Package | |:-|---|---| -| nanoFramework.System.Text | [![Build Status](https://dev.azure.com/nanoframework/nanoFramework.System.Text/_apis/build/status/nanoframework.lib-nanoFramework.System.Text?branchName=master)](https://dev.azure.com/nanoframework/nanoFramework.System.Text/_build/latest?definitionId=57&branchName=master) | [![NuGet](https://img.shields.io/nuget/v/nanoFramework.System.Text.svg?label=NuGet&style=flat&logo=nuget)](https://www.nuget.org/packages/nanoFramework.System.Text/) | -| nanoFramework.System.Text (preview) | [![Build Status](https://dev.azure.com/nanoframework/nanoFramework.System.Text/_apis/build/status/nanoframework.lib-nanoFramework.System.Text?branchName=develop)](https://dev.azure.com/nanoframework/nanoFramework.System.Text/_build/latest?definitionId=57&branchName=develop) | [![](https://badgen.net/badge/NuGet/preview/D7B023?icon=https://simpleicons.now.sh/azuredevops/fff)](https://dev.azure.com/nanoframework/feed/_packaging?_a=package&feed=sandbox&package=nanoFramework.nanoFramework.System.Text&protocolType=NuGet&view=overview) | +| nanoFramework.System.Text | [![Build Status](https://dev.azure.com/nanoframework/nanoFramework.System.Text/_apis/build/status/nanoframework.lib-nanoFramework.System.Text?branchName=main)](https://dev.azure.com/nanoframework/nanoFramework.System.Text/_build/latest?definitionId=57&branchName=main) | [![NuGet](https://img.shields.io/nuget/v/nanoFramework.System.Text.svg?label=NuGet&style=flat&logo=nuget)](https://www.nuget.org/packages/nanoFramework.System.Text/) | +| nanoFramework.System.Text (preview) | [![Build Status](https://dev.azure.com/nanoframework/nanoFramework.System.Text/_apis/build/status/nanoframework.lib-nanoFramework.System.Text?branchName=develop)](https://dev.azure.com/nanoframework/nanoFramework.System.Text/_build/latest?definitionId=57&branchName=develop) | [![NuGet](https://img.shields.io/nuget/v/nanoFramework.System.Text.svg?label=NuGet&style=flat&logo=nuget)](https://www.nuget.org/packages/nanoFramework.System.Text/) | ## Feedback and documentation @@ -22,7 +22,7 @@ Join our Discord community [here](https://discord.gg/gCyBu8T). ## Credits -The list of contributors to this project can be found at [CONTRIBUTORS](https://github.com/nanoframework/Home/blob/master/CONTRIBUTORS.md). +The list of contributors to this project can be found at [CONTRIBUTORS](https://github.com/nanoframework/Home/blob/main/CONTRIBUTORS.md). ## License diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7c124f3..05d7046 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,12 +25,11 @@ jobs: vmImage: 'windows-2019' variables: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_NOLOGO: true solution: '**/*.sln' buildPlatform: 'Any CPU' buildConfiguration: 'Release' nugetPackageName: 'nanoFramework.System.Text' - repoName: 'nanoFramework.System.Text' steps: @@ -53,16 +52,13 @@ jobs: vmImage: 'windows-2019' variables: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_NOLOGO: true steps: - checkout: none - - task: NuGetToolInstaller@0 - inputs: - versionSpec: '5.4.0' - displayName: 'Install specific version of NuGet' + - template: azure-pipelines-templates/install-nuget.yml@templates # update dependencies - task: UpdatenFDependencies@1 @@ -81,14 +77,15 @@ jobs: ################################## # report build failure to Discord - job: Report_Build_Failure + condition: or( failed('Build_Library'), failed('Update_Dependencies')) dependsOn: - Build_Library - Update_Dependencies - condition: or( failed('Build_Library'), failed('Update_Dependencies')) pool: vmImage: 'windows-2019' + steps: - checkout: self diff --git a/nanoFramework.System.Text.nuspec b/nanoFramework.System.Text.nuspec index 57c04ce..2105d4b 100644 --- a/nanoFramework.System.Text.nuspec +++ b/nanoFramework.System.Text.nuspec @@ -11,13 +11,12 @@ false - https://github.com/nanoframework/lib-nanoFramework.System.Text + https://github.com/nanoframework/System.Text https://secure.gravatar.com/avatar/97d0e092247f0716db6d4b47b7d1d1ad images\nf-logo.png - + Copyright (c) .NET Foundation and Contributors - This package includes the System.Text assembly for nanoFramework C# projects. -This package requires a target with nanoFramework.System.Text v$nativeVersion$. + This package includes the System.Text assembly for nanoFramework C# projects. This package requires a target with System.Text v$nativeVersion$. System.Text assembly for nanoFramework C# projects nanoFramework C# csharp netmf netnf nanoFramework.System.Text