From 2bd8773bddaf8c9979d3545044a802c51e468cae Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Wed, 25 Sep 2019 17:16:11 -0400 Subject: [PATCH 1/2] bump minor of Ix --- Ix.NET/Source/global.json | 3 --- Ix.NET/Source/version.json | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Ix.NET/Source/global.json b/Ix.NET/Source/global.json index b86f73d1d1..6779b8fcad 100644 --- a/Ix.NET/Source/global.json +++ b/Ix.NET/Source/global.json @@ -1,7 +1,4 @@ { - "sdk": { - "version": "3.0.100-preview" - }, "msbuild-sdks": { "MSBuild.Sdk.Extras": "2.0.46" } diff --git a/Ix.NET/Source/version.json b/Ix.NET/Source/version.json index 98ce34077d..2a98c57018 100644 --- a/Ix.NET/Source/version.json +++ b/Ix.NET/Source/version.json @@ -1,8 +1,9 @@ { - "version": "4.0.0-preview.8.build.{height}", + "version": "4.1.0-preview.{height}", "publicReleaseRefSpec": [ "^refs/heads/master$", // we release out of master - "^refs/heads/rel/v\\d+\\.\\d+" // we also release branches starting with vN.N + "^refs/heads/rel/v\\d+\\.\\d+", // we also release branches starting with vN.N + "^refs/heads/rel/ix-v\\d+\\.\\d+" // we also release branches starting with vN.N ], "nugetPackageVersion":{ "semVer": 2 From 0c36e188d1c56506762e6087191317cbf884a344 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Wed, 25 Sep 2019 17:36:18 -0400 Subject: [PATCH 2/2] Use final BCL interfaces --- Ix.NET/Source/System.Linq.Async/System.Linq.Async.csproj | 7 ++----- .../System.Linq.Async.Ref/System.Linq.Async.Ref.csproj | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Ix.NET/Source/System.Linq.Async/System.Linq.Async.csproj b/Ix.NET/Source/System.Linq.Async/System.Linq.Async.csproj index 2546c08f9d..8f5e3a9624 100644 --- a/Ix.NET/Source/System.Linq.Async/System.Linq.Async.csproj +++ b/Ix.NET/Source/System.Linq.Async/System.Linq.Async.csproj @@ -23,7 +23,8 @@ - + @@ -87,8 +88,4 @@ - - - - diff --git a/Ix.NET/Source/refs/System.Linq.Async.Ref/System.Linq.Async.Ref.csproj b/Ix.NET/Source/refs/System.Linq.Async.Ref/System.Linq.Async.Ref.csproj index ac5de756db..547673f40e 100644 --- a/Ix.NET/Source/refs/System.Linq.Async.Ref/System.Linq.Async.Ref.csproj +++ b/Ix.NET/Source/refs/System.Linq.Async.Ref/System.Linq.Async.Ref.csproj @@ -9,7 +9,8 @@ - +