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

Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-05-02 14:56:22 -07:00
parent 0b04fa8bde b0e8ffc1f8
commit 238bddbfcd
7 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
samples/IdentitySample.Mvc/project.json
View File

@ -21,7 +21,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.EntityFrameworkCore.Tools":{
"Microsoft.EntityFrameworkCore.Tools": {
"version": "1.0.0-*",
"type": "build"
},
@ -32,7 +32,7 @@
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
"Microsoft.Extensions.Logging.Debug": "1.0.0-*"
},
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},
"frameworks": {
@ -69,8 +69,10 @@
],
"postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
},
"content": [
"appsettings.json",
"web.config"
]
"publishOptions": {
"include": [
"appsettings.json",
"web.config"
]
}
}

22
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/project.json
View File

@ -1,13 +1,7 @@
{
"description": "ASP.NET Core Identity provider that uses Entity Framework Core.",
"tags": [
"aspnetcore",
"entityframeworkcore",
"identity",
"membership"
],
"version": "1.0.0-*",
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [
@ -15,9 +9,17 @@
],
"xmlDoc": true
},
"repository": {
"type": "git",
"url": "git://github.com/aspnet/identity"
"packOptions": {
"repository": {
"type": "git",
"url": "git://github.com/aspnet/identity"
},
"tags": [
"aspnetcore",
"entityframeworkcore",
"identity",
"membership"
]
},
"dependencies": {
"Microsoft.AspNetCore.Identity": "1.0.0-*",

20
src/Microsoft.AspNetCore.Identity/project.json
View File

@ -1,12 +1,7 @@
{
"description": "ASP.NET Core Identity is the membership system for building ASP.NET Core web applications, including membership, login, and user data. ASP.NET Core Identity allows you to add login features to your application and makes it easy to customize data about the logged in user.",
"tags": [
"aspnetcore",
"identity",
"membership"
],
"version": "1.0.0-*",
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [
@ -14,9 +9,16 @@
],
"xmlDoc": true
},
"repository": {
"type": "git",
"url": "git://github.com/aspnet/identity"
"packOptions": {
"repository": {
"type": "git",
"url": "git://github.com/aspnet/identity"
},
"tags": [
"aspnetcore",
"identity",
"membership"
]
},
"dependencies": {
"Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",

4
test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/project.json
View File

@ -1,9 +1,10 @@
{
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Hosting": "1.0.0-*",
"Microsoft.AspNetCore.Http": "1.0.0-*",
@ -22,7 +23,6 @@
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
},

12
test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/project.json
View File

@ -1,12 +1,15 @@
{
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"content": [
"config.json"
],
"publishOptions": {
"include": [
"config.json"
]
},
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.EntityFrameworkCore.InMemory": "1.0.0-*",
"Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-*",
@ -30,7 +33,6 @@
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
},

4
test/Microsoft.AspNetCore.Identity.InMemory.Test/project.json
View File

@ -1,9 +1,10 @@
{
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Authentication": "1.0.0-*",
"Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
@ -23,7 +24,6 @@
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
},

4
test/Microsoft.AspNetCore.Identity.Test/project.json
View File

@ -1,9 +1,10 @@
{
"compilationOptions": {
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Hosting": "1.0.0-*",
"Microsoft.AspNetCore.Http": "1.0.0-*",
@ -22,7 +23,6 @@
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
},
"imports": [