From 42ad9046cd7717135c81ad6a877ae378980cb383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 15 Oct 2018 14:58:28 +0100 Subject: [PATCH 01/19] Update appveyor.yml --- appveyor.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index da55c8af..401002cc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -148,18 +148,19 @@ for: - /release.*/ deploy: + - provider: NuGet + api_key: + secure: NSRDXbS8tmzOy4wStGuO3yQMKI8Sk10vF8iQtz9ZDXEnHfwnuDdnXbr/Kno3MMvY + skip_symbols: true + on: + appveyor_repo_tag: true - provider: GitHub tag: v$(GitVersion_NuGetVersionV2) release: nanoFramework Core Library v$(gitversion_semver) - description: 'Check the [changelog](https://github.com/nanoframework/lib-CoreLibrary/blob/$(appveyor_repo_branch)/CHANGELOG.md)\n\n## Install from nanoFramework MyGet development feed\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.myget.org/feed/nanoframework-dev/package/nuget/nanoFramework.CoreLibrary/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)' + description: 'Check the [changelog](https://github.com/nanoframework/lib-CoreLibrary/blob/$(appveyor_repo_branch)/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.CoreLibrary/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)' auth_token: secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S artifact: Nuget_Packages 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.CoreLibrary\bin\Release\nanoFramework.CoreLibrary.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package - - nuget push source\Nuget.CoreLibrary.DELIVERABLES\bin\Release\nanoFramework.CoreLibrary.DELIVERABLES.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package From 1c0ee49e81c2095527aa76cf0931a2644a41fd54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 15 Oct 2018 15:03:56 +0100 Subject: [PATCH 02/19] Update update-dependencies.ps1 --- update-dependencies.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update-dependencies.ps1 b/update-dependencies.ps1 index 8e01d23e..e7fd9e08 100644 --- a/update-dependencies.ps1 +++ b/update-dependencies.ps1 @@ -11,8 +11,8 @@ else # update dependencies for class libraries that depend ONLY on mscorlib # because it can take sometime for the package to become available on the NuGet providers - # need to hange here for 5 minutes - Start-Sleep -Milliseconds 5000 * 60 + # need to hange here for 5 minutes (5 * 60 * 1000) + Start-Sleep -Milliseconds 300000 $librariesToUpdate = ("lib-nanoFramework.Runtime.Events", "lib-nanoFramework.Runtime.Native", From 3bbb857a3a3c55f7290fa5a984bacfb5fcf2458c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 15 Oct 2018 15:21:01 +0100 Subject: [PATCH 03/19] Update update-dependencies.ps1 --- update-dependencies.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/update-dependencies.ps1 b/update-dependencies.ps1 index e7fd9e08..ba714dbe 100644 --- a/update-dependencies.ps1 +++ b/update-dependencies.ps1 @@ -45,7 +45,7 @@ else $solutionFile = (Get-ChildItem -Path ".\" -Include "*.sln" -Recurse) # run NuKeeper inspect - if ($string -like '*release*' -or $string -like '*master*') + if ($env:APPVEYOR_REPO_BRANCH -like '*release*' -or $string -like '*master*') { # use NuGet ONLY for release and master branches $nukeeperInspect = NuKeeper inspect --source https://api.nuget.org/v3/index.json @@ -56,6 +56,9 @@ else $nukeeperInspect = NuKeeper inspect } + "NuGet update inspection result:" | Write-Host -ForegroundColor Blue + $nukeeperInspect | Write-Host -ForegroundColor White + $packageCountMatch = [regex]::Match($nukeeperInspect, "Found (\d) possible updates").captures.groups[1].value [int]$packageCount = 0 [int]::TryParse($packageCountMatch, [ref]$packageCount) From 693f38211711014f9c5ab98ba85bd48f3737329e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 15 Oct 2018 15:55:12 +0100 Subject: [PATCH 04/19] Update update-dependencies.ps1 --- update-dependencies.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update-dependencies.ps1 b/update-dependencies.ps1 index ba714dbe..9bb2ca1d 100644 --- a/update-dependencies.ps1 +++ b/update-dependencies.ps1 @@ -70,7 +70,7 @@ else [array]$packageList = $packageListRaw.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries).Replace([Environment]::NewLine, "") # restore NuGet packages, need to do this before anything else - if ($string -like '*release*' -or $string -like '*master*') + if ($env:APPVEYOR_REPO_BRANCH -like '*release*' -or $string -like '*master*') { # use NuGet ONLY for release and master branches nuget restore $solutionFile[0] -Source https://api.nuget.org/v3/index.json @@ -99,7 +99,7 @@ else $packageTargetVersion = $packageDetails.captures.Groups[6].Value.Trim(); # update package - if ($string -like '*release*' -or $string -like '*master*') + if ($env:APPVEYOR_REPO_BRANCH -like '*release*' -or $string -like '*master*') { # use NuGet ONLY for release and master branches $updatePackage = nuget update $solutionFile[0].FullName -Source https://api.nuget.org/v3/index.json From d36b9677a980bf9c0dd5be9b8785fb7205694e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 15 Oct 2018 15:58:42 +0100 Subject: [PATCH 05/19] Update update-dependencies.ps1 --- update-dependencies.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/update-dependencies.ps1 b/update-dependencies.ps1 index 9bb2ca1d..7f649211 100644 --- a/update-dependencies.ps1 +++ b/update-dependencies.ps1 @@ -45,7 +45,7 @@ else $solutionFile = (Get-ChildItem -Path ".\" -Include "*.sln" -Recurse) # run NuKeeper inspect - if ($env:APPVEYOR_REPO_BRANCH -like '*release*' -or $string -like '*master*') + if ($env:APPVEYOR_REPO_BRANCH -like '*release*' -or $env:APPVEYOR_REPO_BRANCH-like '*master*') { # use NuGet ONLY for release and master branches $nukeeperInspect = NuKeeper inspect --source https://api.nuget.org/v3/index.json @@ -70,7 +70,7 @@ else [array]$packageList = $packageListRaw.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries).Replace([Environment]::NewLine, "") # restore NuGet packages, need to do this before anything else - if ($env:APPVEYOR_REPO_BRANCH -like '*release*' -or $string -like '*master*') + if ($env:APPVEYOR_REPO_BRANCH -like '*release*' -or $env:APPVEYOR_REPO_BRANCH -like '*master*') { # use NuGet ONLY for release and master branches nuget restore $solutionFile[0] -Source https://api.nuget.org/v3/index.json @@ -99,7 +99,7 @@ else $packageTargetVersion = $packageDetails.captures.Groups[6].Value.Trim(); # update package - if ($env:APPVEYOR_REPO_BRANCH -like '*release*' -or $string -like '*master*') + if ($env:APPVEYOR_REPO_BRANCH -like '*release*' -or $env:APPVEYOR_REPO_BRANCH -like '*master*') { # use NuGet ONLY for release and master branches $updatePackage = nuget update $solutionFile[0].FullName -Source https://api.nuget.org/v3/index.json From 4ec1bd13c48690728c60a83e21914e422d951d47 Mon Sep 17 00:00:00 2001 From: nfbot Date: Mon, 15 Oct 2018 15:06:45 +0000 Subject: [PATCH 06/19] Update assembly info file for v1.0.1-rc001 [version update] --- source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs b/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs index ab365751..a566b6df 100644 --- a/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs +++ b/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs @@ -14,4 +14,4 @@ [assembly: AssemblyCopyright("Copyright © nanoFramework Contributors 2017")] [assembly: AssemblyVersion("1.0.1.0")] [assembly: AssemblyFileVersion("1.0.1.0")] -[assembly: AssemblyInformationalVersion("1.0.1-preview136")] +[assembly: AssemblyInformationalVersion("1.0.1-rc001")] From 0a6146b4eb9b98f407995c162e8434224e019fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 15 Oct 2018 16:12:04 +0100 Subject: [PATCH 07/19] Update update-dependencies.ps1 --- update-dependencies.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/update-dependencies.ps1 b/update-dependencies.ps1 index 7f649211..af682d13 100644 --- a/update-dependencies.ps1 +++ b/update-dependencies.ps1 @@ -12,6 +12,7 @@ else # because it can take sometime for the package to become available on the NuGet providers # need to hange here for 5 minutes (5 * 60 * 1000) + "Waiting 5 minutes to let package process flow in NuGet providers..." | Write-Host -ForegroundColor White Start-Sleep -Milliseconds 300000 $librariesToUpdate = ("lib-nanoFramework.Runtime.Events", From 22a51bf0fa661541feb805bd6a90d569a4504ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 15 Oct 2018 16:16:54 +0100 Subject: [PATCH 08/19] Update update-dependencies.ps1 --- update-dependencies.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-dependencies.ps1 b/update-dependencies.ps1 index af682d13..51144fd1 100644 --- a/update-dependencies.ps1 +++ b/update-dependencies.ps1 @@ -57,7 +57,7 @@ else $nukeeperInspect = NuKeeper inspect } - "NuGet update inspection result:" | Write-Host -ForegroundColor Blue + "NuGet update inspection result:" | Write-Host -ForegroundColor Cyan $nukeeperInspect | Write-Host -ForegroundColor White $packageCountMatch = [regex]::Match($nukeeperInspect, "Found (\d) possible updates").captures.groups[1].value From a2141daebd26ba8ebe5fb2a502743c762f8b7460 Mon Sep 17 00:00:00 2001 From: nfbot Date: Mon, 15 Oct 2018 16:28:19 +0000 Subject: [PATCH 09/19] Update assembly info file for v1.0.2-rc001 [version update] --- source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs b/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs index a566b6df..673e0f5c 100644 --- a/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs +++ b/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs @@ -12,6 +12,6 @@ [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-rc001")] +[assembly: AssemblyVersion("1.0.2.0")] +[assembly: AssemblyFileVersion("1.0.2.0")] +[assembly: AssemblyInformationalVersion("1.0.2-rc001")] From 053674bdd538c1356a73bd3ec8f85b356ae754b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 15 Oct 2018 17:45:06 +0100 Subject: [PATCH 10/19] Update appveyor.yml --- appveyor.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 401002cc..7f12c0df 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -66,16 +66,14 @@ build_script: msbuild source\nanoFramework.CoreLibrary.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 .\generate-change-log.ps1 + Push-AppveyorArtifact $env:APPVEYOR_BUILD_FOLDER\source\Nuget.CoreLibrary\bin\Release\nanoFramework.CoreLibrary.%GitVersion_NuGetVersionV2%.nupkg + # requires APPVEYOR_DISCORD_WEBHOOK_URL enviroment variable set with Discord webhook URL on_failure: - ps: | @@ -113,7 +111,7 @@ for: description: 'Check the [changelog](https://github.com/nanoframework/lib-CoreLibrary/blob/master/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.CoreLibrary/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)' auth_token: secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S - artifact: Nuget_Packages + artifact: source\Nuget.CoreLibrary\bin\Release\nanoFramework.CoreLibrary.$(GitVersion_NuGetVersionV2).nupkg draft: true prerelease: true force_update: true @@ -132,7 +130,7 @@ for: description: 'Check the [changelog](https://github.com/nanoframework/lib-CoreLibrary/blob/develop/CHANGELOG.md)\n\n## Install from nanoFramework MyGet development feed\n\nThe following NuGet packages are available for download from this release\n\npackage: [.NET](https://www.myget.org/feed/nanoframework-dev/package/nuget/nanoFramework.CoreLibrary/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)' auth_token: secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S - artifact: Nuget_Packages + artifact: source\Nuget.CoreLibrary\bin\Release\nanoFramework.CoreLibrary.$(GitVersion_NuGetVersionV2).nupkg draft: true prerelease: true force_update: true @@ -160,7 +158,7 @@ for: description: 'Check the [changelog](https://github.com/nanoframework/lib-CoreLibrary/blob/$(appveyor_repo_branch)/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.CoreLibrary/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)' auth_token: secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S - artifact: Nuget_Packages + artifact: source\Nuget.CoreLibrary\bin\Release\nanoFramework.CoreLibrary.$(GitVersion_NuGetVersionV2).nupkg draft: true prerelease: true force_update: true From cbfe3b001589bdd501d3f22fde59de5da76f0d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 15 Oct 2018 18:17:36 +0100 Subject: [PATCH 11/19] Update appveyor.yml --- appveyor.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7f12c0df..40d7854a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -100,8 +100,7 @@ for: deploy: - provider: NuGet - api_key: - secure: NSRDXbS8tmzOy4wStGuO3yQMKI8Sk10vF8iQtz9ZDXEnHfwnuDdnXbr/Kno3MMvY + api_key: $(NuGetToken) skip_symbols: true on: appveyor_repo_tag: true @@ -111,7 +110,7 @@ for: description: 'Check the [changelog](https://github.com/nanoframework/lib-CoreLibrary/blob/master/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.CoreLibrary/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)' auth_token: secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S - artifact: source\Nuget.CoreLibrary\bin\Release\nanoFramework.CoreLibrary.$(GitVersion_NuGetVersionV2).nupkg + artifact: draft: true prerelease: true force_update: true @@ -147,8 +146,7 @@ for: deploy: - provider: NuGet - api_key: - secure: NSRDXbS8tmzOy4wStGuO3yQMKI8Sk10vF8iQtz9ZDXEnHfwnuDdnXbr/Kno3MMvY + api_key: $(NuGetToken) skip_symbols: true on: appveyor_repo_tag: true @@ -158,7 +156,7 @@ for: description: 'Check the [changelog](https://github.com/nanoframework/lib-CoreLibrary/blob/$(appveyor_repo_branch)/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.CoreLibrary/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)' auth_token: secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S - artifact: source\Nuget.CoreLibrary\bin\Release\nanoFramework.CoreLibrary.$(GitVersion_NuGetVersionV2).nupkg + artifact: draft: true prerelease: true force_update: true From ea944c18f21117b93ae9965103e8aa770421cf72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 15 Oct 2018 18:23:06 +0100 Subject: [PATCH 12/19] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 40d7854a..7132997e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -72,7 +72,7 @@ before_deploy: .\generate-change-log.ps1 - Push-AppveyorArtifact $env:APPVEYOR_BUILD_FOLDER\source\Nuget.CoreLibrary\bin\Release\nanoFramework.CoreLibrary.%GitVersion_NuGetVersionV2%.nupkg + Push-AppveyorArtifact $env:APPVEYOR_BUILD_FOLDER\source\Nuget.CoreLibrary\bin\Release\nanoFramework.CoreLibrary.$env:GitVersion_NuGetVersionV2.nupkg # requires APPVEYOR_DISCORD_WEBHOOK_URL enviroment variable set with Discord webhook URL on_failure: From fbd9e2919742a0bcfc7d570389a4e43ff7fb26ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 16 Oct 2018 10:22:24 +0100 Subject: [PATCH 13/19] Update appveyor.yml --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7132997e..fe8f925d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,6 +9,8 @@ image: Visual Studio 2017 skip_tags: false +skip_branch_with_pr: true + test: off pull_requests: @@ -112,15 +114,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 From 3fc1704325e1a652b525db56b3e0cb7a20df1693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 16 Oct 2018 12:42:32 +0100 Subject: [PATCH 14/19] Update appveyor.yml --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index fe8f925d..8b54b316 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 bfe123f63f12463bdadc8bb6a84b9abcd4fa9d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 16 Oct 2018 14:19:34 +0100 Subject: [PATCH 15/19] 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 8cfedcaf..c13870f5 100644 --- a/commit-assemblyinfo-changes.ps1 +++ b/commit-assemblyinfo-changes.ps1 @@ -7,7 +7,7 @@ else { # updated assembly info files git add "source\nanoFramework.CoreLibrary\System\AssemblyInfo2.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 de5b589a320d397ba1d1e12b10eff1ecd1b84b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 16 Oct 2018 14:20:00 +0100 Subject: [PATCH 16/19] Update generate-change-log.ps1 --- generate-change-log.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/generate-change-log.ps1 b/generate-change-log.ps1 index dc676db7..6e917c06 100644 --- a/generate-change-log.ps1 +++ b/generate-change-log.ps1 @@ -15,6 +15,5 @@ else # updated changelog and the updated assembly info files git add CHANGELOG.md git commit -m "Update CHANGELOG for v$env:GitVersion_NuGetVersionV2" - # need to wrap the git command bellow so it doesn't throw an error because of redirecting the output to stderr - "$(git push origin)" + git push origin --porcelain -q > $null } From 39210210dae1756220c28a218d9e467e3ae845e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 16 Oct 2018 14:46:01 +0100 Subject: [PATCH 17/19] Update appveyor.yml --- appveyor.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8b54b316..21f830b2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,12 +42,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/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" +- 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% From 911da73d65d0a6341a37757ce2367f2dda44de02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 16 Oct 2018 15:46:55 +0100 Subject: [PATCH 18/19] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 21f830b2..e464a8ab 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,7 +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" +- 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: From c0d48f11fbc82aad0f5eacfe30de2d37a23ef193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 16 Oct 2018 16:01:42 +0100 Subject: [PATCH 19/19] Update appveyor.yml --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index e464a8ab..ced2ca5b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,7 @@ branches: - master - /dev.*/ - /release.*/ + - /v.*/ image: Visual Studio 2017 @@ -101,6 +102,7 @@ for: branches: only: - master + - /v.*/ deploy: - provider: NuGet