Skip to content

Commit 431cfd0

Browse files
authored
Merge back from Release v1.1.0 (#63) ***NO_CI***
1 parent f60683f commit 431cfd0

File tree

5 files changed

+5
-13
lines changed

5 files changed

+5
-13
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
| Component | Build Status | NuGet Package |
1515
|:-|---|---|
16-
| 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/) |
17-
| 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) |
16+
| 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/) |
17+
| 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) |
1818

1919

2020
## Feedback and documentation

azure-pipelines.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ trigger:
1616
# include:
1717
# - v/*
1818

19-
pr:
20-
branches:
21-
include:
22-
- master
23-
- develop
24-
- release/*
25-
autoCancel: true
26-
2719
# add nf-tools repo to resources (for Azure Pipelines templates)
2820
resources:
2921
repositories:

source/nanoFramework.CoreLibrary/CoreLibrary.nfproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@
375375
<None Include="..\key.snk" />
376376
</ItemGroup>
377377
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
378-
<Import Project="..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets" />
378+
<Import Project="..\packages\Nerdbank.GitVersioning.2.3.34\build\Nerdbank.GitVersioning.targets" />
379379
<ProjectExtensions>
380380
<ProjectCapabilities>
381381
<ProjectConfigurationsDeclaredAsItems />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Nerdbank.GitVersioning" version="2.2.33" developmentDependency="true" />
3+
<package id="Nerdbank.GitVersioning" version="2.3.34" developmentDependency="true" />
44
</packages>

source/version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.0.6-preview.{height}",
3+
"version": "1.1.0",
44
"assemblyVersion": {
55
"precision": "revision"
66
},

0 commit comments

Comments
 (0)