From 509935d31fd2fe785479c9541bdb5783a530bafb Mon Sep 17 00:00:00 2001 From: nfbot Date: Tue, 15 Oct 2019 11:58:24 +0000 Subject: [PATCH 1/4] Set version to '1.3.0-preview.{height}' --- source/version.json | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/source/version.json b/source/version.json index d75ba95..f78f942 100644 --- a/source/version.json +++ b/source/version.json @@ -1,24 +1,23 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.2.2-preview.{height}", - "release": { - "branchName" : "release-v{version}", - "versionIncrement" : "minor", - "firstUnstableTag" : "preview" - }, + "version": "1.3.0-preview.{height}", "assemblyVersion": { "precision": "revision" }, "semVer1NumericIdentifierPadding": 3, - "nugetPackageVersion": { - "semVer": 2 - }, + "nuGetPackageVersion": { + "semVer": 2.0 + }, "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { - "setVersionVariables": true, - "setAllVariables": true + "setAllVariables": true, + "buildNumber": null + }, + "release": { + "branchName": "release-v{version}", + "firstUnstableTag": "preview" } -} +} \ No newline at end of file From c321904ffcc355e4a743d417db2fdf7325406201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 15 Oct 2019 13:48:12 +0100 Subject: [PATCH 2/4] Work CD-CI - Remove unused parameter. ***NO_CI*** --- azure-pipelines.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0710329..640ab2a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -57,9 +57,6 @@ steps: repositoriesToUpdate: | lib-nanoFramework.System.Net.Http paho.mqtt.m2mqtt - pathsToSolutions: | - source - '' condition: or( and( succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), and( succeeded(), contains(variables['getCommitMessage.COMMIT_MESSAGE'], '***UPDATE_DEPENDENTS***') ), eq(variables['UPDATE_DEPENDENTS'], 'true') ) displayName: Update dependent class libs From 9c8ababfbe755b1c626db2d404021d741ba712ba Mon Sep 17 00:00:00 2001 From: nfbot Date: Thu, 17 Oct 2019 10:06:47 +0100 Subject: [PATCH 3/4] Update 2 NuGet dependencies --- source/nanoFramework.System.Net.DELIVERABLES.nuspec | 4 ++-- source/nanoFramework.System.Net.nuspec | 4 ++-- source/nanoFramework.System.Net/System.Net.nfproj | 12 ++++++------ source/nanoFramework.System.Net/packages.config | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/source/nanoFramework.System.Net.DELIVERABLES.nuspec b/source/nanoFramework.System.Net.DELIVERABLES.nuspec index cddea32..55dd029 100644 --- a/source/nanoFramework.System.Net.DELIVERABLES.nuspec +++ b/source/nanoFramework.System.Net.DELIVERABLES.nuspec @@ -18,8 +18,8 @@ - - + + diff --git a/source/nanoFramework.System.Net.nuspec b/source/nanoFramework.System.Net.nuspec index f995e26..4394f54 100644 --- a/source/nanoFramework.System.Net.nuspec +++ b/source/nanoFramework.System.Net.nuspec @@ -20,8 +20,8 @@ This package requires a target with nanoFramework..System.Net v$nativeVersion$.< nanoFramework.System.Net assembly for nanoFramework C# projects nanoFramework C# csharp netmf netnf nanoFramework.System.Net - - + + diff --git a/source/nanoFramework.System.Net/System.Net.nfproj b/source/nanoFramework.System.Net/System.Net.nfproj index 8a1e73f..ac2a75d 100644 --- a/source/nanoFramework.System.Net/System.Net.nfproj +++ b/source/nanoFramework.System.Net/System.Net.nfproj @@ -50,10 +50,10 @@ - + false - + false @@ -104,12 +104,12 @@ - - ..\packages\nanoFramework.CoreLibrary.1.2.6\lib\mscorlib.dll + + ..\packages\nanoFramework.CoreLibrary.1.3.0\lib\mscorlib.dll True - - ..\packages\nanoFramework.Runtime.Events.1.1.1\lib\nanoFramework.Runtime.Events.dll + + ..\packages\nanoFramework.Runtime.Events.1.3.0\lib\nanoFramework.Runtime.Events.dll True diff --git a/source/nanoFramework.System.Net/packages.config b/source/nanoFramework.System.Net/packages.config index 30f1fc7..9e265b0 100644 --- a/source/nanoFramework.System.Net/packages.config +++ b/source/nanoFramework.System.Net/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file From e87ded9c3c283b3834f85890a993e43b999d9d36 Mon Sep 17 00:00:00 2001 From: nfbot Date: Thu, 17 Oct 2019 09:12:58 +0000 Subject: [PATCH 4/4] Set version to '1.3.0' --- source/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/version.json b/source/version.json index f78f942..916a348 100644 --- a/source/version.json +++ b/source/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.3.0-preview.{height}", + "version": "1.3.0", "assemblyVersion": { "precision": "revision" },