Permalink
Browse files

Ported to .NET Core 1.0 RTM

  • Loading branch information...
1 parent b1650e1 commit 1fe5927ccdf276bc8e042586be33ce49166a27fb @rprouse rprouse committed Jun 29, 2016
View
@@ -2,7 +2,10 @@
<configuration>
<packageSources>
<clear/>
- <add key="CI Builds (AppVeyor)" value="https://ci.appveyor.com/nuget/nunit" />
- <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+ <add key="NUnit AppVeyor CI" value="https://ci.appveyor.com/nuget/nunit" />
+ <add key="NUnit Agent AppVeyor CI" value="https://ci.appveyor.com/nuget/nunit-portable-agent" />
+ <add key="NUNit MyGet Feed" value="https://www.myget.org/F/nunit/api/v2" />
+ <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+ <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
View
@@ -9,7 +9,10 @@
<ToolsOptions>
<ToolsOptionsCategory name="TextEditor">
<ToolsOptionsSubCategory name="CSharp-Specific">
+ <PropertyValue name="AddImport_SuggestForTypesInNuGetPackages">0</PropertyValue>
+ <PropertyValue name="AddImport_SuggestForTypesInReferenceAssemblies">0</PropertyValue>
<PropertyValue name="AutoComment">1</PropertyValue>
+ <PropertyValue name="AutoInsertAsteriskForNewLinesOfBlockComments">1</PropertyValue>
<PropertyValue name="BringUpOnIdentifier">1</PropertyValue>
<PropertyValue name="CSharpClosedFileDiagnostics">-1</PropertyValue>
<PropertyValue name="ClosedFileDiagnostics">-1</PropertyValue>
@@ -81,7 +84,7 @@
<PropertyValue name="Style_PreferIntrinsicPredefinedTypeKeywordInMemberAccess">1</PropertyValue>
<PropertyValue name="Style_QualifyMemberAccessWithThisOrMe">0</PropertyValue>
<PropertyValue name="Style_UseVarWhenDeclaringLocals">1</PropertyValue>
- <PropertyValue name="WarnOnBuildErrors">1</PropertyValue>
+ <PropertyValue name="WarnOnBuildErrors">0</PropertyValue>
<PropertyValue name="WarnWhenMembersCauseCompilerGeneratedReferences">1</PropertyValue>
<PropertyValue name="Wrapping_IgnoreSpacesAroundBinaryOperators">0</PropertyValue>
<PropertyValue name="Wrapping_IgnoreSpacesAroundVariableDeclaration">0</PropertyValue>
View
@@ -1,6 +1,6 @@
{
"projects": [ "src", "test" ],
"sdk": {
- "version": "1.0.0-preview1-002702"
+ "version": "1.0.0-preview2-003121"
}
}
@@ -25,7 +25,7 @@
using Microsoft.Extensions.Testing.Abstractions;
using Newtonsoft.Json;
using NUnit.Common;
-using NUnit.Engine.Compatibility;
+using NUnit.Compatibility;
using NUnit.Engine;
using NUnit.Options;
using NUnit.Runner.Interfaces;
@@ -22,33 +22,20 @@
},
"dependencies": {
- "Microsoft.Extensions.Testing.Abstractions": "1.0.0-preview1-002702",
- "Microsoft.Extensions.DependencyModel": "1.0.0-rc2-final",
- "NUnit.Portable.Agent": "3.3.0-CI-2746-master",
- "NETStandard.Library": "1.5.0-rc2-24027"
+ "Microsoft.Extensions.Testing.Abstractions": "1.0.0-preview2-003121",
+ "Microsoft.Extensions.DependencyModel": "1.0.0",
+ "NUnit.Portable.Agent": "3.4.0.54-PR-6"
},
"frameworks": {
- "netstandard1.5": {
- "imports": [
- "dnxcore50",
- "portable-net45+win8"
- ],
+ "netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.0-rc2-3002702"
- },
- "System.ObjectModel": "4.0.12-rc2-24027",
- "System.Runtime.Loader": "4.0.0-rc2-24027"
+ "version": "1.0.0",
+ "type": "platform"
+ }
}
},
- "net451": {
- "frameworkAssemblies": {
- "System.ObjectModel": "",
- "System.Threading.Tasks": "",
- "System.Xml.XDocument": ""
- }
- }
+ "net451": {}
}
}
@@ -11,25 +11,25 @@
},
"dependencies": {
- "NUnitLite": "3.2.0",
- "dotnet-test-nunit": "3.3.0",
- "dotnet-test-nunit.test": "3.3.0"
+ "NUnitLite": "3.4.0",
+ "dotnet-test-nunit": {
+ "target": "project"
+ },
+ "dotnet-test-nunit.test": {
+ "target": "project"
+ }
},
"frameworks": {
"netcoreapp1.0": {
- "imports": [
- "dnxcore50",
- "netstandard1.5",
- "portable-net45+win8"
- ],
+ "imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
- "version": "1.0.0-rc2-3002702"
+ "version": "1.0.0"
}
}
},
- "net451": { }
+ "net451": {}
}
}
@@ -10,29 +10,23 @@
},
"dependencies": {
- "NUnit": "3.2.0",
- "dotnet-test-nunit": "3.3.0"
+ "NUnit": "3.4.0",
+ "dotnet-test-nunit": {
+ "target": "project"
+ }
},
"testRunner": "nunit",
"frameworks": {
- "netstandard1.5": {
- "imports": [
- "dnxcore50",
- "netstandard1.5",
- "portable-net45+win8"
- ],
+ "netcoreapp1.0": {
+ "imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": {
- "version": "1.0.0-rc2-3002702",
+ "version": "1.0.0",
"type": "platform"
}
}
},
- "net451": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027"
- }
- }
+ "net451": {}
}
}

0 comments on commit 1fe5927

Please sign in to comment.