# Conflicts:
#	test/Microsoft.AspNetCore.Razor.Test/project.json
This commit is contained in:
Pranav K 2016-06-16 10:18:27 -07:00
Родитель 1d55ed6b50
Коммит eb2b58188a
5 изменённых файлов: 16 добавлений и 16 удалений

Просмотреть файл

@ -1,6 +1,6 @@
{
"description": "Runtime components for rendering Razor pages and implementing tag helpers.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute\r\nMicrosoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute\r\nMicrosoft.AspNetCore.Razor.TagHelpers.ITagHelper",
"version": "1.0.0-*",
"version": "1.1.0-*",
"buildOptions": {
"allowUnsafe": true,
"keyFile": "../../tools/Key.snk",
@ -24,19 +24,19 @@
]
},
"dependencies": {
"Microsoft.AspNetCore.Html.Abstractions": "1.0.0-*",
"Microsoft.AspNetCore.Razor": "1.0.0-*",
"Microsoft.AspNetCore.Html.Abstractions": "1.1.0-*",
"Microsoft.AspNetCore.Razor": "1.1.0-*",
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"type": "build",
"version": "1.0.0-*"
"version": "1.1.0-*"
},
"Microsoft.Extensions.CopyOnWriteDictionary.Sources": {
"type": "build",
"version": "1.0.0-*"
"version": "1.1.0-*"
},
"Microsoft.Extensions.HashCodeCombiner.Sources": {
"type": "build",
"version": "1.0.0-*"
"version": "1.1.0-*"
}
},
"frameworks": {

Просмотреть файл

@ -1,5 +1,5 @@
{
"version": "1.0.0-*",
"version": "1.1.0-*",
"shared": "*.cs",
"dependencies": {
"xunit.assert": "2.1.0-*"

Просмотреть файл

@ -1,6 +1,6 @@
{
"description": "Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure.",
"version": "1.0.0-*",
"version": "1.1.0-*",
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
@ -23,7 +23,7 @@
"dependencies": {
"Microsoft.Extensions.HashCodeCombiner.Sources": {
"type": "build",
"version": "1.0.0-*"
"version": "1.1.0-*"
}
},
"frameworks": {

Просмотреть файл

@ -6,13 +6,13 @@
},
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.AspNetCore.Razor.Runtime": "1.0.0-*",
"Microsoft.AspNetCore.Razor.Runtime": "1.1.0-*",
"Microsoft.AspNetCore.Razor.Test.Sources": {
"version": "1.0.0-*",
"version": "1.1.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Testing": "1.0.0-*",
"Microsoft.Extensions.WebEncoders": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.1.0-*",
"Microsoft.Extensions.WebEncoders": "1.1.0-*",
"xunit": "2.1.0"
},
"testRunner": "xunit",

Просмотреть файл

@ -2,12 +2,12 @@
"version": "1.0.0",
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.AspNetCore.Razor": "1.0.0-*",
"Microsoft.AspNetCore.Razor": "1.1.0-*",
"Microsoft.AspNetCore.Razor.Test.Sources": {
"version": "1.0.0-*",
"version": "1.1.0-*",
"type": "build"
},
"Microsoft.AspNetCore.Testing": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.1.0-*",
"Newtonsoft.Json": "9.0.1",
"xunit": "2.1.0"
},