浏览代码

Remove xUnit dependency by internalizing assert source

Oren Novotny 9 年之前
父节点
当前提交
0db2e03a77

+ 1 - 0
NuGet.Config

@@ -2,6 +2,7 @@
 <configuration>
 <configuration>
   <packageSources>
   <packageSources>
     <add key="Build Packages" value="https://www.myget.org/F/c037199d-41df-4567-b966-25ff65324688/api/v3/index.json" />
     <add key="Build Packages" value="https://www.myget.org/F/c037199d-41df-4567-b966-25ff65324688/api/v3/index.json" />
+    <add key="CI Builds (xunit)" value="https://www.myget.org/F/xunit/" />
     <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
     <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   </packageSources>
 </configuration>
 </configuration>

+ 2 - 4
Rx.NET/Source/Microsoft.Reactive.Testing/project.json

@@ -15,7 +15,7 @@
 
 
   "buildOptions": {
   "buildOptions": {
     "keyFile": "../ReactiveX.snk",
     "keyFile": "../ReactiveX.snk",
-    "define": [ "SIGNED" ],
+    "define": [ "SIGNED", "PLATFORM_DOTNET", "XUNIT_VISIBILITY_INTERNAL" ],
     "nowarn": [ "CS1591" ],
     "nowarn": [ "CS1591" ],
     "xmlDoc": true,
     "xmlDoc": true,
     "compile": {
     "compile": {
@@ -26,7 +26,7 @@
   "dependencies": {
   "dependencies": {
     "System.Reactive.Linq": { "target": "project" },
     "System.Reactive.Linq": { "target": "project" },
     "System.Reactive.PlatformServices": { "target": "project" },
     "System.Reactive.PlatformServices": { "target": "project" },
-    "xunit.assert": "2.2.0-beta2-build3300"
+    "xunit.assert.source": "2.2.0-beta3-build3316"
   },
   },
   
   
   "frameworks": {
   "frameworks": {
@@ -77,7 +77,6 @@
       }
       }
     },
     },
     "netstandard1.0": {
     "netstandard1.0": {
-      "imports": ["dotnet", "portable-net45+win8"],
       "buildOptions": {
       "buildOptions": {
         "define": [
         "define": [
           "NO_EVENTARGS_CONSTRAINT",
           "NO_EVENTARGS_CONSTRAINT",
@@ -101,7 +100,6 @@
       }
       }
     },
     },
     "netstandard1.3": {
     "netstandard1.3": {
-      "imports": ["dotnet", "portable-net45+win8"],
       "buildOptions": {
       "buildOptions": {
         "define": [
         "define": [
           "NO_EVENTARGS_CONSTRAINT",
           "NO_EVENTARGS_CONSTRAINT",

+ 0 - 1
Rx.NET/Source/NuSpecs/Microsoft.Reactive.Testing.nuspec

@@ -16,7 +16,6 @@
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <tags>Rx Reactive Extensions Observable LINQ Events</tags>
     <dependencies>
     <dependencies>
       <dependency id="System.Reactive.PlatformServices" version="$version$" />
       <dependency id="System.Reactive.PlatformServices" version="$version$" />
-      <dependency id="xunit.assert" version="2.1.0" />
     </dependencies>
     </dependencies>
   </metadata>
   </metadata>
   <files>
   <files>