diff --git a/AsyncRx.NET/Directory.build.props b/AsyncRx.NET/Directory.build.props
index e0ac9f60cb..966494a6e9 100644
--- a/AsyncRx.NET/Directory.build.props
+++ b/AsyncRx.NET/Directory.build.props
@@ -28,11 +28,11 @@
-
+
-
+
diff --git a/Ix.NET/Source/Benchmarks.System.Interactive/Benchmarks.System.Interactive.csproj b/Ix.NET/Source/Benchmarks.System.Interactive/Benchmarks.System.Interactive.csproj
index 35c397588d..9af2c176e8 100644
--- a/Ix.NET/Source/Benchmarks.System.Interactive/Benchmarks.System.Interactive.csproj
+++ b/Ix.NET/Source/Benchmarks.System.Interactive/Benchmarks.System.Interactive.csproj
@@ -20,7 +20,7 @@
-
+
diff --git a/Ix.NET/Source/Directory.Build.props b/Ix.NET/Source/Directory.Build.props
index 6abea87d85..6a06f36626 100644
--- a/Ix.NET/Source/Directory.Build.props
+++ b/Ix.NET/Source/Directory.Build.props
@@ -26,11 +26,11 @@
-
+
-
+
diff --git a/Rx.NET/Integration/LinuxTests/LinuxTests.csproj b/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
index 10fed3522c..585b989f12 100644
--- a/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
+++ b/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
@@ -24,11 +24,11 @@
-
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/Rx.NET/Integration/NuGet.Config b/Rx.NET/Integration/NuGet.Config
index b7d67e546f..ac5658ca05 100644
--- a/Rx.NET/Integration/NuGet.Config
+++ b/Rx.NET/Integration/NuGet.Config
@@ -1,6 +1,7 @@
-
+
+
diff --git a/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj b/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
index 15386004d7..3cab48abef 100644
--- a/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
+++ b/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
@@ -1,6 +1,6 @@
- netcoreapp3.1;net5.0;net5.0-windows10.0.19041
+ net5.0;net5.0-windows10.0.19041
$(NoWarn);CS0618
latest
Tests.System.Reactive
@@ -8,7 +8,6 @@
true
..\..\Source\ReactiveX.snk
-
true
@@ -29,11 +28,11 @@
-
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/Rx.NET/Source/Directory.build.props b/Rx.NET/Source/Directory.build.props
index 39f2a21da0..966494a6e9 100644
--- a/Rx.NET/Source/Directory.build.props
+++ b/Rx.NET/Source/Directory.build.props
@@ -28,11 +28,11 @@
-
+
-
+
diff --git a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj
index 8696ed3bc5..e8787f2d9e 100644
--- a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj
+++ b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj
@@ -21,7 +21,7 @@
-
+
diff --git a/Rx.NET/Source/global.json b/Rx.NET/Source/global.json
index ab2e2ed2b4..201a03d4e8 100644
--- a/Rx.NET/Source/global.json
+++ b/Rx.NET/Source/global.json
@@ -1,8 +1,5 @@
{
-"sdk": {
- "version": "5.0.100-preview"
- },
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.23"
}
-}
\ No newline at end of file
+}
diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj
index 739869e86f..dac82bde1a 100644
--- a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj
+++ b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj
@@ -188,7 +188,7 @@
-
+
True
True
@@ -200,4 +200,4 @@
-
\ No newline at end of file
+
diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj
index f0cd25d153..5c1418a9fa 100644
--- a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj
+++ b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj
@@ -25,11 +25,11 @@
-
+
-
+
diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj
index 1aa8c7b865..bbdaa11fcc 100644
--- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj
+++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml
index cf3b9859d0..36ccd541f5 100644
--- a/azure-pipelines.rx.yml
+++ b/azure-pipelines.rx.yml
@@ -154,24 +154,8 @@ stages:
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
+ custom: restore
+ arguments: --configfile $(System.DefaultWorkingDirectory)/Rx.NET/Integration/NuGet.Config
- task: DotNetCoreCLI@2
inputs:
@@ -231,24 +215,8 @@ stages:
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
+ custom: restore
+ arguments: --configfile $(System.DefaultWorkingDirectory)/Rx.NET/Integration/NuGet.Config
- task: DotNetCoreCLI@2
inputs: