From c41d6286736954c43c3fc7eae72d25a493472b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 16 Oct 2018 16:58:40 +0100 Subject: [PATCH] merge Release 1.0.2 branch (#45) --- appveyor.yml | 20 +++++++++++-------- .../System/AssemblyInfo2.cs | 7 ++++--- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7132997e..ced2ca5b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,11 +4,14 @@ branches: - master - /dev.*/ - /release.*/ + - /v.*/ image: Visual Studio 2017 skip_tags: false +skip_branch_with_pr: true + test: off pull_requests: @@ -40,11 +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%" +- 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% @@ -97,6 +102,7 @@ for: branches: only: - master + - /v.*/ deploy: - provider: NuGet @@ -112,15 +118,13 @@ for: secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S artifact: draft: true - prerelease: true + prerelease: false force_update: true - branches: only: - /dev.*/ - - skip_branch_with_pr: true deploy: - provider: GitHub diff --git a/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs b/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs index c2deb9f4..d369dd41 100644 --- a/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs +++ b/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs @@ -12,6 +12,7 @@ [assembly: AssemblyCompany("nanoFramework Contributors")] [assembly: AssemblyProduct("nanoFramework mscorlib")] [assembly: AssemblyCopyright("Copyright © nanoFramework Contributors 2017")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] -[assembly: AssemblyInformationalVersion("1.0.1-preview142")] + +[assembly: AssemblyVersion("1.0.2.0")] +[assembly: AssemblyFileVersion("1.0.2.0")] +[assembly: AssemblyInformationalVersion("1.0.2-rc001")]