From 930962d47e88e355cce198256ddf145df8a9ffcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 16 Oct 2018 11:38:41 +0100 Subject: [PATCH 01/13] Update appveyor.yml --- appveyor.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 37ea122..5c1cb3d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -70,10 +70,6 @@ build_script: msbuild source\nanoFramework.Networking.Sntp.sln /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" -artifacts: -- path: '**\bin\Release\*.nupkg' - name: Nuget_Packages - before_deploy: - ps: >- .\commit-assemblyinfo-changes.ps1 From 5517e28a6948adc65301c85b1cd1541a3ba96a7a Mon Sep 17 00:00:00 2001 From: nfbot Date: Tue, 16 Oct 2018 11:13:31 +0000 Subject: [PATCH 02/13] Update assembly info file for v1.0.0-rc001 [version update] --- source/nanoFramework.Networking.Sntp/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/nanoFramework.Networking.Sntp/Properties/AssemblyInfo.cs b/source/nanoFramework.Networking.Sntp/Properties/AssemblyInfo.cs index 38f3e52..36c98b4 100644 --- a/source/nanoFramework.Networking.Sntp/Properties/AssemblyInfo.cs +++ b/source/nanoFramework.Networking.Sntp/Properties/AssemblyInfo.cs @@ -27,4 +27,4 @@ // [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0-preview026")] +[assembly: AssemblyInformationalVersion("1.0.0-rc001")] From a7f7ee3c9dc4adce8e0e5983854e7be5366edb15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 16 Oct 2018 12:36:14 +0100 Subject: [PATCH 03/13] Update appveyor.yml --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 5c1cb3d..3ef570a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,6 +47,7 @@ init: - ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GitHubToken):x-oauth-basic@github.com`n" - git config --global user.email "%GitHubUserEmail%" - git config --global user.name "%GitHubUserName%" + - ps: "$headers = if($env:APPVEYOR_PULL_REQUEST_NUMBER){\n @{\n \"Authorization\" = \"Basic $env:GitRestAuth\"\n \"Content-type\" = \"application/json\"\n}\n\n$pr = Invoke-RestMethod -Uri \"https://api.github.com/repos/nanoframework/nf-interpreter/pulls/$env:APPVEYOR_PULL_REQUEST_NUMBER\" -Headers $headers -Method GET\n\nif($pr.user.login -eq \"nfbot\" -and $pr.body -match \"\\[version update\\]\")\n{\n # commit was from nfbot AND it's taged as a [version update]\n # OK to skip AppVeyor build \n \"Version update only. Skipping build.\" | Write-Host -BackgroundColor White -ForegroundColor Blue\n Exit-AppveyorBuild\n} }\n" install: - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% From 83dade30d919b39c7ecda3dbd94593d0c432ff64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 16 Oct 2018 16:33:14 +0100 Subject: [PATCH 04/13] Update commit-assemblyinfo-changes.ps1 --- commit-assemblyinfo-changes.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commit-assemblyinfo-changes.ps1 b/commit-assemblyinfo-changes.ps1 index 4073647..7f7dd89 100644 --- a/commit-assemblyinfo-changes.ps1 +++ b/commit-assemblyinfo-changes.ps1 @@ -7,7 +7,7 @@ else { # updated assembly info files git add "source\nanoFramework.Networking.Sntp\Properties\AssemblyInfo.cs" - git commit -m "Update assembly info file for v$env:GitVersion_NuGetVersionV2" -m"[version update]" + git commit -m "Update assembly info file for v$env:GitVersion_NuGetVersionV2 [skip ci]" -m"[version update]" git push origin --porcelain -q > $null 'Updated assembly info...' | Write-Host -ForegroundColor White -NoNewline From f3612a06fa2be066473ce093cffc39db47079b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 16 Oct 2018 16:33:52 +0100 Subject: [PATCH 05/13] Update appveyor.yml --- appveyor.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3ef570a..eaf3499 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,7 @@ branches: - master - /dev.*/ - /release.*/ + - /v.*/ image: Visual Studio 2017 @@ -42,12 +43,13 @@ environment: secure: E3bCMe4LtDdAhHSYRcLp0N6DixJe1m8TNxhYeJW/GnqM3WXdRqsgkHSbwootPjJQtOQJrps4twmzTVzofLSVgPgbzU8PxU0AkJV7zwkyVOE= init: - - git config --global core.autocrlf true - - git config --global credential.helper store - - ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GitHubToken):x-oauth-basic@github.com`n" - - git config --global user.email "%GitHubUserEmail%" - - git config --global user.name "%GitHubUserName%" - - ps: "$headers = if($env:APPVEYOR_PULL_REQUEST_NUMBER){\n @{\n \"Authorization\" = \"Basic $env:GitRestAuth\"\n \"Content-type\" = \"application/json\"\n}\n\n$pr = Invoke-RestMethod -Uri \"https://api.github.com/repos/nanoframework/nf-interpreter/pulls/$env:APPVEYOR_PULL_REQUEST_NUMBER\" -Headers $headers -Method GET\n\nif($pr.user.login -eq \"nfbot\" -and $pr.body -match \"\\[version update\\]\")\n{\n # commit was from nfbot AND it's taged as a [version update]\n # OK to skip AppVeyor build \n \"Version update only. Skipping build.\" | Write-Host -BackgroundColor White -ForegroundColor Blue\n Exit-AppveyorBuild\n} }\n" +- git config --global core.autocrlf true +- git config --global credential.helper store +- ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GitHubToken):x-oauth-basic@github.com`n" +- git config --global user.email "%GitHubUserEmail%" +- git config --global user.name "%GitHubUserName%" +- ps: "$headers = if($env:APPVEYOR_PULL_REQUEST_NUMBER){\n @{\n \"Authorization\" = \"Basic $env:GitRestAuth\"\n \"Content-type\" = \"application/json\"\n}\n\n$pr = Invoke-RestMethod -Uri \"https://api.github.com/repos/$env:APPVEYOR_REPO_NAME/pulls/$env:APPVEYOR_PULL_REQUEST_NUMBER\" -Headers $headers -Method GET\n\nif($pr.user.login -eq \"nfbot\" -and $pr.body -match \"*[version update]*\")\n{\n # commit was from nfbot AND it's taged as a [version update]\n # OK to skip AppVeyor build \n \"Version update only. Skipping build.\" | Write-Host -BackgroundColor White -ForegroundColor Blue\n Exit-AppveyorBuild\n} }\n" +- ps: "if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq \"\")\n{\n \n if($env:APPVEYOR_REPO_COMMIT_AUTHOR -eq \"nfbot\" -and $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED -like \"*[version update]*\")\n {\n # commit was from nfbot AND it's taged as a [version update]\n # OK to skip AppVeyor build \n \"Version update only. Skipping build.\" | Write-Host -BackgroundColor White -ForegroundColor Blue\n Exit-AppveyorBuild\n }\n}" install: - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% @@ -98,6 +100,7 @@ for: branches: only: - master + - /v.*/ deploy: - provider: NuGet From eaa203ce40c4d301f5dd86336c4342e7bbb6ff0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Wed, 17 Oct 2018 11:17:10 +0100 Subject: [PATCH 06/13] Improvements on CI & CD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Simões --- appveyor.yml | 25 ++++++++++++------------- commit-assemblyinfo-changes.ps1 | 18 +++++++++++++++--- generate-change-log.ps1 | 25 ++++++++++++++++++++----- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index eaf3499..5a1d01e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,4 @@ -# configuration these branches -branches: - only: - - master - - /dev.*/ - - /release.*/ - - /v.*/ +# configuration for all branches image: Visual Studio 2017 @@ -81,6 +75,11 @@ before_deploy: Push-AppveyorArtifact $env:APPVEYOR_BUILD_FOLDER\source\Nuget.nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.$env:GitVersion_NuGetVersionV2.nupkg +after_deploy: +# for this environment variable to work here it has to be set in AppVeyor UI +- nuget push source\Nuget.nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package +- nuget push source\Nuget.nanoFramework.Networking.Sntp.DELIVERABLES\bin\Release\nanoFramework.Networking.Sntp.DELIVERABLES.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package + # requires APPVEYOR_DISCORD_WEBHOOK_URL enviroment variable set with Discord webhook URL on_failure: - ps: | @@ -118,7 +117,8 @@ for: draft: true prerelease: false force_update: true - + on: + appveyor_repo_tag: false - branches: only: @@ -135,11 +135,8 @@ for: draft: true prerelease: true force_update: true - - after_deploy: - # for this environment variable to work here it has to be set in AppVeyor UI - - nuget push source\Nuget.nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package - - nuget push source\Nuget.nanoFramework.Networking.Sntp.DELIVERABLES\bin\Release\nanoFramework.Networking.Sntp.DELIVERABLES.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package + on: + appveyor_repo_tag: false - branches: @@ -162,3 +159,5 @@ for: draft: true prerelease: true force_update: true + on: + appveyor_repo_tag: false diff --git a/commit-assemblyinfo-changes.ps1 b/commit-assemblyinfo-changes.ps1 index 7f7dd89..2c54ebc 100644 --- a/commit-assemblyinfo-changes.ps1 +++ b/commit-assemblyinfo-changes.ps1 @@ -1,7 +1,13 @@ -# only need to commit assembly info changes when build is NOT for a pull-request -if ($env:appveyor_pull_request_number) +# Copyright (c) 2018 The nanoFramework project contributors +# See LICENSE file in the project root for full license information. + +# skip updating assembly info changes if build is a pull-request or not a tag (master OR release) +if ($env:appveyor_pull_request_number -or + ($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or + ($env:APPVEYOR_REPO_BRANCH -match "^release*" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or + $env:APPVEYOR_REPO_TAG -eq "true") { - 'Skip committing assembly info changes as this is a PR build...' | Write-Host -ForegroundColor White + 'Skip committing assembly info changes...' | Write-Host -ForegroundColor White } else { @@ -12,6 +18,12 @@ else 'Updated assembly info...' | Write-Host -ForegroundColor White -NoNewline 'OK' | Write-Host -ForegroundColor Green +} + +# update assembly info in nf-interpreter if we are in development branch or if this is tag (master OR release) +if ($env:APPVEYOR_REPO_BRANCH -match "^dev*" -or $env:APPVEYOR_REPO_TAG -eq "true") +{ + 'Updating assembly version in nf-interpreter...' | Write-Host -ForegroundColor White -NoNewline # clone nf-interpreter repo (only a shallow clone with last commit) git clone https://github.com/nanoframework/nf-interpreter -b develop --depth 1 -q diff --git a/generate-change-log.ps1 b/generate-change-log.ps1 index 0211a72..97e585b 100644 --- a/generate-change-log.ps1 +++ b/generate-change-log.ps1 @@ -1,16 +1,31 @@ +# Copyright (c) 2018 The nanoFramework project contributors +# See LICENSE file in the project root for full license information. + # generate change log when build is NOT for a pull-request -if ($env:appveyor_pull_request_number) +# generate change log when build is NOT a pull-request or not a tag (master OR release) +if ($env:appveyor_pull_request_number -or + ($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or + ($env:APPVEYOR_REPO_BRANCH -match "^release*" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or + $env:APPVEYOR_REPO_TAG -eq "true") { - 'Skip change log processing as this is a PR build...' | Write-Host -ForegroundColor White + 'Skip change log processing...' | Write-Host -ForegroundColor White } else { # need this to keep ruby happy md c:\tmp - # generate change log - # version includes commits - bundle exec github_changelog_generator --token $env:GitHubToken + if ($env:APPVEYOR_REPO_BRANCH -eq "master" -or $env:APPVEYOR_REPO_BRANCH -match "^release*") + { + # generate change log including future version + bundle exec github_changelog_generator --token $env:GitHubToken --future-release "v$env:GitVersion_MajorMinorPatch" + } + else + { + # generate change log + # version includes commits + bundle exec github_changelog_generator --token $env:GitHubToken + } # updated changelog and the updated assembly info files git add CHANGELOG.md From 84a71bb7a476c1a49184c29cf2b1a701eca612cf Mon Sep 17 00:00:00 2001 From: nfbot Date: Wed, 17 Oct 2018 14:13:49 +0100 Subject: [PATCH 07/13] Bumps nanoFramework.CoreLibrary from 1.0.1-preview134 to 1.0.4 (#12) Bumps nanoFramework.CoreLibrary from 1.0.1-preview134 to 1.0.4. --- .../Nuget.nanoFramework.Networking.Sntp.DELIVERABLES.nuproj | 2 +- .../Nuget.nanoFramework.Networking.Sntp.nuproj | 2 +- .../nanoFramework.Networking.Sntp.nfproj | 6 +++--- source/nanoFramework.Networking.Sntp/packages.config | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/Nuget.nanoFramework.Networking.Sntp.DELIVERABLES/Nuget.nanoFramework.Networking.Sntp.DELIVERABLES.nuproj b/source/Nuget.nanoFramework.Networking.Sntp.DELIVERABLES/Nuget.nanoFramework.Networking.Sntp.DELIVERABLES.nuproj index 50e0166..4504908 100644 --- a/source/Nuget.nanoFramework.Networking.Sntp.DELIVERABLES/Nuget.nanoFramework.Networking.Sntp.DELIVERABLES.nuproj +++ b/source/Nuget.nanoFramework.Networking.Sntp.DELIVERABLES/Nuget.nanoFramework.Networking.Sntp.DELIVERABLES.nuproj @@ -38,7 +38,7 @@ - [1.0.1-preview134] + [1.0.4] diff --git a/source/Nuget.nanoFramework.Networking.Sntp/Nuget.nanoFramework.Networking.Sntp.nuproj b/source/Nuget.nanoFramework.Networking.Sntp/Nuget.nanoFramework.Networking.Sntp.nuproj index 2d69888..69ae228 100644 --- a/source/Nuget.nanoFramework.Networking.Sntp/Nuget.nanoFramework.Networking.Sntp.nuproj +++ b/source/Nuget.nanoFramework.Networking.Sntp/Nuget.nanoFramework.Networking.Sntp.nuproj @@ -35,7 +35,7 @@ - [1.0.1-preview134] + [1.0.4] diff --git a/source/nanoFramework.Networking.Sntp/nanoFramework.Networking.Sntp.nfproj b/source/nanoFramework.Networking.Sntp/nanoFramework.Networking.Sntp.nfproj index e217951..eddacdd 100644 --- a/source/nanoFramework.Networking.Sntp/nanoFramework.Networking.Sntp.nfproj +++ b/source/nanoFramework.Networking.Sntp/nanoFramework.Networking.Sntp.nfproj @@ -44,7 +44,7 @@ nanoFramework.Networking.Sntp - + false @@ -58,8 +58,8 @@ - - ..\packages\nanoFramework.CoreLibrary.1.0.1-preview134\lib\mscorlib.dll + + ..\packages\nanoFramework.CoreLibrary.1.0.4\lib\mscorlib.dll True diff --git a/source/nanoFramework.Networking.Sntp/packages.config b/source/nanoFramework.Networking.Sntp/packages.config index 8a62756..192eaf4 100644 --- a/source/nanoFramework.Networking.Sntp/packages.config +++ b/source/nanoFramework.Networking.Sntp/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file From 14c3b3f5b437b1c595600959985317a9d5dd5693 Mon Sep 17 00:00:00 2001 From: nfbot Date: Wed, 17 Oct 2018 14:55:49 +0000 Subject: [PATCH 08/13] Update assembly info file for v1.0.0 [skip ci] [version update] --- source/nanoFramework.Networking.Sntp/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/nanoFramework.Networking.Sntp/Properties/AssemblyInfo.cs b/source/nanoFramework.Networking.Sntp/Properties/AssemblyInfo.cs index 36c98b4..5846f30 100644 --- a/source/nanoFramework.Networking.Sntp/Properties/AssemblyInfo.cs +++ b/source/nanoFramework.Networking.Sntp/Properties/AssemblyInfo.cs @@ -27,4 +27,4 @@ // [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0-rc001")] +[assembly: AssemblyInformationalVersion("1.0.0")] From 28a4f56007bd0f935aeb2c32cba7fc1e14ed1835 Mon Sep 17 00:00:00 2001 From: nfbot Date: Wed, 17 Oct 2018 14:56:05 +0000 Subject: [PATCH 09/13] Update CHANGELOG for v1.0.0 --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c7d7c3..532ae41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,14 @@ # Change Log -## [**Changes available only in 'Preview' NuGet packages:**](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/tree/HEAD) - +## [v1.0.0](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/tree/v1.0.0) (2018-10-17) **Implemented enhancements:** - Add strong name signing [\#3](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/3) **Documentation and other chores:** +- Merge 'develop' for Release 1.0.0 [\#13](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/13) +- Bumps nanoFramework.CoreLibrary from 1.0.1-preview134 to 1.0.4 [\#12](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/12) - Bumps nanoFramework.CoreLibrary from 1.0.1-preview127 to 1.0.1-preview134 [\#10](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/10) - Bumps nanoFramework.CoreLibrary from 1.0.1-preview123 to 1.0.1-preview127 [\#9](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/9) - Bumps nanoFramework.CoreLibrary from 1.0.1-preview118 to 1.0.1-preview123 [\#8](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/8) From a2b842dbf4e79bd5f7db8f011e5752b4533f6f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Sat, 15 Dec 2018 09:07:40 +0000 Subject: [PATCH 10/13] Bump version to 1.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Simões --- source/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/version.json b/source/version.json index e22772e..4292158 100644 --- a/source/version.json +++ b/source/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.0.2-preview.{height}", + "version": "1.0.2", "assemblyVersion": { "precision": "revision" }, From b13637953e79458acf012059f0365f04362d6a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 21 Jan 2019 19:17:38 +0000 Subject: [PATCH 11/13] Update version.json --- source/version.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/version.json b/source/version.json index ddd46be..9fb25ed 100644 --- a/source/version.json +++ b/source/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.0.3-preview.{height}", + "version": "1.0.4", "assemblyVersion": { "precision": "revision" }, @@ -16,4 +16,4 @@ "setVersionVariables": true, "setAllVariables": true } -} \ No newline at end of file +} From 12b304949b439c2672856eef0cb278077e809e98 Mon Sep 17 00:00:00 2001 From: nfbot Date: Mon, 21 Jan 2019 23:03:21 +0000 Subject: [PATCH 12/13] Update CHANGELOG for v1.0.4.3 ***NO_CI*** --- CHANGELOG.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08021c6..c81613e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,17 @@ # Change Log -## [**Changes available only in 'Preview' NuGet packages:**](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/tree/HEAD) - -[Full Changelog](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/compare/v1.0.2...HEAD) +## [v1.0.4](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/tree/v1.0.4) (2019-01-21) +[Full Changelog](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/compare/v1.0.2...v1.0.4) **Documentation and other chores:** +- Release v1.0.4 [\#31](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/31) - Bumps nanoFramework.CoreLibrary from 1.1.0 to 1.1.1 [\#30](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/30) - Merge back from Release v1.0.2 [\#29](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/29) ## [v1.0.2](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/tree/v1.0.2) (2018-12-15) [Full Changelog](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/compare/v1.0.2-preview-049...v1.0.2) -## [v1.0.0](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/tree/v1.0.0) (2018-10-17) **Documentation and other chores:** - Release v1.0.2 [\#28](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/28) From 727f7864721e95bb38d35be5c801a9c1ff373f97 Mon Sep 17 00:00:00 2001 From: nfbot Date: Tue, 17 Sep 2019 01:17:45 +0000 Subject: [PATCH 13/13] Set version to '1.0.14' --- source/version.json | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/source/version.json b/source/version.json index d8b0f2a..c3241ef 100644 --- a/source/version.json +++ b/source/version.json @@ -1,24 +1,23 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.0.14-preview.{height}", - "release": { - "branchName" : "release-v{version}", - "versionIncrement" : "minor", - "firstUnstableTag" : "preview" - }, + "version": "1.0.14", "assemblyVersion": { "precision": "revision" }, "semVer1NumericIdentifierPadding": 3, - "nugetPackageVersion": { - "semVer": 2 - }, + "nuGetPackageVersion": { + "semVer": 2.0 + }, "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { - "setVersionVariables": true, - "setAllVariables": true - } -} + "setAllVariables": true, + "buildNumber": null + }, + "release": { + "branchName": "release-v{version}", + "firstUnstableTag": "preview" + } +} \ No newline at end of file