зеркало из https://github.com/aspnet/MusicStore.git
1.1.2 patch train updates (#741)
* 1.1.2 patch train updates * Update global.json and NuGet.config * Update Microsoft.NETCore.App to 1.1.1 * Update build scripts
This commit is contained in:
Родитель
665245fd7c
Коммит
f4b8700d36
|
@ -4,5 +4,6 @@
|
|||
<clear />
|
||||
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
|
||||
<add key="AspNetCore" value="https://dotnet.myget.org/f/aspnetcore-master/api/v3/index.json" />
|
||||
<add key="AspNetCore-Patch" value="https://dotnet.myget.org/F/aspnet-1-1-1-patch/api/v3/index.json" />
|
||||
</packageSources>
|
||||
</configuration>
|
|
@ -33,7 +33,7 @@ cd $PSScriptRoot
|
|||
$repoFolder = $PSScriptRoot
|
||||
$env:REPO_FOLDER = $repoFolder
|
||||
|
||||
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0.zip"
|
||||
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.2.zip"
|
||||
if ($env:KOREBUILD_ZIP)
|
||||
{
|
||||
$koreBuildZip=$env:KOREBUILD_ZIP
|
||||
|
|
2
build.sh
2
build.sh
|
@ -2,7 +2,7 @@
|
|||
repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
cd $repoFolder
|
||||
|
||||
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0.zip"
|
||||
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.2.zip"
|
||||
if [ ! -z $KOREBUILD_ZIP ]; then
|
||||
koreBuildZip=$KOREBUILD_ZIP
|
||||
fi
|
||||
|
|
10
global.json
10
global.json
|
@ -1,3 +1,9 @@
|
|||
{
|
||||
"projects": [ "samples", "test" ]
|
||||
{
|
||||
"projects": [
|
||||
"samples",
|
||||
"test"
|
||||
],
|
||||
"sdk": {
|
||||
"version": "1.0.0-preview2-1-003177"
|
||||
}
|
||||
}
|
|
@ -44,29 +44,29 @@
|
|||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"Microsoft.AspNetCore": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.Facebook": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.Google": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.Twitter": "1.1.0",
|
||||
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.0",
|
||||
"Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0",
|
||||
"Microsoft.AspNetCore.Mvc": "1.1.0",
|
||||
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0",
|
||||
"Microsoft.AspNetCore.Server.WebListener": "1.1.0",
|
||||
"Microsoft.AspNetCore.Session": "1.1.0",
|
||||
"Microsoft.AspNetCore.StaticFiles": "1.1.0",
|
||||
"Microsoft.EntityFrameworkCore.InMemory": "1.1.0",
|
||||
"Microsoft.EntityFrameworkCore.SqlServer": "1.1.0",
|
||||
"Microsoft.Extensions.Configuration.CommandLine": "1.1.0"
|
||||
"Microsoft.AspNetCore": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.Facebook": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.Google": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.Twitter": "1.1.1",
|
||||
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.1",
|
||||
"Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.1",
|
||||
"Microsoft.AspNetCore.Mvc": "1.1.2",
|
||||
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.2",
|
||||
"Microsoft.AspNetCore.Server.WebListener": "1.1.1",
|
||||
"Microsoft.AspNetCore.Session": "1.1.1",
|
||||
"Microsoft.AspNetCore.StaticFiles": "1.1.1",
|
||||
"Microsoft.EntityFrameworkCore.InMemory": "1.1.1",
|
||||
"Microsoft.EntityFrameworkCore.SqlServer": "1.1.1",
|
||||
"Microsoft.Extensions.Configuration.CommandLine": "1.1.1"
|
||||
},
|
||||
"frameworks": {
|
||||
"netcoreapp1.1": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0"
|
||||
"version": "1.1.1"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,30 +33,30 @@
|
|||
]
|
||||
},
|
||||
"dependencies": {
|
||||
"Microsoft.AspNetCore": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.Facebook": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.Google": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.Twitter": "1.1.0",
|
||||
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.0",
|
||||
"Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0",
|
||||
"Microsoft.AspNetCore.Mvc": "1.1.0",
|
||||
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0",
|
||||
"Microsoft.AspNetCore.Server.WebListener": "1.1.0",
|
||||
"Microsoft.AspNetCore.Session": "1.1.0",
|
||||
"Microsoft.AspNetCore.StaticFiles": "1.1.0",
|
||||
"Microsoft.EntityFrameworkCore.InMemory": "1.1.0",
|
||||
"Microsoft.EntityFrameworkCore.SqlServer": "1.1.0",
|
||||
"Microsoft.Extensions.Configuration.CommandLine": "1.1.0"
|
||||
"Microsoft.AspNetCore": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.Facebook": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.Google": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.Twitter": "1.1.1",
|
||||
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.1",
|
||||
"Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.1",
|
||||
"Microsoft.AspNetCore.Mvc": "1.1.2",
|
||||
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.2",
|
||||
"Microsoft.AspNetCore.Server.WebListener": "1.1.1",
|
||||
"Microsoft.AspNetCore.Session": "1.1.1",
|
||||
"Microsoft.AspNetCore.StaticFiles": "1.1.1",
|
||||
"Microsoft.EntityFrameworkCore.InMemory": "1.1.1",
|
||||
"Microsoft.EntityFrameworkCore.SqlServer": "1.1.1",
|
||||
"Microsoft.Extensions.Configuration.CommandLine": "1.1.1"
|
||||
},
|
||||
"frameworks": {
|
||||
"net451": {},
|
||||
"netcoreapp1.1": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0",
|
||||
"version": "1.1.1",
|
||||
"type": "platform"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,19 +4,19 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"dotnet-test-xunit": "2.2.0-*",
|
||||
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.0",
|
||||
"Microsoft.AspNetCore.Identity": "1.1.0",
|
||||
"Microsoft.AspNetCore.Server.IntegrationTesting": "0.2.0-rtm-22752",
|
||||
"Microsoft.AspNetCore.WebUtilities": "1.1.0",
|
||||
"Microsoft.Extensions.Configuration.Binder": "1.1.0",
|
||||
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
|
||||
"Microsoft.Extensions.Configuration.Json": "1.1.0",
|
||||
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.0",
|
||||
"Microsoft.Extensions.Logging": "1.1.0",
|
||||
"Microsoft.Extensions.Logging.Console": "1.1.0",
|
||||
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.1",
|
||||
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.1",
|
||||
"Microsoft.AspNetCore.Identity": "1.1.1",
|
||||
"Microsoft.AspNetCore.Server.IntegrationTesting": "0.2.1",
|
||||
"Microsoft.AspNetCore.WebUtilities": "1.1.1",
|
||||
"Microsoft.Extensions.Configuration.Binder": "1.1.1",
|
||||
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1",
|
||||
"Microsoft.Extensions.Configuration.Json": "1.1.1",
|
||||
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.1",
|
||||
"Microsoft.Extensions.Logging": "1.1.1",
|
||||
"Microsoft.Extensions.Logging.Console": "1.1.1",
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0",
|
||||
"version": "1.1.1",
|
||||
"type": "platform"
|
||||
},
|
||||
"System.Data.SqlClient": "4.3.0",
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
"dependencies": {
|
||||
"dotnet-test-xunit": "2.2.0-*",
|
||||
"Microsoft.DotNet.InternalAbstractions": "1.0.0",
|
||||
"Microsoft.Extensions.Logging.Testing": "1.1.0-rtm-22752",
|
||||
"Microsoft.Extensions.Logging.Testing": "1.1.1",
|
||||
"MusicStore": "1.1.0-*",
|
||||
"xunit": "2.2.0-*"
|
||||
},
|
||||
|
@ -13,7 +13,7 @@
|
|||
"netcoreapp1.1": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0",
|
||||
"version": "1.1.1",
|
||||
"type": "platform"
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче