diff --git a/NuGet.config b/NuGet.config index 03704957e8..cb71c64a79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,7 +1,7 @@  - + \ No newline at end of file diff --git a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/FileFormatException.cs b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/FileFormatException.cs index e895f724f7..0efa1871d1 100644 --- a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/FileFormatException.cs +++ b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/FileFormatException.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.Dnx.Runtime.Json; +using Microsoft.Extensions.JsonParser.Sources; namespace Microsoft.Dnx.Runtime { diff --git a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/LockFileReader.cs b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/LockFileReader.cs index f55b198ace..5cc3821fd9 100644 --- a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/LockFileReader.cs +++ b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/LockFileReader.cs @@ -4,10 +4,8 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Runtime.Versioning; using System.Threading; -using Microsoft.Dnx.Runtime.Json; +using Microsoft.Extensions.JsonParser.Sources; using NuGet; namespace Microsoft.Dnx.Runtime diff --git a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/NamedResourceReader.cs b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/NamedResourceReader.cs index 1970cd4cb7..54bfed296b 100644 --- a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/NamedResourceReader.cs +++ b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/NamedResourceReader.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; -using Microsoft.Dnx.Runtime.Json; +using Microsoft.Extensions.JsonParser.Sources; namespace Microsoft.Dnx.Runtime { diff --git a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/PackIncludeEntry.cs b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/PackIncludeEntry.cs index 0819ffed03..8ba9c19515 100644 --- a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/PackIncludeEntry.cs +++ b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/PackIncludeEntry.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Linq; -using Microsoft.Dnx.Runtime.Json; +using Microsoft.Extensions.JsonParser.Sources; namespace Microsoft.Dnx.Runtime { diff --git a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/PatternGroup.cs b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/PatternGroup.cs index 3479cb6e22..ebdc19bdbf 100644 --- a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/PatternGroup.cs +++ b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/PatternGroup.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using Microsoft.Extensions.FileSystemGlobbing; -using Microsoft.Dnx.Runtime.Json; +using Microsoft.Extensions.JsonParser.Sources; namespace Microsoft.Dnx.Runtime { @@ -33,15 +33,16 @@ namespace Microsoft.Dnx.Runtime _matcher.AddExcludePatterns(ExcludePatterns); } - internal static PatternGroup Build(JsonObject rawProject, - string projectDirectory, - string projectFilePath, - string name, - IEnumerable fallbackIncluding = null, - IEnumerable additionalIncluding = null, - IEnumerable additionalExcluding = null, - bool includePatternsOnly = false, - ICollection warnings = null) + internal static PatternGroup Build( + JsonObject rawProject, + string projectDirectory, + string projectFilePath, + string name, + IEnumerable fallbackIncluding = null, + IEnumerable additionalIncluding = null, + IEnumerable additionalExcluding = null, + bool includePatternsOnly = false, + ICollection warnings = null) { string includePropertyName = name; additionalIncluding = additionalIncluding ?? Enumerable.Empty(); diff --git a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/PatternsCollectionHelper.cs b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/PatternsCollectionHelper.cs index 33cb2f12de..ed3bb607b3 100644 --- a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/PatternsCollectionHelper.cs +++ b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/PatternsCollectionHelper.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using Microsoft.Dnx.Runtime.Json; +using Microsoft.Extensions.JsonParser.Sources; namespace Microsoft.Dnx.Runtime { @@ -13,12 +13,13 @@ namespace Microsoft.Dnx.Runtime { private static readonly char[] PatternSeparator = new[] { ';' }; - public static IEnumerable GetPatternsCollection(JsonObject rawProject, - string projectDirectory, - string projectFilePath, - string propertyName, - IEnumerable defaultPatterns = null, - bool literalPath = false) + public static IEnumerable GetPatternsCollection( + JsonObject rawProject, + string projectDirectory, + string projectFilePath, + string propertyName, + IEnumerable defaultPatterns = null, + bool literalPath = false) { defaultPatterns = defaultPatterns ?? Enumerable.Empty(); diff --git a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/ProjectFilesCollection.cs b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/ProjectFilesCollection.cs index 9ee0056e5c..2fe99407b3 100644 --- a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/ProjectFilesCollection.cs +++ b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/ProjectFilesCollection.cs @@ -1,11 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Collections.Generic; using System.Linq; -using System.Threading; -using Microsoft.Dnx.Runtime.Json; +using Microsoft.Extensions.JsonParser.Sources; namespace Microsoft.Dnx.Runtime { diff --git a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/ProjectReader.cs b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/ProjectReader.cs index b8aeb4734a..0f92fc5bc3 100644 --- a/src/Microsoft.Dnx.Watcher.Core/External/Runtime/ProjectReader.cs +++ b/src/Microsoft.Dnx.Watcher.Core/External/Runtime/ProjectReader.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using Microsoft.Dnx.Runtime.Json; +using Microsoft.Extensions.JsonParser.Sources; using NuGet; namespace Microsoft.Dnx.Runtime diff --git a/src/Microsoft.Dnx.Watcher.Core/Impl/Project.cs b/src/Microsoft.Dnx.Watcher.Core/Impl/Project.cs index a863154ce2..a2a3a8a450 100644 --- a/src/Microsoft.Dnx.Watcher.Core/Impl/Project.cs +++ b/src/Microsoft.Dnx.Watcher.Core/Impl/Project.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/src/Microsoft.Dnx.Watcher.Core/project.json b/src/Microsoft.Dnx.Watcher.Core/project.json index 4158b1a243..2a9b6ca875 100644 --- a/src/Microsoft.Dnx.Watcher.Core/project.json +++ b/src/Microsoft.Dnx.Watcher.Core/project.json @@ -5,7 +5,7 @@ "Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-*", "Microsoft.AspNet.FileProviders.Physical": "1.0.0-*", "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*", - "Microsoft.Dnx.Runtime.Json.Sources": { + "Microsoft.Extensions.JsonParser.Sources": { "type": "build", "version": "1.0.0-*" }, @@ -27,10 +27,5 @@ "System.Threading.Thread": "4.0.0-beta-*" } } - }, - - "scripts": { - "postbuild": [ - ] } }