diff --git a/samples/MvcSandbox/project.json b/samples/MvcSandbox/project.json index cef764e716..889d0bc382 100644 --- a/samples/MvcSandbox/project.json +++ b/samples/MvcSandbox/project.json @@ -33,7 +33,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json b/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json index b23af5fed6..b1cb0c4766 100644 --- a/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json @@ -37,16 +37,15 @@ "version": "1.1.0-*", "type": "build" }, - "Microsoft.Net.Http.Headers": "1.1.0-*" + "Microsoft.Net.Http.Headers": "1.1.0-*", + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": {}, "netstandard1.3": { "dependencies": { - "Microsoft.CSharp": "4.0.1-*", - "System.ComponentModel.TypeConverter": "4.1.0-*", - "System.Reflection.Extensions": "4.0.1-*", - "System.Text.Encoding.Extensions": "4.0.11-*" + "Microsoft.CSharp": "4.3.0-*", + "System.ComponentModel.TypeConverter": "4.3.0-*" } } } diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json index f984265174..f0eb36896a 100644 --- a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json +++ b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json @@ -21,14 +21,15 @@ }, "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "1.1.0-*", + "Microsoft.Extensions.ClosedGenericMatcher.Sources": { + "version": "1.1.0-*", + "type": "build" + }, "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.1.0-*", "type": "build" }, - "Microsoft.Extensions.ClosedGenericMatcher.Sources": { - "version": "1.1.0-*", - "type": "build" - } + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": {}, diff --git a/src/Microsoft.AspNetCore.Mvc.Core/project.json b/src/Microsoft.AspNetCore.Mvc.Core/project.json index a0858c18df..64203d282e 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Core/project.json @@ -22,24 +22,24 @@ "dependencies": { "Microsoft.AspNetCore.Authorization": "1.1.0-*", "Microsoft.AspNetCore.Hosting.Abstractions": "1.1.0-*", - "Microsoft.AspNetCore.Mvc.Abstractions": "1.1.0-*", "Microsoft.AspNetCore.Http": "1.1.0-*", + "Microsoft.AspNetCore.Mvc.Abstractions": "1.1.0-*", "Microsoft.AspNetCore.Routing": "1.1.0-*", "Microsoft.AspNetCore.Routing.DecisionTree.Sources": { "type": "build", "version": "1.1.0-*" }, - "Microsoft.Extensions.FileProviders.Abstractions": "1.1.0-*", - "Microsoft.Extensions.DependencyModel": "1.0.1-*", "Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.1.0-*", "type": "build" }, - "Microsoft.Extensions.Logging.Abstractions": "1.1.0-*", + "Microsoft.Extensions.DependencyModel": "1.1.0-*", + "Microsoft.Extensions.FileProviders.Abstractions": "1.1.0-*", "Microsoft.Extensions.HashCodeCombiner.Sources": { "type": "build", "version": "1.1.0-*" }, + "Microsoft.Extensions.Logging.Abstractions": "1.1.0-*", "Microsoft.Extensions.PlatformAbstractions": "1.1.0-*", "Microsoft.Extensions.PropertyActivator.Sources": { "version": "1.1.0-*", @@ -53,15 +53,12 @@ "version": "1.1.0-*", "type": "build" }, - "System.Buffers": "4.0.0-*", - "System.Diagnostics.DiagnosticSource": "4.0.0-*" + "NETStandard.Library": "1.6.1-*", + "System.Buffers": "4.3.0-*", + "System.Diagnostics.DiagnosticSource": "4.3.0-*" }, "frameworks": { "net451": {}, - "netstandard1.6": { - "dependencies": { - "System.Text.Encoding": "4.0.11-*" - } - } + "netstandard1.6": {} } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/project.json b/src/Microsoft.AspNetCore.Mvc.Cors/project.json index 6252cc3ba1..d223b41bdc 100644 --- a/src/Microsoft.AspNetCore.Mvc.Cors/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Cors/project.json @@ -22,7 +22,8 @@ }, "dependencies": { "Microsoft.AspNetCore.Cors": "1.1.0-*", - "Microsoft.AspNetCore.Mvc.Core": "1.1.0-*" + "Microsoft.AspNetCore.Mvc.Core": "1.1.0-*", + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": {}, diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json index d11610751a..fc29fba029 100644 --- a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json +++ b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json @@ -29,7 +29,8 @@ "version": "1.1.0-*", "type": "build" }, - "Microsoft.Extensions.Localization": "1.1.0-*" + "Microsoft.Extensions.Localization": "1.1.0-*", + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": { @@ -39,7 +40,7 @@ }, "netstandard1.6": { "dependencies": { - "System.ComponentModel.Annotations": "4.1.0-*" + "System.ComponentModel.Annotations": "4.3.0-*" } } } diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json index 61a6b6331c..e2e81d16be 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json @@ -26,7 +26,8 @@ "Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.1.0-*", "type": "build" - } + }, + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": {}, diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json index 146a6bb4b6..3c19dcb0d2 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json @@ -29,7 +29,8 @@ "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.1.0-*", "type": "build" - } + }, + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": { @@ -40,8 +41,8 @@ }, "netstandard1.6": { "dependencies": { - "System.Runtime.Serialization.Xml": "4.1.1-*", - "System.Xml.XmlSerializer": "4.0.11-*" + "System.Runtime.Serialization.Xml": "4.3.0-*", + "System.Xml.XmlSerializer": "4.3.0-*" } } } diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/project.json b/src/Microsoft.AspNetCore.Mvc.Localization/project.json index f614b64795..a710532e88 100644 --- a/src/Microsoft.AspNetCore.Mvc.Localization/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Localization/project.json @@ -17,7 +17,8 @@ "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.1.0-*", "type": "build" - } + }, + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": {}, diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json index 884256c9af..7632f84862 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json @@ -28,16 +28,14 @@ "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.1.0-*", "type": "build" - } + }, + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": {}, "netstandard1.6": { "dependencies": { - "System.Collections.Concurrent": "4.0.12-*", - "System.ComponentModel.TypeConverter": "4.1.0-*", - "System.Reflection.Extensions": "4.0.1-*", - "System.Text.Encoding.Extensions": "4.0.11-*" + "System.ComponentModel.TypeConverter": "4.3.0-*" } } } diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/project.json b/src/Microsoft.AspNetCore.Mvc.Razor/project.json index 49d6da3c18..1875c4fd17 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Razor/project.json @@ -24,7 +24,7 @@ "dependencies": { "Microsoft.AspNetCore.Mvc.Razor.Host": "1.1.0-*", "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.1.0-*", - "Microsoft.CodeAnalysis.CSharp": "1.3.0-*", + "Microsoft.CodeAnalysis.CSharp": "1.3.0", "Microsoft.Extensions.FileProviders.Composite": "1.1.0-*", "Microsoft.Extensions.HashCodeCombiner.Sources": { "version": "1.1.0-*", @@ -37,7 +37,8 @@ "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.1.0-*", "type": "build" - } + }, + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": { @@ -45,8 +46,7 @@ }, "netstandard1.6": { "dependencies": { - "System.Text.Encoding": "4.0.11-*", - "System.Runtime.Loader": "4.0.0-*" + "System.Runtime.Loader": "4.3.0-*" } } } diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json b/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json index 87d4181402..9609b40880 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json @@ -23,9 +23,13 @@ }, "dependencies": { "Microsoft.AspNetCore.Mvc.Razor": "1.1.0-*", - "Microsoft.Extensions.Caching.Memory": "1.1.0-*", "Microsoft.AspNetCore.Routing.Abstractions": "1.1.0-*", + "Microsoft.Extensions.Caching.Memory": "1.1.0-*", "Microsoft.Extensions.FileSystemGlobbing": "1.1.0-*", + "Microsoft.Extensions.HashCodeCombiner.Sources": { + "version": "1.1.0-*", + "type": "build" + }, "Microsoft.Extensions.Logging.Abstractions": { "version": "1.1.0-*", "type": "build" @@ -35,10 +39,7 @@ "version": "1.1.0-*", "type": "build" }, - "Microsoft.Extensions.HashCodeCombiner.Sources": { - "version": "1.1.0-*", - "type": "build" - } + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": {}, diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json index 28b40ac98c..8eff014664 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json @@ -52,14 +52,15 @@ "type": "build" }, "Microsoft.Extensions.WebEncoders": "1.1.0-*", + "NETStandard.Library": "1.6.1-*", "Newtonsoft.Json": "9.0.1", - "System.Buffers": "4.0.0-*" + "System.Buffers": "4.3.0-*" }, "frameworks": { "net451": {}, "netstandard1.6": { "dependencies": { - "System.Runtime.Serialization.Primitives": "4.1.1-*" + "System.Runtime.Serialization.Primitives": "4.3.0-*" } } } diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json index de5ec734e4..b0a5fb885e 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json @@ -21,14 +21,15 @@ "xmlDoc": true }, "dependencies": { + "Microsoft.AspNet.WebApi.Client": "5.2.2", "Microsoft.AspNetCore.Mvc.Core": "1.1.0-*", "Microsoft.AspNetCore.Mvc.Formatters.Json": "1.1.0-*", - "Microsoft.AspNet.WebApi.Client": "5.2.2", "Microsoft.AspNetCore.WebUtilities": "1.1.0-*", "Microsoft.Extensions.PropertyHelper.Sources": { "type": "build", "version": "1.1.0-*" - } + }, + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": { @@ -43,9 +44,8 @@ "portable-net451+win8" ], "dependencies": { - "System.Net.Http": "4.1.0-*", - "System.Runtime.Serialization.Xml": "4.1.1-*", - "System.Xml.XmlSerializer": "4.0.11-*" + "System.Runtime.Serialization.Xml": "4.3.0-*", + "System.Xml.XmlSerializer": "4.3.0-*" } } } diff --git a/src/Microsoft.AspNetCore.Mvc/project.json b/src/Microsoft.AspNetCore.Mvc/project.json index 7eca389451..fc61b2fd7b 100644 --- a/src/Microsoft.AspNetCore.Mvc/project.json +++ b/src/Microsoft.AspNetCore.Mvc/project.json @@ -33,7 +33,8 @@ "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.1.0-*", "type": "build" - } + }, + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": {}, diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json index a18cf84237..a1f3fa054f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json @@ -15,10 +15,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json index b01e5c385b..b06ceda19f 100644 --- a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json @@ -20,10 +20,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json index 15d0596e7d..f90cdd5316 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json @@ -20,8 +20,8 @@ "Microsoft.AspNetCore.Testing": "1.1.0-*", "Microsoft.Extensions.DependencyInjection": "1.1.0-*", "Microsoft.Extensions.DiagnosticAdapter": "1.1.0-*", - "Microsoft.Extensions.Logging.Testing": "1.1.0-*", "Microsoft.Extensions.Logging": "1.1.0-*", + "Microsoft.Extensions.Logging.Testing": "1.1.0-*", "Moq": "4.6.36-*", "xunit": "2.2.0-*" }, @@ -30,11 +30,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*", - "System.Xml.XmlDocument": "4.0.1-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json index f07d0877cd..d77daaf9b9 100644 --- a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json @@ -22,10 +22,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsMetadataProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsMetadataProviderTest.cs index c1705739d4..1aed4aaaa0 100644 --- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsMetadataProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsMetadataProviderTest.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Microsoft.AspNetCore.Testing; -using Microsoft.DotNet.InternalAbstractions; +using Microsoft.Extensions.Internal; using Microsoft.Extensions.Localization; using Moq; using Xunit; diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorTest.cs b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorTest.cs index 9475575c29..977d730b2f 100644 --- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorTest.cs @@ -8,8 +8,8 @@ using System.Linq; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; -using Microsoft.DotNet.InternalAbstractions; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Internal; using Microsoft.Extensions.Localization; using Moq; using Xunit; diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json index 05893591d9..2d1a081ca8 100644 --- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json @@ -13,6 +13,10 @@ }, "Microsoft.AspNetCore.Testing": "1.1.0-*", "Microsoft.Extensions.DependencyInjection": "1.1.0-*", + "Microsoft.Extensions.HashCodeCombiner.Sources": { + "version": "1.1.0-*", + "type": "build" + }, "Microsoft.Extensions.Logging.Testing": "1.1.0-*", "Moq": "4.6.36-*", "xunit": "2.2.0-*" @@ -22,10 +26,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json index f07d0877cd..d77daaf9b9 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json @@ -22,10 +22,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json index 7569348029..2f60dffcf9 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json @@ -21,10 +21,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json index d67bb07b10..e37ad827a4 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json @@ -10,12 +10,12 @@ "warningsAsErrors": true }, "dependencies": { - "dotnet-test-xunit": "2.2.0-*", "ApiExplorerWebSite": "1.0.0", "ApplicationModelWebSite": "1.0.0", "BasicWebSite": "1.0.0", "ControllersFromServicesWebSite": "1.0.0", "CorsWebSite": "1.0.0", + "dotnet-test-xunit": "2.2.0-*", "ErrorPageMiddlewareWebSite": "1.0.0", "FilesWebSite": "1.0.0", "FiltersWebSite": "1.0.0", @@ -48,7 +48,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } }, diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json index 9861ec9312..5a5dc435d4 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json @@ -21,10 +21,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json index 320ea75c89..7742e758c9 100644 --- a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json @@ -20,10 +20,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json index 62f4903728..438e1f6e66 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json @@ -32,10 +32,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json index 4c263e1f3a..9b4b3387a5 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json @@ -42,10 +42,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json index 1e00cfe66a..ec3499e913 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json @@ -24,10 +24,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Test/project.json index 7e55c8df1a..fb41489ea8 100644 --- a/test/Microsoft.AspNetCore.Mvc.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Test/project.json @@ -16,11 +16,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*", - "System.Xml.XmlDocument": "4.0.1-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.TestCommon/project.json b/test/Microsoft.AspNetCore.Mvc.TestCommon/project.json index d68c27b2ed..ceb965b62b 100644 --- a/test/Microsoft.AspNetCore.Mvc.TestCommon/project.json +++ b/test/Microsoft.AspNetCore.Mvc.TestCommon/project.json @@ -5,7 +5,7 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.Runtime": "4.1.0-*" + "NETStandard.Library": "1.6.1-*" } } } diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json b/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json index d68c27b2ed..ceb965b62b 100644 --- a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json +++ b/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json @@ -5,7 +5,7 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.Runtime": "4.1.0-*" + "NETStandard.Library": "1.6.1-*" } } } diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json index 43fe69e823..7856a6232b 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json @@ -29,10 +29,10 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json index 71d5099278..ef6a09073f 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json @@ -7,8 +7,8 @@ "Microsoft.AspNetCore.Http": "1.1.0-*", "Microsoft.AspNetCore.Mvc.WebApiCompatShim": "1.1.0-*", "Microsoft.AspNetCore.Testing": "1.1.0-*", - "Microsoft.Extensions.Logging.Testing": "1.1.0-*", "Microsoft.Extensions.DependencyInjection": "1.1.0-*", + "Microsoft.Extensions.Logging.Testing": "1.1.0-*", "Moq": "4.6.36-*", "xunit": "2.2.0-*" }, @@ -20,10 +20,10 @@ ], "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } }, "net451": {} diff --git a/test/WebSites/ApiExplorerWebSite/project.json b/test/WebSites/ApiExplorerWebSite/project.json index 8a65b590db..1aad9d1944 100644 --- a/test/WebSites/ApiExplorerWebSite/project.json +++ b/test/WebSites/ApiExplorerWebSite/project.json @@ -4,11 +4,11 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.Mvc": "1.1.0-*", "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*", "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.StaticFiles": "1.1.0-*" }, "frameworks": { @@ -16,7 +16,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/ApplicationModelWebSite/project.json b/test/WebSites/ApplicationModelWebSite/project.json index 82123732ac..37b1ecaaed 100644 --- a/test/WebSites/ApplicationModelWebSite/project.json +++ b/test/WebSites/ApplicationModelWebSite/project.json @@ -4,10 +4,10 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.Mvc": "1.1.0-*", "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.StaticFiles": "1.1.0-*" }, "frameworks": { @@ -15,7 +15,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/BasicWebSite/project.json b/test/WebSites/BasicWebSite/project.json index dae648b358..fa4d80c904 100644 --- a/test/WebSites/BasicWebSite/project.json +++ b/test/WebSites/BasicWebSite/project.json @@ -21,7 +21,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/ControllersFromServicesWebSite/project.json b/test/WebSites/ControllersFromServicesWebSite/project.json index 37c631a952..1e7b94d98f 100644 --- a/test/WebSites/ControllersFromServicesWebSite/project.json +++ b/test/WebSites/ControllersFromServicesWebSite/project.json @@ -19,7 +19,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/CorsWebSite/project.json b/test/WebSites/CorsWebSite/project.json index a6f192c0a6..4130b019d2 100644 --- a/test/WebSites/CorsWebSite/project.json +++ b/test/WebSites/CorsWebSite/project.json @@ -9,12 +9,12 @@ ] }, "dependencies": { - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.Cors": "1.1.0-*", "Microsoft.AspNetCore.Mvc": "1.1.0-*", "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*", "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.StaticFiles": "1.1.0-*" }, "frameworks": { @@ -22,7 +22,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/project.json b/test/WebSites/ErrorPageMiddlewareWebSite/project.json index 33ee8d3308..9b49a7c5a4 100644 --- a/test/WebSites/ErrorPageMiddlewareWebSite/project.json +++ b/test/WebSites/ErrorPageMiddlewareWebSite/project.json @@ -4,11 +4,11 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.Diagnostics": "1.1.0-*", "Microsoft.AspNetCore.Mvc": "1.1.0-*", "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.StaticFiles": "1.1.0-*" }, "frameworks": { @@ -16,7 +16,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/FilesWebSite/project.json b/test/WebSites/FilesWebSite/project.json index ade04ce5a9..2b559baf97 100644 --- a/test/WebSites/FilesWebSite/project.json +++ b/test/WebSites/FilesWebSite/project.json @@ -7,10 +7,10 @@ } }, "dependencies": { - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.Mvc": "1.1.0-*", "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.StaticFiles": "1.1.0-*", "Microsoft.Extensions.FileProviders.Embedded": "1.1.0-*" }, @@ -19,7 +19,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/FiltersWebSite/project.json b/test/WebSites/FiltersWebSite/project.json index bfdea36c89..8cfa9fbb86 100644 --- a/test/WebSites/FiltersWebSite/project.json +++ b/test/WebSites/FiltersWebSite/project.json @@ -4,12 +4,12 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.Authentication": "1.1.0-*", "Microsoft.AspNetCore.Mvc": "1.1.0-*", "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*", "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.StaticFiles": "1.1.0-*" }, "frameworks": { @@ -17,7 +17,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/FormatterWebSite/project.json b/test/WebSites/FormatterWebSite/project.json index 8a65b590db..1aad9d1944 100644 --- a/test/WebSites/FormatterWebSite/project.json +++ b/test/WebSites/FormatterWebSite/project.json @@ -4,11 +4,11 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.Mvc": "1.1.0-*", "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*", "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", "Microsoft.AspNetCore.StaticFiles": "1.1.0-*" }, "frameworks": { @@ -16,7 +16,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/HtmlGenerationWebSite/project.json b/test/WebSites/HtmlGenerationWebSite/project.json index 4aa7880ed6..fff9fbaaca 100644 --- a/test/WebSites/HtmlGenerationWebSite/project.json +++ b/test/WebSites/HtmlGenerationWebSite/project.json @@ -6,20 +6,20 @@ "dependencies": { "Microsoft.AspNetCore.Mvc": "1.1.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0-*", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNetCore.Razor.Tools": { "type": "build", "version": "1.0.0-*" }, "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0" + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*" }, "frameworks": { "net451": {}, "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json index 8cef6baa62..e55096d64c 100644 --- a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json +++ b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json @@ -4,14 +4,11 @@ "Microsoft.AspNetCore.Http.Extensions": "1.1.0-*", "Microsoft.AspNetCore.Testing": "1.1.0-*", "Microsoft.Extensions.Configuration": "1.1.0-*", - "Microsoft.Extensions.DependencyInjection": "1.1.0-*" + "Microsoft.Extensions.DependencyInjection": "1.1.0-*", + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "net451": {}, - "netstandard1.3": { - "dependencies": { - "NETStandard.Library": "1.6.0-*" - } - } + "netstandard1.3": {} } } \ No newline at end of file diff --git a/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json index d4cb473139..fd653858bb 100644 --- a/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json +++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json @@ -16,7 +16,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/RazorWebSite/project.json b/test/WebSites/RazorWebSite/project.json index dc6e9516ef..04e6d11786 100644 --- a/test/WebSites/RazorWebSite/project.json +++ b/test/WebSites/RazorWebSite/project.json @@ -35,7 +35,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/RoutingWebSite/project.json b/test/WebSites/RoutingWebSite/project.json index 833fd04d9f..37b1ecaaed 100644 --- a/test/WebSites/RoutingWebSite/project.json +++ b/test/WebSites/RoutingWebSite/project.json @@ -15,7 +15,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/SimpleWebSite/project.json b/test/WebSites/SimpleWebSite/project.json index 8026c5ec15..9ab72abc81 100644 --- a/test/WebSites/SimpleWebSite/project.json +++ b/test/WebSites/SimpleWebSite/project.json @@ -13,7 +13,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/TagHelpersWebSite/project.json b/test/WebSites/TagHelpersWebSite/project.json index 8211cd4d13..b2005c4bf3 100644 --- a/test/WebSites/TagHelpersWebSite/project.json +++ b/test/WebSites/TagHelpersWebSite/project.json @@ -21,7 +21,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/UserClassLibrary/project.json b/test/WebSites/UserClassLibrary/project.json index 3201c54257..8bac81db53 100644 --- a/test/WebSites/UserClassLibrary/project.json +++ b/test/WebSites/UserClassLibrary/project.json @@ -3,7 +3,7 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.Runtime": "4.1.0-*" + "NETStandard.Library": "1.6.1-*" } } } diff --git a/test/WebSites/VersioningWebSite/project.json b/test/WebSites/VersioningWebSite/project.json index 833fd04d9f..37b1ecaaed 100644 --- a/test/WebSites/VersioningWebSite/project.json +++ b/test/WebSites/VersioningWebSite/project.json @@ -15,7 +15,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" } } diff --git a/test/WebSites/WebApiCompatShimWebSite/project.json b/test/WebSites/WebApiCompatShimWebSite/project.json index 36021982da..4f5c79deb3 100644 --- a/test/WebSites/WebApiCompatShimWebSite/project.json +++ b/test/WebSites/WebApiCompatShimWebSite/project.json @@ -17,11 +17,10 @@ "imports": "portable-net451+win8", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" }, - "System.Diagnostics.TraceSource": "4.0.0-*", - "System.Diagnostics.Tracing": "4.1.0-*" + "System.Diagnostics.TraceSource": "4.3.0-*" } } }, diff --git a/test/WebSites/XmlFormattersWebSite/project.json b/test/WebSites/XmlFormattersWebSite/project.json index 218875b1f2..1aad9d1944 100644 --- a/test/WebSites/XmlFormattersWebSite/project.json +++ b/test/WebSites/XmlFormattersWebSite/project.json @@ -16,10 +16,9 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.1.0-*", "type": "platform" - }, - "System.Linq.Queryable": "4.0.1-*" + } } } },