Merge branch 'release' into dev
This commit is contained in:
commit
80f794657d
|
|
@ -5,6 +5,7 @@
|
||||||
"keyFile": "../../tools/Key.snk"
|
"keyFile": "../../tools/Key.snk"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"Microsoft.NETCore.Platforms": "1.0.1-*",
|
||||||
"Microsoft.AspNetCore.Razor.Runtime": "1.0.0-*",
|
"Microsoft.AspNetCore.Razor.Runtime": "1.0.0-*",
|
||||||
"Microsoft.AspNetCore.Razor.Test.Sources": {
|
"Microsoft.AspNetCore.Razor.Test.Sources": {
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"resource": "TestFiles/**/*",
|
"resource": "TestFiles/**/*",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"Microsoft.NETCore.Platforms": "1.0.1-*",
|
||||||
"Microsoft.AspNetCore.Razor": "1.0.0-*",
|
"Microsoft.AspNetCore.Razor": "1.0.0-*",
|
||||||
"Microsoft.AspNetCore.Razor.Test.Sources": {
|
"Microsoft.AspNetCore.Razor.Test.Sources": {
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue