Skip to content
This repository was archived by the owner on Dec 14, 2018. It is now read-only.

Commit 6087916

Browse files
JunTaoLuoJunTaoLuo
authored
1.1.2 patch train updates (#5808)
* 1.1.2 patch train updates * Update global.json and NuGet.config * Update Microsoft.NETCore.App to 1.1.1 * Update build scripts * Update core-setup-packages
1 parent 29647fd commit 6087916

File tree

55 files changed

+274
-273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+274
-273
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
<clear />
55
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
66
<add key="AspNetCore" value="https://dotnet.myget.org/f/aspnetcore-master/api/v3/index.json" />
7+
<add key="AspNetCore-Patch" value="https://dotnet.myget.org/F/aspnet-1-1-1-patch/api/v3/index.json" />
78
</packageSources>
8-
</configuration>
9+
</configuration>

‎build.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cd $PSScriptRoot
3333
$repoFolder = $PSScriptRoot
3434
$env:REPO_FOLDER = $repoFolder
3535

36-
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0.zip"
36+
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.2.zip"
3737
if ($env:KOREBUILD_ZIP)
3838
{
3939
$koreBuildZip=$env:KOREBUILD_ZIP
@@ -64,4 +64,4 @@ if (!(Test-Path $buildFolder)) {
6464
}
6565
}
6666

67-
&"$buildFile" $args
67+
&"$buildFile" $args

‎build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
33
cd $repoFolder
44

5-
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0.zip"
5+
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.2.zip"
66
if [ ! -z $KOREBUILD_ZIP ]; then
77
koreBuildZip=$KOREBUILD_ZIP
88
fi
@@ -43,4 +43,4 @@ if test ! -d $buildFolder; then
4343
fi
4444
fi
4545

46-
$buildFile -r $repoFolder "$@"
46+
$buildFile -r $repoFolder "$@"

‎samples/MvcSandbox/project.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
"preserveCompilationContext": true
66
},
77
"dependencies": {
8-
"Microsoft.AspNetCore.Diagnostics": "1.1.0",
9-
"Microsoft.AspNetCore.Mvc": "1.1.0",
8+
"Microsoft.AspNetCore.Diagnostics": "1.1.1",
9+
"Microsoft.AspNetCore.Mvc": "1.1.2",
1010
"Microsoft.AspNetCore.Razor.Tools": {
1111
"type": "build",
1212
"version": "1.1.0-preview4-final"
1313
},
14-
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
15-
"Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
16-
"Microsoft.AspNetCore.StaticFiles": "1.1.0",
17-
"Microsoft.Extensions.Configuration.Json": "1.1.0",
18-
"Microsoft.Extensions.Logging.Console": "1.1.0"
14+
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.1",
15+
"Microsoft.AspNetCore.Server.Kestrel": "1.1.1",
16+
"Microsoft.AspNetCore.StaticFiles": "1.1.1",
17+
"Microsoft.Extensions.Configuration.Json": "1.1.1",
18+
"Microsoft.Extensions.Logging.Console": "1.1.1"
1919
},
2020
"publishOptions": {
2121
"include": [
@@ -33,7 +33,7 @@
3333
"netcoreapp1.1": {
3434
"dependencies": {
3535
"Microsoft.NETCore.App": {
36-
"version": "1.1.0",
36+
"version": "1.1.1",
3737
"type": "platform"
3838
}
3939
}

‎src/Microsoft.AspNetCore.Mvc.Abstractions/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "ASP.NET Core MVC abstractions and interfaces for action invocation and dispatching, authorization, action filters, formatters, model binding, routing, validation, and more.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.IActionResult",
3-
"version": "1.1.0",
3+
"version": "1.1.2",
44
"packOptions": {
55
"repository": {
66
"type": "git",
@@ -20,7 +20,7 @@
2020
"xmlDoc": true
2121
},
2222
"dependencies": {
23-
"Microsoft.AspNetCore.Routing.Abstractions": "1.1.0",
23+
"Microsoft.AspNetCore.Routing.Abstractions": "1.1.1",
2424
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
2525
"version": "1.1.0-rtm-22752",
2626
"type": "build"
@@ -37,7 +37,7 @@
3737
"version": "1.1.0-rtm-22752",
3838
"type": "build"
3939
},
40-
"Microsoft.Net.Http.Headers": "1.1.0",
40+
"Microsoft.Net.Http.Headers": "1.1.1",
4141
"NETStandard.Library": "1.6.1"
4242
},
4343
"frameworks": {

‎src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "ASP.NET Core MVC API explorer functionality for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.",
3-
"version": "1.1.0",
3+
"version": "1.1.2",
44
"packOptions": {
55
"repository": {
66
"type": "git",
@@ -20,7 +20,7 @@
2020
"xmlDoc": true
2121
},
2222
"dependencies": {
23-
"Microsoft.AspNetCore.Mvc.Core": "1.1.0",
23+
"Microsoft.AspNetCore.Mvc.Core": "1.1.2",
2424
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
2525
"version": "1.1.0-rtm-22752",
2626
"type": "build"

‎src/Microsoft.AspNetCore.Mvc.Core/project.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "ASP.NET Core MVC core components. Contains common action result types, attribute routing, application model conventions, API explorer, application parts, filters, formatters, model binding, and more.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.AreaAttribute\r\nMicrosoft.AspNetCore.Mvc.BindAttribute\r\nMicrosoft.AspNetCore.Mvc.ControllerBase\r\nMicrosoft.AspNetCore.Mvc.FromBodyAttribute\r\nMicrosoft.AspNetCore.Mvc.FromFormAttribute\r\nMicrosoft.AspNetCore.Mvc.RequireHttpsAttribute\r\nMicrosoft.AspNetCore.Mvc.RouteAttribute",
3-
"version": "1.1.0",
3+
"version": "1.1.2",
44
"packOptions": {
55
"repository": {
66
"type": "git",
@@ -20,27 +20,27 @@
2020
"xmlDoc": true
2121
},
2222
"dependencies": {
23-
"Microsoft.AspNetCore.Authorization": "1.1.0",
24-
"Microsoft.AspNetCore.Hosting.Abstractions": "1.1.0",
25-
"Microsoft.AspNetCore.Http": "1.1.0",
26-
"Microsoft.AspNetCore.Mvc.Abstractions": "1.1.0",
27-
"Microsoft.AspNetCore.ResponseCaching.Abstractions": "1.1.0",
28-
"Microsoft.AspNetCore.Routing": "1.1.0",
23+
"Microsoft.AspNetCore.Authorization": "1.1.1",
24+
"Microsoft.AspNetCore.Hosting.Abstractions": "1.1.1",
25+
"Microsoft.AspNetCore.Http": "1.1.1",
26+
"Microsoft.AspNetCore.Mvc.Abstractions": "1.1.2",
27+
"Microsoft.AspNetCore.ResponseCaching.Abstractions": "1.1.1",
28+
"Microsoft.AspNetCore.Routing": "1.1.1",
2929
"Microsoft.AspNetCore.Routing.DecisionTree.Sources": {
3030
"type": "build",
31-
"version": "1.1.0-rtm-22752"
31+
"version": "1.1.1"
3232
},
3333
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
3434
"version": "1.1.0-rtm-22752",
3535
"type": "build"
3636
},
37-
"Microsoft.Extensions.DependencyModel": "1.1.0",
37+
"Microsoft.Extensions.DependencyModel": "1.1.1",
3838
"Microsoft.Extensions.FileProviders.Abstractions": "1.1.0",
3939
"Microsoft.Extensions.HashCodeCombiner.Sources": {
4040
"type": "build",
4141
"version": "1.1.0-rtm-22752"
4242
},
43-
"Microsoft.Extensions.Logging.Abstractions": "1.1.0",
43+
"Microsoft.Extensions.Logging.Abstractions": "1.1.1",
4444
"Microsoft.Extensions.PlatformAbstractions": "1.1.0",
4545
"Microsoft.Extensions.PropertyActivator.Sources": {
4646
"version": "1.1.0-rtm-22752",

‎src/Microsoft.AspNetCore.Mvc.Cors/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "ASP.NET Core MVC cross-origin resource sharing (CORS) features.",
3-
"version": "1.1.0",
3+
"version": "1.1.2",
44
"packOptions": {
55
"repository": {
66
"type": "git",
@@ -21,8 +21,8 @@
2121
"xmlDoc": true
2222
},
2323
"dependencies": {
24-
"Microsoft.AspNetCore.Cors": "1.1.0",
25-
"Microsoft.AspNetCore.Mvc.Core": "1.1.0",
24+
"Microsoft.AspNetCore.Cors": "1.1.1",
25+
"Microsoft.AspNetCore.Mvc.Core": "1.1.2",
2626
"NETStandard.Library": "1.6.1"
2727
},
2828
"frameworks": {

‎src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "ASP.NET Core MVC metadata and validation system using System.ComponentModel.DataAnnotations.",
3-
"version": "1.1.0",
3+
"version": "1.1.2",
44
"packOptions": {
55
"repository": {
66
"type": "git",
@@ -20,7 +20,7 @@
2020
"xmlDoc": true
2121
},
2222
"dependencies": {
23-
"Microsoft.AspNetCore.Mvc.Core": "1.1.0",
23+
"Microsoft.AspNetCore.Mvc.Core": "1.1.2",
2424
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
2525
"version": "1.1.0-rtm-22752",
2626
"type": "build"
@@ -29,7 +29,7 @@
2929
"version": "1.1.0-rtm-22752",
3030
"type": "build"
3131
},
32-
"Microsoft.Extensions.Localization": "1.1.0",
32+
"Microsoft.Extensions.Localization": "1.1.1",
3333
"NETStandard.Library": "1.6.1"
3434
},
3535
"frameworks": {

‎src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "ASP.NET Core MVC formatters for JSON input and output and for JSON PATCH input using Json.NET.",
3-
"version": "1.1.0",
3+
"version": "1.1.2",
44
"packOptions": {
55
"repository": {
66
"type": "git",
@@ -21,8 +21,8 @@
2121
"xmlDoc": true
2222
},
2323
"dependencies": {
24-
"Microsoft.AspNetCore.JsonPatch": "1.1.0",
25-
"Microsoft.AspNetCore.Mvc.Core": "1.1.0",
24+
"Microsoft.AspNetCore.JsonPatch": "1.1.1",
25+
"Microsoft.AspNetCore.Mvc.Core": "1.1.2",
2626
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
2727
"version": "1.1.0-rtm-22752",
2828
"type": "build"

0 commit comments

Comments
 (0)