Merge pull request #108 from xcomponent/FixDependencePrivateSystem

Fix dependence private System.Reactive.Linq
xcomponent · Jun 27, 2019 · 469016d · 469016d
2 parents 0f3f1a5 + 5ec9175
commit 469016d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,7 +41,7 @@ jobs:
 
   build_reactiveapi:
     docker:
-      - image: microsoft/dotnet:2.1-sdk
+      - image: microsoft/dotnet:2.2-sdk
     steps:
       - *restore_repo
       - *generate_nuget_shasum
@@ -63,7 +63,7 @@ jobs:
 
   build_integration_test:
     docker:
-      - image: xcomponent/mono-dotnet-node-xvfb:1.0.0
+      - image: xcomponent/mono-dotnet-node-xvfb:1.2.0
     steps:
       - *restore_repo
       - *generate_nuget_shasum
@@ -98,7 +98,7 @@ jobs:
 
   deploy_nuget:
     docker:
-      - image: microsoft/dotnet:2.1-sdk
+      - image: microsoft/dotnet:2.2-sdk
     steps:
       - *restore_repo
       - *generate_nuget_shasum

diff --git a/ReactiveXComponent/ReactiveXComponent.csproj b/ReactiveXComponent/ReactiveXComponent.csproj
@@ -22,10 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" PrivateAssets="all" />
-    <PackageReference Include="SuperSocket.ClientEngine" Version="0.10.0" PrivateAssets="all" />
-    <PackageReference Include="System.Reactive.Core" Version="3.1.1" PrivateAssets="all" />
-    <PackageReference Include="System.Reactive.Interfaces" Version="3.1.1" PrivateAssets="all" />
-    <PackageReference Include="System.Reactive.Linq" Version="3.1.1" PrivateAssets="all" />
+    <PackageReference Include="System.Reactive.Linq" Version="4.1.2" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" PrivateAssets="all" />
     <PackageReference Include="RabbitMQ.Client" Version="4.1.3" PrivateAssets="all" />
     <PackageReference Include="WebSocket4Net" Version="0.15.2" PrivateAssets="all" />
@@ -41,6 +38,8 @@
 			<InputAssemblies Include="$(WorkingDirectory)\Newtonsoft.Json.dll" />
 			<InputAssemblies Include="$(WorkingDirectory)\RabbitMQ.Client.dll" />
 			<InputAssemblies Include="$(WorkingDirectory)\WebSocket4Net.dll" />
+			<InputAssemblies Include="$(WorkingDirectory)\System.Reactive.dll" />
+			<InputAssemblies Include="$(WorkingDirectory)\SuperSocket.ClientEngine.dll" />
 		</ItemGroup>
 
     <ILRepack OutputType="$(OutputType)" MainAssembly="$(AssemblyName).dll" OutputAssembly="$(MSBuildThisFileDirectory)\..\packaging\$(AssemblyName).dll" InputAssemblies="@(InputAssemblies)" WilcardInputAssemblies="true" Internalize="true" WorkingDirectory="$(WorkingDirectory)" />

diff --git a/ReactiveXComponentTest/ReactiveXComponentTest.csproj b/ReactiveXComponentTest/ReactiveXComponentTest.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
-    <PackageReference Include="System.Reactive.Linq" Version="3.1.1" />
+    <PackageReference Include="System.Reactive.Linq" Version="4.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="RabbitMQ.Client" Version="4.1.3" />
     <PackageReference Include="WebSocket4Net" Version="0.15.2" />

diff --git a/...XCProjects/HelloWorldV5/CreateInstancesReactiveApi/CreateInstances/CreateInstances.csproj b/...XCProjects/HelloWorldV5/CreateInstancesReactiveApi/CreateInstances/CreateInstances.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Reactive.Linq" Version="3.1.1" />
+    <PackageReference Include="System.Reactive.Linq" Version="4.1.2" />
   </ItemGroup>
 
   <ItemGroup>