huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reacting to JsonParser renames

This commit is contained in:
Pranav K 2015-10-07 11:28:57 -07:00
parent ac6e441f15
commit df66c60e24
11 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NuGet.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<packageSources> <packageSources>
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" /> <add key="AspNetVNext" value="https://www.myget.org/F/aspnetvolatiledev/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" /> <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

2
src/Microsoft.Dnx.Watcher.Core/External/Runtime/FileFormatException.cs vendored
View File

@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Microsoft.Dnx.Runtime.Json; using Microsoft.Extensions.JsonParser.Sources;
namespace Microsoft.Dnx.Runtime namespace Microsoft.Dnx.Runtime
{ {

4
src/Microsoft.Dnx.Watcher.Core/External/Runtime/LockFileReader.cs vendored
View File

@ -4,10 +4,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Runtime.Versioning;
using System.Threading; using System.Threading;
using Microsoft.Dnx.Runtime.Json; using Microsoft.Extensions.JsonParser.Sources;
using NuGet; using NuGet;
namespace Microsoft.Dnx.Runtime namespace Microsoft.Dnx.Runtime

2
src/Microsoft.Dnx.Watcher.Core/External/Runtime/NamedResourceReader.cs vendored
View File

@ -3,7 +3,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using Microsoft.Dnx.Runtime.Json; using Microsoft.Extensions.JsonParser.Sources;
namespace Microsoft.Dnx.Runtime namespace Microsoft.Dnx.Runtime
{ {

2
src/Microsoft.Dnx.Watcher.Core/External/Runtime/PackIncludeEntry.cs vendored
View File

@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Linq; using System.Linq;
using Microsoft.Dnx.Runtime.Json; using Microsoft.Extensions.JsonParser.Sources;
namespace Microsoft.Dnx.Runtime namespace Microsoft.Dnx.Runtime
{ {

21
src/Microsoft.Dnx.Watcher.Core/External/Runtime/PatternGroup.cs vendored
View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Microsoft.Extensions.FileSystemGlobbing; using Microsoft.Extensions.FileSystemGlobbing;
using Microsoft.Dnx.Runtime.Json; using Microsoft.Extensions.JsonParser.Sources;
namespace Microsoft.Dnx.Runtime namespace Microsoft.Dnx.Runtime
{ {
@ -33,15 +33,16 @@ namespace Microsoft.Dnx.Runtime
_matcher.AddExcludePatterns(ExcludePatterns); _matcher.AddExcludePatterns(ExcludePatterns);
} }
internal static PatternGroup Build(JsonObject rawProject, internal static PatternGroup Build(
string projectDirectory, JsonObject rawProject,
string projectFilePath, string projectDirectory,
string name, string projectFilePath,
IEnumerable<string> fallbackIncluding = null, string name,
IEnumerable<string> additionalIncluding = null, IEnumerable<string> fallbackIncluding = null,
IEnumerable<string> additionalExcluding = null, IEnumerable<string> additionalIncluding = null,
bool includePatternsOnly = false, IEnumerable<string> additionalExcluding = null,
ICollection<DiagnosticMessage> warnings = null) bool includePatternsOnly = false,
ICollection<DiagnosticMessage> warnings = null)
{ {
string includePropertyName = name; string includePropertyName = name;
additionalIncluding = additionalIncluding ?? Enumerable.Empty<string>(); additionalIncluding = additionalIncluding ?? Enumerable.Empty<string>();

15
src/Microsoft.Dnx.Watcher.Core/External/Runtime/PatternsCollectionHelper.cs vendored
View File

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Microsoft.Dnx.Runtime.Json; using Microsoft.Extensions.JsonParser.Sources;
namespace Microsoft.Dnx.Runtime namespace Microsoft.Dnx.Runtime
{ {
@ -13,12 +13,13 @@ namespace Microsoft.Dnx.Runtime
{ {
private static readonly char[] PatternSeparator = new[] { ';' }; private static readonly char[] PatternSeparator = new[] { ';' };
public static IEnumerable<string> GetPatternsCollection(JsonObject rawProject, public static IEnumerable<string> GetPatternsCollection(
string projectDirectory, JsonObject rawProject,
string projectFilePath, string projectDirectory,
string propertyName, string projectFilePath,
IEnumerable<string> defaultPatterns = null, string propertyName,
bool literalPath = false) IEnumerable<string> defaultPatterns = null,
bool literalPath = false)
{ {
defaultPatterns = defaultPatterns ?? Enumerable.Empty<string>(); defaultPatterns = defaultPatterns ?? Enumerable.Empty<string>();

4
src/Microsoft.Dnx.Watcher.Core/External/Runtime/ProjectFilesCollection.cs vendored
View File

@ -1,11 +1,9 @@
// Copyright (c) .NET Foundation. All rights reserved. // 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. // 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.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using Microsoft.Extensions.JsonParser.Sources;
using Microsoft.Dnx.Runtime.Json;
namespace Microsoft.Dnx.Runtime namespace Microsoft.Dnx.Runtime
{ {

2
src/Microsoft.Dnx.Watcher.Core/External/Runtime/ProjectReader.cs vendored
View File

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Microsoft.Dnx.Runtime.Json; using Microsoft.Extensions.JsonParser.Sources;
using NuGet; using NuGet;
namespace Microsoft.Dnx.Runtime namespace Microsoft.Dnx.Runtime

1
src/Microsoft.Dnx.Watcher.Core/Impl/Project.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved. // 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. // 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.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;

7
src/Microsoft.Dnx.Watcher.Core/project.json
View File

@ -5,7 +5,7 @@
"Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-*", "Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-*",
"Microsoft.AspNet.FileProviders.Physical": "1.0.0-*", "Microsoft.AspNet.FileProviders.Physical": "1.0.0-*",
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*", "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*",
"Microsoft.Dnx.Runtime.Json.Sources": { "Microsoft.Extensions.JsonParser.Sources": {
"type": "build", "type": "build",
"version": "1.0.0-*" "version": "1.0.0-*"
}, },
@ -27,10 +27,5 @@
"System.Threading.Thread": "4.0.0-beta-*" "System.Threading.Thread": "4.0.0-beta-*"
} }
} }
},
"scripts": {
"postbuild": [
]
} }
} }