Skip to content

Commit c41d628

Browse files
authored
merge Release 1.0.2 branch (#45)
1 parent caa481f commit c41d628

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

appveyor.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ branches:
44
- master
55
- /dev.*/
66
- /release.*/
7+
- /v.*/
78

89
image: Visual Studio 2017
910

1011
skip_tags: false
1112

13+
skip_branch_with_pr: true
14+
1215
test: off
1316

1417
pull_requests:
@@ -40,11 +43,13 @@ environment:
4043
secure: E3bCMe4LtDdAhHSYRcLp0N6DixJe1m8TNxhYeJW/GnqM3WXdRqsgkHSbwootPjJQtOQJrps4twmzTVzofLSVgPgbzU8PxU0AkJV7zwkyVOE=
4144

4245
init:
43-
- git config --global core.autocrlf true
44-
- git config --global credential.helper store
45-
- ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GitHubToken):[email protected]`n"
46-
- git config --global user.email "%GitHubUserEmail%"
47-
- git config --global user.name "%GitHubUserName%"
46+
- git config --global core.autocrlf true
47+
- git config --global credential.helper store
48+
- ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GitHubToken):[email protected]`n"
49+
- git config --global user.email "%GitHubUserEmail%"
50+
- git config --global user.name "%GitHubUserName%"
51+
- 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"
52+
- 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}"
4853

4954
install:
5055
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
@@ -97,6 +102,7 @@ for:
97102
branches:
98103
only:
99104
- master
105+
- /v.*/
100106

101107
deploy:
102108
- provider: NuGet
@@ -112,15 +118,13 @@ for:
112118
secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S
113119
artifact:
114120
draft: true
115-
prerelease: true
121+
prerelease: false
116122
force_update: true
117123

118124
-
119125
branches:
120126
only:
121127
- /dev.*/
122-
123-
skip_branch_with_pr: true
124128

125129
deploy:
126130
- provider: GitHub

source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
[assembly: AssemblyCompany("nanoFramework Contributors")]
1313
[assembly: AssemblyProduct("nanoFramework mscorlib")]
1414
[assembly: AssemblyCopyright("Copyright © nanoFramework Contributors 2017")]
15-
[assembly: AssemblyVersion("1.0.1.0")]
16-
[assembly: AssemblyFileVersion("1.0.1.0")]
17-
[assembly: AssemblyInformationalVersion("1.0.1-preview142")]
15+
16+
[assembly: AssemblyVersion("1.0.2.0")]
17+
[assembly: AssemblyFileVersion("1.0.2.0")]
18+
[assembly: AssemblyInformationalVersion("1.0.2-rc001")]

0 commit comments

Comments
 (0)