Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge back from Release v1.1.0 #63

Merged
merged 42 commits into from
Dec 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
897facb
Update README.md
josesimoes Oct 4, 2017
b908dbc
Create GitVersion.yml
josesimoes Oct 4, 2017
0abc6c1
Merge branch 'develop' into master
josesimoes Oct 4, 2017
42ad904
Update appveyor.yml
josesimoes Oct 15, 2018
1c0ee49
Update update-dependencies.ps1
josesimoes Oct 15, 2018
3bbb857
Update update-dependencies.ps1
josesimoes Oct 15, 2018
693f382
Update update-dependencies.ps1
josesimoes Oct 15, 2018
d36b967
Update update-dependencies.ps1
josesimoes Oct 15, 2018
4ec1bd1
Update assembly info file for v1.0.1-rc001
nfbot Oct 15, 2018
0a6146b
Update update-dependencies.ps1
josesimoes Oct 15, 2018
22a51bf
Update update-dependencies.ps1
josesimoes Oct 15, 2018
a2141da
Update assembly info file for v1.0.2-rc001
nfbot Oct 15, 2018
053674b
Update appveyor.yml
josesimoes Oct 15, 2018
cbfe3b0
Update appveyor.yml
josesimoes Oct 15, 2018
ea944c1
Update appveyor.yml
josesimoes Oct 15, 2018
fbd9e29
Update appveyor.yml
josesimoes Oct 16, 2018
3fc1704
Update appveyor.yml
josesimoes Oct 16, 2018
bfe123f
Update commit-assemblyinfo-changes.ps1
josesimoes Oct 16, 2018
de5b589
Update generate-change-log.ps1
josesimoes Oct 16, 2018
3921021
Update appveyor.yml
josesimoes Oct 16, 2018
911da73
Update appveyor.yml
josesimoes Oct 16, 2018
c0d48f1
Update appveyor.yml
josesimoes Oct 16, 2018
082e2f6
Merge pull request #44 from nanoframework/release-1.0.2
josesimoes Oct 16, 2018
8e350ec
Update assembly info file for v1.0.2 [skip ci]
nfbot Oct 16, 2018
a34acfc
Update CHANGELOG for v1.0.2
nfbot Oct 16, 2018
cbaabef
Update update-dependencies.ps1
josesimoes Oct 16, 2018
1dabad9
Update appveyor.yml
josesimoes Oct 16, 2018
f2120d1
Update commit-assemblyinfo-changes.ps1
josesimoes Oct 16, 2018
b5fa478
Update CHANGELOG.md
josesimoes Oct 16, 2018
87b5ca6
Improve CI & CD scripts to deal with release and master branches (#46)
josesimoes Oct 16, 2018
01d6940
Update assembly info file for v1.0.3 [skip ci]
nfbot Oct 16, 2018
d6e5818
Update CHANGELOG for v1.0.3
nfbot Oct 16, 2018
343e220
Improve CI & CD (#47)
josesimoes Oct 17, 2018
6118afb
Update assembly info file for v1.0.4 [skip ci]
nfbot Oct 17, 2018
01c4e57
Update appveyor.yml
josesimoes Oct 17, 2018
584858a
Merge branch 'master' into release-v1.1.0
josesimoes Dec 14, 2018
2a52e21
Merge branch 'release-v1.1.0'
josesimoes Dec 14, 2018
bfe49c0
Work CD-CI
josesimoes Dec 14, 2018
79e7a56
Update Azure DevOps badge
josesimoes Dec 14, 2018
fe3868e
Set version to 1.1.0
josesimoes Dec 14, 2018
fd7790f
Update Nerdbank.GitVersioning to 2.2.33
josesimoes Dec 14, 2018
611e1bb
Merge branch 'master' into release-v1.1.0
nfbot Dec 14, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

| Component | Build Status | NuGet Package |
|:-|---|---|
| Core Library | [![Build status](https://ci.appveyor.com/api/projects/status/5b37qa4h0o2ci3db/branch/master?svg=true)](https://ci.appveyor.com/project/nfbot/lib-corelibrary/branch/master) | [![NuGet](https://img.shields.io/nuget/v/nanoFramework.CoreLibrary.svg)](https://www.nuget.org/packages/nanoFramework.CoreLibrary/) |
| Core Library (preview) | [![Build Status](https://dev.azure.com/nanoframework/CoreLibrary/_apis/build/status/nanoframework.lib-CoreLibrary)](https://dev.azure.com/nanoframework/CoreLibrary/_build/latest?definitionId=24) | [![MyGet Pre Release](https://img.shields.io/myget/nanoframework-dev/vpre/nanoFramework.CoreLibrary.svg)](https://www.myget.org/feed/nanoframework-dev/package/nuget/nanoFramework.CoreLibrary) |
| Core Library | [![Build Status](https://dev.azure.com/nanoframework/CoreLibrary/_apis/build/status/nanoframework.lib-CoreLibrary?branchName=develop)](https://dev.azure.com/nanoframework/CoreLibrary/_build/latest?definitionId=24?branchName=master) | [![NuGet](https://img.shields.io/nuget/v/nanoFramework.CoreLibrary.svg)](https://www.nuget.org/packages/nanoFramework.CoreLibrary/) |
| Core Library (preview) | [![Build Status](https://dev.azure.com/nanoframework/CoreLibrary/_apis/build/status/nanoframework.lib-CoreLibrary?branchName=develop)](https://dev.azure.com/nanoframework/CoreLibrary/_build/latest?definitionId=24?branchName=develop) | [![MyGet Pre Release](https://img.shields.io/myget/nanoframework-dev/vpre/nanoFramework.CoreLibrary.svg)](https://www.myget.org/feed/nanoframework-dev/package/nuget/nanoFramework.CoreLibrary) |


## Feedback and documentation
Expand Down
8 changes: 0 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ trigger:
# include:
# - v/*

pr:
branches:
include:
- master
- develop
- release/*
autoCancel: true

# add nf-tools repo to resources (for Azure Pipelines templates)
resources:
repositories:
Expand Down
2 changes: 1 addition & 1 deletion source/nanoFramework.CoreLibrary/CoreLibrary.nfproj
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
<None Include="..\key.snk" />
</ItemGroup>
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
<Import Project="..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets" />
<Import Project="..\packages\Nerdbank.GitVersioning.2.3.34\build\Nerdbank.GitVersioning.targets" />
<ProjectExtensions>
<ProjectCapabilities>
<ProjectConfigurationsDeclaredAsItems />
Expand Down
2 changes: 1 addition & 1 deletion source/nanoFramework.CoreLibrary/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Nerdbank.GitVersioning" version="2.2.33" developmentDependency="true" />
<package id="Nerdbank.GitVersioning" version="2.3.34" developmentDependency="true" />
</packages>
2 changes: 1 addition & 1 deletion source/version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.0.6-preview.{height}",
"version": "1.1.0",
"assemblyVersion": {
"precision": "revision"
},
Expand Down