From b2d0210f369826697baa6a6618e52df4b5803daf Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Thu, 13 Dec 2018 08:37:07 -0800 Subject: [PATCH 01/34] Add folder for local packages --- Rx.NET/Integration/LocalPackages/.keepme | 1 + Rx.NET/Integration/NuGet.Config | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Rx.NET/Integration/LocalPackages/.keepme diff --git a/Rx.NET/Integration/LocalPackages/.keepme b/Rx.NET/Integration/LocalPackages/.keepme new file mode 100644 index 0000000000..ee30b224d6 --- /dev/null +++ b/Rx.NET/Integration/LocalPackages/.keepme @@ -0,0 +1 @@ +Placeholder to keep this directory \ No newline at end of file diff --git a/Rx.NET/Integration/NuGet.Config b/Rx.NET/Integration/NuGet.Config index 32dcdd4ad6..988a4f8276 100644 --- a/Rx.NET/Integration/NuGet.Config +++ b/Rx.NET/Integration/NuGet.Config @@ -1,9 +1,9 @@  - - + - + + From 43a6a80fc7954a841011b01b778d0b8f61f1f963 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Thu, 13 Dec 2018 08:42:20 -0800 Subject: [PATCH 02/34] add linux test project --- .../Integration/LinuxTests/LinuxTests.csproj | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Rx.NET/Integration/LinuxTests/LinuxTests.csproj diff --git a/Rx.NET/Integration/LinuxTests/LinuxTests.csproj b/Rx.NET/Integration/LinuxTests/LinuxTests.csproj new file mode 100644 index 0000000000..0084ef1caa --- /dev/null +++ b/Rx.NET/Integration/LinuxTests/LinuxTests.csproj @@ -0,0 +1,23 @@ + + + netcoreapp3.0;netcoreapp2.1 + $(NoWarn);CS0618 + + + + + PreserveNewest + + + + + + + + + + + + + \ No newline at end of file From f13de506cc41e11a7544550afb954959ecd49795 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Thu, 13 Dec 2018 08:55:23 -0800 Subject: [PATCH 03/34] add linux test project --- Rx.NET/Integration/LinuxTests.sln | 25 +++++++++++++++++++ .../Integration/LinuxTests/LinuxTests.csproj | 23 ++++++++++++++--- Rx.NET/Integration/global.json | 8 ++++++ 3 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 Rx.NET/Integration/LinuxTests.sln create mode 100644 Rx.NET/Integration/global.json diff --git a/Rx.NET/Integration/LinuxTests.sln b/Rx.NET/Integration/LinuxTests.sln new file mode 100644 index 0000000000..8e58af60b2 --- /dev/null +++ b/Rx.NET/Integration/LinuxTests.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28407.52 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinuxTests", "LinuxTests\LinuxTests.csproj", "{E5607740-EAAC-4A42-B59C-3B2387582559}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E5607740-EAAC-4A42-B59C-3B2387582559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5607740-EAAC-4A42-B59C-3B2387582559}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5607740-EAAC-4A42-B59C-3B2387582559}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5607740-EAAC-4A42-B59C-3B2387582559}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2ABA1A1F-6AEE-4AB5-A710-4D7474576023} + EndGlobalSection +EndGlobal diff --git a/Rx.NET/Integration/LinuxTests/LinuxTests.csproj b/Rx.NET/Integration/LinuxTests/LinuxTests.csproj index 0084ef1caa..2c7b42b5b0 100644 --- a/Rx.NET/Integration/LinuxTests/LinuxTests.csproj +++ b/Rx.NET/Integration/LinuxTests/LinuxTests.csproj @@ -2,14 +2,31 @@ netcoreapp3.0;netcoreapp2.1 $(NoWarn);CS0618 + latest + Tests.System.Reactive + Tests.System.Reactive + true + ..\..\Source\ReactiveX.snk + + + + true + true + + + + + $(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING + + + $(DefineConstants);HAS_TRACE;HAS_WINRT;HAS_WINFORMS;HAS_DISPATCHER;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;DESKTOPCLR;LINUX PreserveNewest - + @@ -18,6 +35,6 @@ - + \ No newline at end of file diff --git a/Rx.NET/Integration/global.json b/Rx.NET/Integration/global.json new file mode 100644 index 0000000000..0af6548b41 --- /dev/null +++ b/Rx.NET/Integration/global.json @@ -0,0 +1,8 @@ +{ + "sdk": { + "version": "3.0.100-preview" + }, + "msbuild-sdks": { + "MSBuild.Sdk.Extras": "2.0.0-preview.14" + } +} \ No newline at end of file From 8b68357fdb64635c5b01bdac99291163b7958d8b Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 14 Dec 2018 06:17:08 -0800 Subject: [PATCH 04/34] add linux job --- azure-pipelines.rx.yml | 212 ++++++++++++++++++++++++++--------------- 1 file changed, 137 insertions(+), 75 deletions(-) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index b29a116ddf..fa2522636d 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -20,83 +20,145 @@ pr: - .editorconfig - azure-pipelines.rx.yml -pool: - vmImage: vs2017-win2016 +jobs: +- job: Build + pool: + vmImage: vs2017-win2016 -variables: - BuildConfiguration: Release - BuildPlatform: Any CPU + variables: + BuildConfiguration: Release + BuildPlatform: Any CPU + + steps: + - task: DotNetCoreInstaller@0 + inputs: + version: '3.0.100-preview-009812' + + - task: DotNetCoreCLI@2 + inputs: + command: custom + custom: tool + arguments: install --tool-path . nbgv + displayName: Install NBGV tool + + - script: nbgv cloud -a -p Rx.NET\Source + displayName: Set Version + + - task: MSBuild@1 + displayName: Build System.Reactive.sln + inputs: + solution: Rx.NET/Source/System.Reactive.sln + msbuildArguments: /restore /t:build /p:CreatePackage=true /p:NoPackageAnalysis=true /p:PackageOutputPath=$(Build.ArtifactStagingDirectory)\artifacts + platform: $(BuildPlatform) + configuration: $(BuildConfiguration) + maximumCpuCount: true + + - task: NuGetCommand@2 + displayName: Pack compatibility package + inputs: + command: custom + arguments: pack Rx.NET/Source/facades/System.Reactive.Compatibility.nuspec -Version $(NBGV_NuGetPackageVersion) -MinClientVersion 2.12 -NoPackageAnalysis -outputdirectory $(Build.ArtifactStagingDirectory)\artifacts + + - task: MSBuild@1 + displayName: Build for Test (ppdb) workaround + inputs: + solution: Rx.NET/Source/System.Reactive.sln + msbuildArguments: /t:build /p:DebugType=portable + platform: $(BuildPlatform) + configuration: $(BuildConfiguration) + maximumCpuCount: true + + - task: DotNetCoreCLI@2 + inputs: + command: test + projects: Rx.NET/Source/tests/Tests.System.Reactive/*.csproj + arguments: -c $(BuildConfiguration) --no-build --no-restore --filter "SkipCI!=true" --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)/Rx.NET/Source/CodeCoverage.runsettings + displayName: Run Unit Tests + + - task: DotNetCoreCLI@2 + inputs: + command: test + projects: Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj + arguments: -c $(BuildConfiguration) --no-build --no-restore + displayName: Run Api Approvals Tests + + - task: whitesource.ws-bolt.bolt.wss.WhiteSource Bolt@18 + displayName: 'WhiteSource Bolt' + enabled: false -steps: -- task: DotNetCoreInstaller@0 - inputs: - version: '3.0.100-preview-009812' - -- task: DotNetCoreCLI@2 - inputs: - command: custom - custom: tool - arguments: install --tool-path . nbgv - displayName: Install NBGV tool - -- script: nbgv cloud -a -p Rx.NET\Source - displayName: Set Version - -- task: MSBuild@1 - displayName: Build System.Reactive.sln - inputs: - solution: Rx.NET/Source/System.Reactive.sln - msbuildArguments: /restore /t:build /p:CreatePackage=true /p:NoPackageAnalysis=true /p:PackageOutputPath=$(Build.ArtifactStagingDirectory)\artifacts - platform: $(BuildPlatform) - configuration: $(BuildConfiguration) - maximumCpuCount: true - -- task: NuGetCommand@2 - displayName: Pack compatibility package - inputs: - command: custom - arguments: pack Rx.NET/Source/facades/System.Reactive.Compatibility.nuspec -Version $(NBGV_NuGetPackageVersion) -MinClientVersion 2.12 -NoPackageAnalysis -outputdirectory $(Build.ArtifactStagingDirectory)\artifacts + - task: PowerShell@2 + displayName: Authenticode Sign Packages + inputs: + filePath: Rx.NET/Source/build/Sign-Package.ps1 + env: + SignClientUser: $(SignClientUser) + SignClientSecret: $(SignClientSecret) + ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts + condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], ''))) + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.ArtifactStagingDirectory)\artifacts + ArtifactName: artifacts + publishLocation: Container + +- job: Linux_Test + dependsOn: Build + pool: + vmImage: ubuntu-16.04 -- task: MSBuild@1 - displayName: Build for Test (ppdb) workaround - inputs: - solution: Rx.NET/Source/System.Reactive.sln - msbuildArguments: /t:build /p:DebugType=portable - platform: $(BuildPlatform) - configuration: $(BuildConfiguration) - maximumCpuCount: true - -- task: DotNetCoreCLI@2 - inputs: - command: test - projects: Rx.NET/Source/tests/Tests.System.Reactive/*.csproj - arguments: -c $(BuildConfiguration) --no-build --no-restore --filter "SkipCI!=true" --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)/Rx.NET/Source/CodeCoverage.runsettings - displayName: Run Unit Tests - -- task: DotNetCoreCLI@2 - inputs: - command: test - projects: Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj - arguments: -c $(BuildConfiguration) --no-build --no-restore - displayName: Run Api Approvals Tests - -- task: whitesource.ws-bolt.bolt.wss.WhiteSource Bolt@18 - displayName: 'WhiteSource Bolt' - enabled: false + variables: + BuildConfiguration: Release + BuildPlatform: Any CPU -- task: PowerShell@2 - displayName: Authenticode Sign Packages - inputs: - filePath: Rx.NET/Source/build/Sign-Package.ps1 - env: - SignClientUser: $(SignClientUser) - SignClientSecret: $(SignClientSecret) - ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts - condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], ''))) - -- task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.ArtifactStagingDirectory)\artifacts - ArtifactName: artifacts - publishLocation: Container + steps: + - task: DotNetCoreInstaller@0 + inputs: + version: '3.0.100-preview-009812' + + - task: DotNetCoreCLI@2 + inputs: + command: custom + custom: tool + arguments: install --tool-path . nbgv + displayName: Install NBGV tool + + - script: nbgv cloud -a -p Rx.NET\Source + displayName: Set Version + + - task: DownloadBuildArtifacts@0 + displayName: 'Download Build Artifacts' + inputs: + artifactName: artifacts + downloadPath: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages + + - task: DotNetCoreCLI@2 + displayName: Update Rx + inputs: + command: custom + projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj + custom: add + arguments: package System.Reactive -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages + + - task: DotNetCoreCLI@2 + displayName: Update Aliases + inputs: + command: custom + projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj + custom: add + arguments: package System.Reactive.Observable.Aliases -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages + + - task: DotNetCoreCLI@2 + displayName: Update Testing + inputs: + command: custom + projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj + custom: add + arguments: package Microsoft.Reactive.Testing -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages + - task: DotNetCoreCLI@2 + inputs: + command: test + projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj + arguments: -c $(BuildConfiguration) + displayName: Run Tests on Linux \ No newline at end of file From a645fb4f1d51b4ad6158fe9c0022b99a2141364e Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 14 Dec 2018 06:44:44 -0800 Subject: [PATCH 05/34] fix invocation --- azure-pipelines.rx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index fa2522636d..ebb7407c94 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -41,7 +41,7 @@ jobs: arguments: install --tool-path . nbgv displayName: Install NBGV tool - - script: nbgv cloud -a -p Rx.NET\Source + - script: ./nbgv cloud -a -p Rx.NET/Source displayName: Set Version - task: MSBuild@1 From 759660a43ceb14066456cd1bc7604ec5a49e97eb Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 14 Dec 2018 10:26:56 -0500 Subject: [PATCH 06/34] Update azure-pipelines.rx.yml --- azure-pipelines.rx.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index ebb7407c94..2fb6d0fef6 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -41,7 +41,7 @@ jobs: arguments: install --tool-path . nbgv displayName: Install NBGV tool - - script: ./nbgv cloud -a -p Rx.NET/Source + - script: nbgv cloud -a -p Rx.NET/Source displayName: Set Version - task: MSBuild@1 @@ -123,7 +123,7 @@ jobs: arguments: install --tool-path . nbgv displayName: Install NBGV tool - - script: nbgv cloud -a -p Rx.NET\Source + - script: ./nbgv cloud -a -p Rx.NET\Source displayName: Set Version - task: DownloadBuildArtifacts@0 @@ -161,4 +161,4 @@ jobs: command: test projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj arguments: -c $(BuildConfiguration) - displayName: Run Tests on Linux \ No newline at end of file + displayName: Run Tests on Linux From 16d75e4e2b08a6e95ae6f1167d30af87f2c1e700 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 14 Dec 2018 10:36:16 -0500 Subject: [PATCH 07/34] Update azure-pipelines.rx.yml --- azure-pipelines.rx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index 2fb6d0fef6..37190d571a 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -123,7 +123,7 @@ jobs: arguments: install --tool-path . nbgv displayName: Install NBGV tool - - script: ./nbgv cloud -a -p Rx.NET\Source + - script: ./nbgv cloud -a -p Rx.NET/Source displayName: Set Version - task: DownloadBuildArtifacts@0 From deba91f265f572b338494d6efce7033a63c09443 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 14 Dec 2018 09:19:47 -0800 Subject: [PATCH 08/34] Also install 2.2 --- azure-pipelines.rx.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index 37190d571a..8924f1f526 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -112,6 +112,10 @@ jobs: BuildPlatform: Any CPU steps: + - task: DotNetCoreInstaller@0 + inputs: + version: '2.2.100' + - task: DotNetCoreInstaller@0 inputs: version: '3.0.100-preview-009812' From bf6c150f20f0673ea8125f6844a7df4e497df34c Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 14 Dec 2018 09:43:21 -0800 Subject: [PATCH 09/34] try moving the 3.0 install to after the tool --- azure-pipelines.rx.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index 8924f1f526..e40a13405a 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -116,10 +116,6 @@ jobs: inputs: version: '2.2.100' - - task: DotNetCoreInstaller@0 - inputs: - version: '3.0.100-preview-009812' - - task: DotNetCoreCLI@2 inputs: command: custom @@ -130,6 +126,10 @@ jobs: - script: ./nbgv cloud -a -p Rx.NET/Source displayName: Set Version + - task: DotNetCoreInstaller@0 + inputs: + version: '3.0.100-preview-009812' + - task: DownloadBuildArtifacts@0 displayName: 'Download Build Artifacts' inputs: From 62b9eca89dd324071e458ab2520da96dab29d805 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 14 Dec 2018 13:25:54 -0500 Subject: [PATCH 10/34] use forward slash --- Rx.NET/Integration/NuGet.Config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rx.NET/Integration/NuGet.Config b/Rx.NET/Integration/NuGet.Config index 988a4f8276..1f5149d054 100644 --- a/Rx.NET/Integration/NuGet.Config +++ b/Rx.NET/Integration/NuGet.Config @@ -4,6 +4,6 @@ - + From d61a55be8c829d35debba13078e967adbf134a07 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 14 Dec 2018 13:29:51 -0500 Subject: [PATCH 11/34] move downloaded artifacts to package directory --- azure-pipelines.rx.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index e40a13405a..4e3e30bf27 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -135,6 +135,8 @@ jobs: inputs: artifactName: artifacts downloadPath: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages + + - script: mv $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages/artifacts/*.* $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages - task: DotNetCoreCLI@2 displayName: Update Rx From 87447c38d54cea9e87cc4df050a970ac8f0833ed Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 14 Dec 2018 14:15:41 -0500 Subject: [PATCH 12/34] Reduce surface area to match netstandard --- Rx.NET/Integration/LinuxTests/LinuxTests.csproj | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Rx.NET/Integration/LinuxTests/LinuxTests.csproj b/Rx.NET/Integration/LinuxTests/LinuxTests.csproj index 2c7b42b5b0..0f74abb65a 100644 --- a/Rx.NET/Integration/LinuxTests/LinuxTests.csproj +++ b/Rx.NET/Integration/LinuxTests/LinuxTests.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0;netcoreapp2.1 $(NoWarn);CS0618 @@ -8,18 +8,12 @@ true ..\..\Source\ReactiveX.snk - - - true - true - - $(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING - $(DefineConstants);HAS_TRACE;HAS_WINRT;HAS_WINFORMS;HAS_DISPATCHER;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;DESKTOPCLR;LINUX + $(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;LINUX From dc9f681fcbb7f128ce697e03901c803573b95f7a Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 14 Dec 2018 14:42:15 -0500 Subject: [PATCH 13/34] update gb.nv --- Rx.NET/Source/Directory.build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rx.NET/Source/Directory.build.targets b/Rx.NET/Source/Directory.build.targets index 8e2d441623..8283c9320d 100644 --- a/Rx.NET/Source/Directory.build.targets +++ b/Rx.NET/Source/Directory.build.targets @@ -25,7 +25,7 @@ - + From d11d09c0eea69d92d2522c127f0d5e7b311e0b59 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 18 Jan 2019 17:09:20 -0500 Subject: [PATCH 14/34] fix versions --- Rx.NET/Source/Directory.build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rx.NET/Source/Directory.build.targets b/Rx.NET/Source/Directory.build.targets index 8283c9320d..301b38c348 100644 --- a/Rx.NET/Source/Directory.build.targets +++ b/Rx.NET/Source/Directory.build.targets @@ -21,11 +21,11 @@ - + - + From d7a3a382be3ed41823fbcbf46eecb45985d391b2 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Thu, 14 Feb 2019 16:43:00 -0500 Subject: [PATCH 15/34] Update dependencies --- Rx.NET/Source/Directory.build.props | 1 + Rx.NET/Source/Directory.build.targets | 6 +++--- Rx.NET/Source/src/System.Reactive/System.Reactive.csproj | 4 ++-- .../Tests.System.Reactive.Uwp.DeviceRunner.csproj | 6 +++--- azure-pipelines.rx.yml | 6 +++--- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Rx.NET/Source/Directory.build.props b/Rx.NET/Source/Directory.build.props index 4ca5fa42a0..45fe3fb316 100644 --- a/Rx.NET/Source/Directory.build.props +++ b/Rx.NET/Source/Directory.build.props @@ -22,6 +22,7 @@ true true latest + 6.1.9 diff --git a/Rx.NET/Source/Directory.build.targets b/Rx.NET/Source/Directory.build.targets index 301b38c348..8316f0a75c 100644 --- a/Rx.NET/Source/Directory.build.targets +++ b/Rx.NET/Source/Directory.build.targets @@ -15,17 +15,17 @@ $(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING - $(DefineConstants);HAS_TRACE;HAS_WINRT;HAS_WINFORMS;HAS_DISPATCHER;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;DESKTOPCLR + $(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;HAS_WINFORMS;HAS_DISPATCHER;DESKTOPCLR - + - + diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj index 191dc7d8e1..9eb16ac10e 100644 --- a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj +++ b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj @@ -29,7 +29,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj b/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj index e6adfdc2fc..d54519b8ce 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj +++ b/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj @@ -90,9 +90,9 @@ true - - - + + + diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index 4e3e30bf27..fd1544b24a 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -32,7 +32,7 @@ jobs: steps: - task: DotNetCoreInstaller@0 inputs: - version: '3.0.100-preview-009812' + version: '3.0.100-preview-010184' - task: DotNetCoreCLI@2 inputs: @@ -114,7 +114,7 @@ jobs: steps: - task: DotNetCoreInstaller@0 inputs: - version: '2.2.100' + version: '2.2.103' - task: DotNetCoreCLI@2 inputs: @@ -128,7 +128,7 @@ jobs: - task: DotNetCoreInstaller@0 inputs: - version: '3.0.100-preview-009812' + version: '3.0.100-preview-010184' - task: DownloadBuildArtifacts@0 displayName: 'Download Build Artifacts' From d40974bfa0cbf252801b19142fa534dca80650fa Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Thu, 14 Feb 2019 18:05:59 -0500 Subject: [PATCH 16/34] Add reference based on UseWpf or UseWindowsForms --- Rx.NET/Source/Directory.build.props | 2 +- .../System.Reactive/System.Reactive.csproj | 23 +++++++++++++++++++ .../build/System.Reactive.targets | 10 ++++++++ Rx.NET/Source/src/System.Reactive/build/_._ | 0 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets create mode 100644 Rx.NET/Source/src/System.Reactive/build/_._ diff --git a/Rx.NET/Source/Directory.build.props b/Rx.NET/Source/Directory.build.props index 45fe3fb316..9227ea327e 100644 --- a/Rx.NET/Source/Directory.build.props +++ b/Rx.NET/Source/Directory.build.props @@ -12,7 +12,7 @@ embedded true $(MSBuildThisFileDirectory)ReactiveX.snk - $(NoWarn);1701;1702;CS1591 + $(NoWarn);1701;1702;CS1591;NU5105 en-US false $(MSBuildProjectName.Contains('Tests')) diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj index 9eb16ac10e..0dac04e83b 100644 --- a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj +++ b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj @@ -9,6 +9,7 @@ true true + false @@ -63,5 +64,27 @@ + + + $(TargetsForTfmSpecificBuildOutput);RemoveNetCoreApp3FromNuGet + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets b/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets new file mode 100644 index 0000000000..3c40566374 --- /dev/null +++ b/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets @@ -0,0 +1,10 @@ + + + true + false + + + + + + \ No newline at end of file diff --git a/Rx.NET/Source/src/System.Reactive/build/_._ b/Rx.NET/Source/src/System.Reactive/build/_._ new file mode 100644 index 0000000000..e69de29bb2 From 728cf9bc77dfc224519cdeadde8c4ad1b1277f16 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Thu, 14 Feb 2019 18:10:12 -0500 Subject: [PATCH 17/34] Use build and buildTransitive --- Rx.NET/Source/src/System.Reactive/System.Reactive.csproj | 5 +++-- .../Source/src/System.Reactive/build/System.Reactive.targets | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj index 0dac04e83b..0eceab5632 100644 --- a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj +++ b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj @@ -81,10 +81,11 @@ - - + + + \ No newline at end of file diff --git a/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets b/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets index 3c40566374..4265bf48cd 100644 --- a/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets +++ b/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets @@ -4,7 +4,7 @@ false - + \ No newline at end of file From 3d78b420c1ab2067286787af0d6ec8b1e5d91332 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 09:24:20 -0500 Subject: [PATCH 18/34] Update to latest extras --- Rx.NET/Source/Directory.build.props | 1 - Rx.NET/Source/global.json | 2 +- azure-pipelines.rx.yml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Rx.NET/Source/Directory.build.props b/Rx.NET/Source/Directory.build.props index 9227ea327e..ced3d74921 100644 --- a/Rx.NET/Source/Directory.build.props +++ b/Rx.NET/Source/Directory.build.props @@ -22,7 +22,6 @@ true true latest - 6.1.9 diff --git a/Rx.NET/Source/global.json b/Rx.NET/Source/global.json index 0af6548b41..74a1850cde 100644 --- a/Rx.NET/Source/global.json +++ b/Rx.NET/Source/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.0-preview.21" } } \ No newline at end of file diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index fd1544b24a..ddd1093e0a 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -23,7 +23,7 @@ pr: jobs: - job: Build pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 variables: BuildConfiguration: Release From 6e746eb9b1cff128c9bdd0b6d680b204620509cd Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 09:28:10 -0500 Subject: [PATCH 19/34] Update sdk --- Rx.NET/Source/global.json | 2 +- azure-pipelines.rx.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Rx.NET/Source/global.json b/Rx.NET/Source/global.json index 74a1850cde..dcedd131ef 100644 --- a/Rx.NET/Source/global.json +++ b/Rx.NET/Source/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "3.0.100-preview" + "version": "3.0.100-preview4" }, "msbuild-sdks": { "MSBuild.Sdk.Extras": "2.0.0-preview.21" diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index ddd1093e0a..576a030791 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -32,7 +32,7 @@ jobs: steps: - task: DotNetCoreInstaller@0 inputs: - version: '3.0.100-preview-010184' + version: '3.0.100-preview4-010374' - task: DotNetCoreCLI@2 inputs: From 9cef07016f27c28d0ec2e6c01ad0c5ab6cd9b78f Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 10:08:39 -0500 Subject: [PATCH 20/34] generate binlog --- azure-pipelines.rx.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index 576a030791..8677a4c034 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -48,7 +48,7 @@ jobs: displayName: Build System.Reactive.sln inputs: solution: Rx.NET/Source/System.Reactive.sln - msbuildArguments: /restore /t:build /p:CreatePackage=true /p:NoPackageAnalysis=true /p:PackageOutputPath=$(Build.ArtifactStagingDirectory)\artifacts + msbuildArguments: /restore /t:build /p:CreatePackage=true /p:NoPackageAnalysis=true /p:PackageOutputPath=$(Build.ArtifactStagingDirectory)\artifacts /bl:$(Build.ArtifactStagingDirectory)\artifacts\build.binlog platform: $(BuildPlatform) configuration: $(BuildConfiguration) maximumCpuCount: true @@ -82,9 +82,6 @@ jobs: arguments: -c $(BuildConfiguration) --no-build --no-restore displayName: Run Api Approvals Tests - - task: whitesource.ws-bolt.bolt.wss.WhiteSource Bolt@18 - displayName: 'WhiteSource Bolt' - enabled: false - task: PowerShell@2 displayName: Authenticode Sign Packages @@ -101,6 +98,7 @@ jobs: PathtoPublish: $(Build.ArtifactStagingDirectory)\artifacts ArtifactName: artifacts publishLocation: Container + condition: always() - job: Linux_Test dependsOn: Build From fde4bdee8e400143d59918feff1c507a2d5f55ac Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 12:21:56 -0500 Subject: [PATCH 21/34] add workaround --- azure-pipelines.rx.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index 8677a4c034..ecaba1a2bc 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -44,6 +44,9 @@ jobs: - script: nbgv cloud -a -p Rx.NET/Source displayName: Set Version + - powershell: iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/onovotny/UpdateVsOnAgent/master/Fix-VisualStudioPreviewNuGetSdk.ps1')) + displayName: VS Preview workaround + - task: MSBuild@1 displayName: Build System.Reactive.sln inputs: From db5b0dcf75cdb8d0866a844cb6fccc1b383e4875 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 12:35:18 -0500 Subject: [PATCH 22/34] Use latest SDK to build --- Rx.NET/Source/Directory.build.targets | 3 ++- Rx.NET/Source/src/System.Reactive/System.Reactive.csproj | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Rx.NET/Source/Directory.build.targets b/Rx.NET/Source/Directory.build.targets index 8316f0a75c..397ad43c68 100644 --- a/Rx.NET/Source/Directory.build.targets +++ b/Rx.NET/Source/Directory.build.targets @@ -4,12 +4,13 @@ $(DefineConstants);HAS_TRACE;HAS_WINRT;HAS_WINFORMS;HAS_DISPATCHER;PREFER_ASYNC;HAS_TPL46;DESKTOPCLR - 10.0.16299.0 + 10.0.17763.0 10.0.15063.0 $(DefineConstants);NO_CODE_COVERAGE_ATTRIBUTE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION;NO_THREAD;WINDOWS $(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;WINDOWS + 10.0.17763.0 $(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj index 0eceab5632..fe4e97c06a 100644 --- a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj +++ b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj @@ -3,7 +3,7 @@ netcoreapp3.0;netstandard2.0;net46;uap10.0;uap10.0.16299 false Rx;Reactive;Extensions;Observable;LINQ;Events - Reactive Extensions (Rx) for .NET + Reactive Extensions (Rx) for .NET From 65460efbc3c82b18527bcae3d124d70ec5d79369 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 12:41:51 -0500 Subject: [PATCH 23/34] Remove binlog --- azure-pipelines.rx.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index ecaba1a2bc..5fbc5c76d9 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -51,8 +51,7 @@ jobs: displayName: Build System.Reactive.sln inputs: solution: Rx.NET/Source/System.Reactive.sln - msbuildArguments: /restore /t:build /p:CreatePackage=true /p:NoPackageAnalysis=true /p:PackageOutputPath=$(Build.ArtifactStagingDirectory)\artifacts /bl:$(Build.ArtifactStagingDirectory)\artifacts\build.binlog - platform: $(BuildPlatform) + msbuildArguments: /restore /t:build /p:CreatePackage=true /p:NoPackageAnalysis=true /p:PackageOutputPath=$(Build.ArtifactStagingDirectory)\artifacts configuration: $(BuildConfiguration) maximumCpuCount: true From 31e7b004fcd644cf4c0bb7d4d6fff03b8a260fe7 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 12:50:12 -0500 Subject: [PATCH 24/34] Prevent downgrade --- azure-pipelines.rx.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index 5fbc5c76d9..7218e27a7f 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -114,7 +114,7 @@ jobs: steps: - task: DotNetCoreInstaller@0 inputs: - version: '2.2.103' + version: '2.2.104' - task: DotNetCoreCLI@2 inputs: @@ -128,7 +128,7 @@ jobs: - task: DotNetCoreInstaller@0 inputs: - version: '3.0.100-preview-010184' + version: '3.0.100-preview4-010374' - task: DownloadBuildArtifacts@0 displayName: 'Download Build Artifacts' From 06126ddb8f4f895c0929a51bdc62349d2ce3056d Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 13:16:29 -0500 Subject: [PATCH 25/34] run tests independently due to DotNetCoreInstaller stepping on 2.1/3.0 at the same time --- azure-pipelines.rx.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index 7218e27a7f..e837a201d8 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -166,5 +166,16 @@ jobs: inputs: command: test projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj - arguments: -c $(BuildConfiguration) - displayName: Run Tests on Linux + arguments: -c $(BuildConfiguration) -f netcoreapp3.0 + displayName: Run 3.0 Tests on Linux + + - task: DotNetCoreInstaller@0 + inputs: + version: '2.2.104' + + - task: DotNetCoreCLI@2 + inputs: + command: test + projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj + arguments: -c $(BuildConfiguration) -f netcoreapp2.1 + displayName: Run 2.1 Tests on Linux \ No newline at end of file From 875e54221f62bb6769a923b4c47944ad55c83261 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 16:16:09 -0500 Subject: [PATCH 26/34] Specify TFs --- azure-pipelines.rx.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index e837a201d8..42182e1d9f 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -177,5 +177,5 @@ jobs: inputs: command: test projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj - arguments: -c $(BuildConfiguration) -f netcoreapp2.1 - displayName: Run 2.1 Tests on Linux \ No newline at end of file + arguments: -c $(BuildConfiguration) -f netcoreapp2.1 /p:TargetFrameworks=netcoreapp2.1 + displayName: Run 2.1 Tests on Linux From 8775aa2d25da0d861656b85ededc214043ad75da Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 17:38:43 -0500 Subject: [PATCH 27/34] Workaround https://github.com/dotnet/sdk/issues/2976 --- Rx.NET/Source/Directory.build.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Rx.NET/Source/Directory.build.targets b/Rx.NET/Source/Directory.build.targets index 397ad43c68..ca6f04dea7 100644 --- a/Rx.NET/Source/Directory.build.targets +++ b/Rx.NET/Source/Directory.build.targets @@ -19,6 +19,11 @@ $(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;HAS_WINFORMS;HAS_DISPATCHER;DESKTOPCLR + + + + + From f3ce0f0a1e9acb2c3aab02f7ea6c2afa031fcbea Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 17:52:12 -0500 Subject: [PATCH 28/34] Add WindowsDesktop integration tests --- .../WindowsDesktopTests.csproj | 34 ++++++++++ azure-pipelines.rx.yml | 65 ++++++++++++++++++- 2 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj diff --git a/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj b/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj new file mode 100644 index 0000000000..ea0f1e73e8 --- /dev/null +++ b/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj @@ -0,0 +1,34 @@ + + + netcoreapp3.0 + $(NoWarn);CS0618 + latest + Tests.System.Reactive + Tests.System.Reactive + true + ..\..\Source\ReactiveX.snk + true + true + + + + + $(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;HAS_WINFORMS;HAS_DISPATCHER;DESKTOPCLR + + + + + PreserveNewest + + + + + + + + + + + + + \ No newline at end of file diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index 42182e1d9f..d9cdce6714 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -102,7 +102,7 @@ jobs: publishLocation: Container condition: always() -- job: Linux_Test +- job: Integration_Linux_Tests dependsOn: Build pool: vmImage: ubuntu-16.04 @@ -179,3 +179,66 @@ jobs: projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj arguments: -c $(BuildConfiguration) -f netcoreapp2.1 /p:TargetFrameworks=netcoreapp2.1 displayName: Run 2.1 Tests on Linux + +- job: Integration_WindowsDesktop_Tests + dependsOn: Build + pool: + vmImage: windows-2019 + + variables: + BuildConfiguration: Release + BuildPlatform: Any CPU + + steps: + - task: DotNetCoreInstaller@0 + inputs: + version: '3.0.100-preview4-010374' + + - task: DotNetCoreCLI@2 + inputs: + command: custom + custom: tool + arguments: install --tool-path . nbgv + displayName: Install NBGV tool + + - script: ./nbgv cloud -a -p Rx.NET/Source + displayName: Set Version + + - task: DownloadBuildArtifacts@0 + displayName: 'Download Build Artifacts' + inputs: + artifactName: artifacts + downloadPath: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages + + - powershell: mv $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages/artifacts/*.* $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages + + - task: DotNetCoreCLI@2 + displayName: Update Rx + inputs: + command: custom + projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj + custom: add + arguments: package System.Reactive -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages + + - task: DotNetCoreCLI@2 + displayName: Update Aliases + inputs: + command: custom + projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj + custom: add + arguments: package System.Reactive.Observable.Aliases -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages + + - task: DotNetCoreCLI@2 + displayName: Update Testing + inputs: + command: custom + projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj + custom: add + arguments: package Microsoft.Reactive.Testing -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages + + - task: DotNetCoreCLI@2 + inputs: + command: test + projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj + arguments: -c $(BuildConfiguration) + displayName: Run 3.0 Tests on WindowDesktop From 6de2ebf45e8736c7dd68dd3148182c21c23d562d Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 18:16:37 -0500 Subject: [PATCH 29/34] Fix invoke of tool --- azure-pipelines.rx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index d9cdce6714..de9e43bce0 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -201,7 +201,7 @@ jobs: arguments: install --tool-path . nbgv displayName: Install NBGV tool - - script: ./nbgv cloud -a -p Rx.NET/Source + - script: nbgv cloud -a -p Rx.NET/Source displayName: Set Version - task: DownloadBuildArtifacts@0 From 61c63f85553561f4e520560fcd0c5ef82b27938c Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 18:18:35 -0500 Subject: [PATCH 30/34] Update displayname --- azure-pipelines.rx.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml index de9e43bce0..d675d920f2 100644 --- a/azure-pipelines.rx.yml +++ b/azure-pipelines.rx.yml @@ -137,6 +137,7 @@ jobs: downloadPath: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages - script: mv $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages/artifacts/*.* $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages + displayName: Move packages to LocalPackages directory - task: DotNetCoreCLI@2 displayName: Update Rx @@ -211,6 +212,7 @@ jobs: downloadPath: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages - powershell: mv $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages/artifacts/*.* $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages + displayName: Move packages to LocalPackages directory - task: DotNetCoreCLI@2 displayName: Update Rx From 98ce4e0a6352facc91a3c5798e333ff0cbd04436 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 19:00:58 -0500 Subject: [PATCH 31/34] Fix targets bug --- Rx.NET/Integration/{LinuxTests.sln => IntegrationTests.sln} | 6 ++++++ Rx.NET/Source/src/System.Reactive/System.Reactive.csproj | 4 ++-- .../src/System.Reactive/build/System.Reactive.targets | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) rename Rx.NET/Integration/{LinuxTests.sln => IntegrationTests.sln} (68%) diff --git a/Rx.NET/Integration/LinuxTests.sln b/Rx.NET/Integration/IntegrationTests.sln similarity index 68% rename from Rx.NET/Integration/LinuxTests.sln rename to Rx.NET/Integration/IntegrationTests.sln index 8e58af60b2..597556355f 100644 --- a/Rx.NET/Integration/LinuxTests.sln +++ b/Rx.NET/Integration/IntegrationTests.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.28407.52 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinuxTests", "LinuxTests\LinuxTests.csproj", "{E5607740-EAAC-4A42-B59C-3B2387582559}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsDesktopTests", "WindowsDesktopTests\WindowsDesktopTests.csproj", "{EFAFAEC1-AB20-4B16-8D6C-005052866B3F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {E5607740-EAAC-4A42-B59C-3B2387582559}.Debug|Any CPU.Build.0 = Debug|Any CPU {E5607740-EAAC-4A42-B59C-3B2387582559}.Release|Any CPU.ActiveCfg = Release|Any CPU {E5607740-EAAC-4A42-B59C-3B2387582559}.Release|Any CPU.Build.0 = Release|Any CPU + {EFAFAEC1-AB20-4B16-8D6C-005052866B3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EFAFAEC1-AB20-4B16-8D6C-005052866B3F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EFAFAEC1-AB20-4B16-8D6C-005052866B3F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EFAFAEC1-AB20-4B16-8D6C-005052866B3F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj index fe4e97c06a..3889a1d0c0 100644 --- a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj +++ b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj @@ -81,8 +81,8 @@ - - + + diff --git a/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets b/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets index 4265bf48cd..c209ae2cbf 100644 --- a/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets +++ b/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets @@ -1,10 +1,10 @@ true - false + false - + \ No newline at end of file From 6ee6b114ef18a2df255a2cf241a7d57d0125ec29 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 19:39:58 -0500 Subject: [PATCH 32/34] Ensure dll is in package --- .../src/System.Reactive/System.Reactive.csproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj index 3889a1d0c0..4d13fe0b5c 100644 --- a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj +++ b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj @@ -72,17 +72,17 @@ - + + + + - + - - + - - From 2d5aabd1f8f3194ae6983bb3361120c2de0fc213 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 20:06:16 -0500 Subject: [PATCH 33/34] Fix packaging --- .../src/System.Reactive/System.Reactive.csproj | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj index 4d13fe0b5c..928d4698da 100644 --- a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj +++ b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj @@ -66,20 +66,26 @@ - $(TargetsForTfmSpecificBuildOutput);RemoveNetCoreApp3FromNuGet + $(TargetsForTfmSpecificBuildOutput);RemoveNetCoreApp3FromNuGet + $(TargetsForTfmSpecificContentInPackage);AddNetCore3ToNuGet - - + - + + + + + + + From e127ac4a35357bd10fef0a95fa962116701ec2a9 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 23 Feb 2019 20:25:15 -0500 Subject: [PATCH 34/34] Move Product to targets so AssemblyName is set --- Rx.NET/Source/Directory.build.props | 1 - Rx.NET/Source/Directory.build.targets | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Rx.NET/Source/Directory.build.props b/Rx.NET/Source/Directory.build.props index ced3d74921..f341e380da 100644 --- a/Rx.NET/Source/Directory.build.props +++ b/Rx.NET/Source/Directory.build.props @@ -1,6 +1,5 @@ - $(AssemblyName) ($(TargetFramework)) Copyright (c) .NET Foundation and Contributors. 2.12 true diff --git a/Rx.NET/Source/Directory.build.targets b/Rx.NET/Source/Directory.build.targets index ca6f04dea7..f6bdf9ae16 100644 --- a/Rx.NET/Source/Directory.build.targets +++ b/Rx.NET/Source/Directory.build.targets @@ -1,5 +1,10 @@ + + + $(AssemblyName) ($(TargetFramework)) + + $(DefineConstants);HAS_TRACE;HAS_WINRT;HAS_WINFORMS;HAS_DISPATCHER;PREFER_ASYNC;HAS_TPL46;DESKTOPCLR