From 0d41da07102e1f80b9df37fd88c2b22f65434673 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Mon, 19 Aug 2019 08:02:12 -0400 Subject: [PATCH 1/2] update sdk and deps for preview 8 --- Ix.NET/Source/Directory.build.props | 4 ++-- Ix.NET/Source/NuGet.config | 13 ------------- Ix.NET/Source/version.json | 2 +- Rx.NET/Integration/NuGet.Config | 13 +------------ Rx.NET/Integration/global.json | 2 +- Rx.NET/Source/Directory.build.props | 10 +++++----- Rx.NET/Source/NuGet.config | 13 ------------- azure-pipelines.ix.yml | 2 +- azure-pipelines.rx.yml | 8 ++++---- 9 files changed, 15 insertions(+), 52 deletions(-) delete mode 100644 Ix.NET/Source/NuGet.config delete mode 100644 Rx.NET/Source/NuGet.config diff --git a/Ix.NET/Source/Directory.build.props b/Ix.NET/Source/Directory.build.props index c9fbc7032b..862261566a 100644 --- a/Ix.NET/Source/Directory.build.props +++ b/Ix.NET/Source/Directory.build.props @@ -22,8 +22,8 @@ - - + + diff --git a/Ix.NET/Source/NuGet.config b/Ix.NET/Source/NuGet.config deleted file mode 100644 index 5268920aa0..0000000000 --- a/Ix.NET/Source/NuGet.config +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Ix.NET/Source/version.json b/Ix.NET/Source/version.json index df66dffce1..98ce34077d 100644 --- a/Ix.NET/Source/version.json +++ b/Ix.NET/Source/version.json @@ -1,5 +1,5 @@ { - "version": "4.0.0-preview.7.build.{height}", + "version": "4.0.0-preview.8.build.{height}", "publicReleaseRefSpec": [ "^refs/heads/master$", // we release out of master "^refs/heads/rel/v\\d+\\.\\d+" // we also release branches starting with vN.N diff --git a/Rx.NET/Integration/NuGet.Config b/Rx.NET/Integration/NuGet.Config index 4506e945ab..b7d67e546f 100644 --- a/Rx.NET/Integration/NuGet.Config +++ b/Rx.NET/Integration/NuGet.Config @@ -1,17 +1,6 @@  - - - - - - - - - - - - + diff --git a/Rx.NET/Integration/global.json b/Rx.NET/Integration/global.json index 0af6548b41..fade553399 100644 --- a/Rx.NET/Integration/global.json +++ b/Rx.NET/Integration/global.json @@ -3,6 +3,6 @@ "version": "3.0.100-preview" }, "msbuild-sdks": { - "MSBuild.Sdk.Extras": "2.0.0-preview.14" + "MSBuild.Sdk.Extras": "2.0.31" } } \ No newline at end of file diff --git a/Rx.NET/Source/Directory.build.props b/Rx.NET/Source/Directory.build.props index de1ecd0c21..02a3d44c17 100644 --- a/Rx.NET/Source/Directory.build.props +++ b/Rx.NET/Source/Directory.build.props @@ -1,4 +1,4 @@ - + Copyright (c) .NET Foundation and Contributors. 2.12 @@ -21,15 +21,15 @@ true latest - - + + - + - + diff --git a/Rx.NET/Source/NuGet.config b/Rx.NET/Source/NuGet.config deleted file mode 100644 index 5268920aa0..0000000000 --- a/Rx.NET/Source/NuGet.config +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/azure-pipelines.ix.yml b/azure-pipelines.ix.yml index c56bb0ace4..93220a9f3d 100644 --- a/azure-pipelines.ix.yml +++ b/azure-pipelines.ix.yml @@ -31,7 +31,7 @@ variables: steps: - task: DotNetCoreInstaller@0 inputs: - version: '3.0.100-preview7-012588' + version: '3.0.100-preview8-013656' - task: DotNetCoreCLI@2 inputs: diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index 5e3a46d434..72eb99a54d 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -33,7 +33,7 @@ jobs: steps: - task: UseDotNet@2 inputs: - version: '3.0.100-preview7-012821' + version: '3.0.100-preview8-013656' includePreviewVersions: true - task: DotNetCoreCLI@2 @@ -103,7 +103,7 @@ jobs: CODECOV_TOKEN: $(CODECOV_TOKEN) displayName: Upload coverage to Codecov condition: and(succeeded(), not(eq(variables['CODECOV_TOKEN'], ''))) - + - task: PowerShell@2 displayName: Authenticode Sign Packages inputs: @@ -134,7 +134,7 @@ jobs: steps: - task: UseDotNet@2 inputs: - version: '3.0.100-preview7-012821' + version: '3.0.100-preview8-013656' includePreviewVersions: true - task: UseDotNet@2 @@ -211,7 +211,7 @@ jobs: steps: - task: UseDotNet@2 inputs: - version: '3.0.100-preview7-012821' + version: '3.0.100-preview8-013656' includePreviewVersions: true - task: DotNetCoreCLI@2 From bde9caa7ea48b6b6efc5d2df4b3c5c6c50777531 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Mon, 19 Aug 2019 08:27:05 -0400 Subject: [PATCH 2/2] fix build --- .github/release-drafter.yml | 4 ---- azure-pipelines.ix.yml | 3 --- azure-pipelines.rx.yml | 2 ++ 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 .github/release-drafter.yml diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index f1280823e4..0000000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,4 +0,0 @@ -template: | - ## What's Changed - - $CHANGES \ No newline at end of file diff --git a/azure-pipelines.ix.yml b/azure-pipelines.ix.yml index 93220a9f3d..fcdb79dffb 100644 --- a/azure-pipelines.ix.yml +++ b/azure-pipelines.ix.yml @@ -14,7 +14,6 @@ pr: include: - master - rel/* - - IxAsyncCSharp8 paths: include: - Ix.NET/Source/* @@ -46,8 +45,6 @@ steps: - task: DotNetCoreCLI@2 inputs: command: restore - feedsToUse: config - nugetConfigPath: Ix.NET/Source/NuGet.config projects: Ix.NET/Source/**/*.csproj displayName: Restore diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index 72eb99a54d..d12343296d 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -35,6 +35,7 @@ jobs: inputs: version: '3.0.100-preview8-013656' includePreviewVersions: true + performMultiLevelLookup: true - task: DotNetCoreCLI@2 inputs: @@ -213,6 +214,7 @@ jobs: inputs: version: '3.0.100-preview8-013656' includePreviewVersions: true + performMultiLevelLookup: true - task: DotNetCoreCLI@2 inputs: