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

Commit

Permalink
1.1.2 patch train updates (#5808)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
JunTaoLuo authored Feb 16, 2017
1 parent 29647fd commit 6087916
Show file tree
Hide file tree
Showing 55 changed files with 274 additions and 273 deletions.
3 changes: 2 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</configuration>
4 changes: 2 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -64,4 +64,4 @@ if (!(Test-Path $buildFolder)) {
}
}

&"$buildFile" $args
&"$buildFile" $args
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -43,4 +43,4 @@ if test ! -d $buildFolder; then
fi
fi

$buildFile -r $repoFolder "$@"
$buildFile -r $repoFolder "$@"
16 changes: 8 additions & 8 deletions samples/MvcSandbox/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"preserveCompilationContext": true
},
"dependencies": {
"Microsoft.AspNetCore.Diagnostics": "1.1.0",
"Microsoft.AspNetCore.Mvc": "1.1.0",
"Microsoft.AspNetCore.Diagnostics": "1.1.1",
"Microsoft.AspNetCore.Mvc": "1.1.2",
"Microsoft.AspNetCore.Razor.Tools": {
"type": "build",
"version": "1.1.0-preview4-final"
},
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
"Microsoft.AspNetCore.StaticFiles": "1.1.0",
"Microsoft.Extensions.Configuration.Json": "1.1.0",
"Microsoft.Extensions.Logging.Console": "1.1.0"
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.1",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.1",
"Microsoft.AspNetCore.StaticFiles": "1.1.1",
"Microsoft.Extensions.Configuration.Json": "1.1.1",
"Microsoft.Extensions.Logging.Console": "1.1.1"
},
"publishOptions": {
"include": [
Expand All @@ -33,7 +33,7 @@
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0",
"version": "1.1.1",
"type": "platform"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.AspNetCore.Mvc.Abstractions/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"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",
"version": "1.1.0",
"version": "1.1.2",
"packOptions": {
"repository": {
"type": "git",
Expand All @@ -20,7 +20,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Routing.Abstractions": "1.1.0",
"Microsoft.AspNetCore.Routing.Abstractions": "1.1.1",
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
Expand All @@ -37,7 +37,7 @@
"version": "1.1.0-rtm-22752",
"type": "build"
},
"Microsoft.Net.Http.Headers": "1.1.0",
"Microsoft.Net.Http.Headers": "1.1.1",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"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.",
"version": "1.1.0",
"version": "1.1.2",
"packOptions": {
"repository": {
"type": "git",
Expand All @@ -20,7 +20,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Mvc.Core": "1.1.0",
"Microsoft.AspNetCore.Mvc.Core": "1.1.2",
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
Expand Down
20 changes: 10 additions & 10 deletions src/Microsoft.AspNetCore.Mvc.Core/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"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",
"version": "1.1.0",
"version": "1.1.2",
"packOptions": {
"repository": {
"type": "git",
Expand All @@ -20,27 +20,27 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Authorization": "1.1.0",
"Microsoft.AspNetCore.Hosting.Abstractions": "1.1.0",
"Microsoft.AspNetCore.Http": "1.1.0",
"Microsoft.AspNetCore.Mvc.Abstractions": "1.1.0",
"Microsoft.AspNetCore.ResponseCaching.Abstractions": "1.1.0",
"Microsoft.AspNetCore.Routing": "1.1.0",
"Microsoft.AspNetCore.Authorization": "1.1.1",
"Microsoft.AspNetCore.Hosting.Abstractions": "1.1.1",
"Microsoft.AspNetCore.Http": "1.1.1",
"Microsoft.AspNetCore.Mvc.Abstractions": "1.1.2",
"Microsoft.AspNetCore.ResponseCaching.Abstractions": "1.1.1",
"Microsoft.AspNetCore.Routing": "1.1.1",
"Microsoft.AspNetCore.Routing.DecisionTree.Sources": {
"type": "build",
"version": "1.1.0-rtm-22752"
"version": "1.1.1"
},
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
},
"Microsoft.Extensions.DependencyModel": "1.1.0",
"Microsoft.Extensions.DependencyModel": "1.1.1",
"Microsoft.Extensions.FileProviders.Abstractions": "1.1.0",
"Microsoft.Extensions.HashCodeCombiner.Sources": {
"type": "build",
"version": "1.1.0-rtm-22752"
},
"Microsoft.Extensions.Logging.Abstractions": "1.1.0",
"Microsoft.Extensions.Logging.Abstractions": "1.1.1",
"Microsoft.Extensions.PlatformAbstractions": "1.1.0",
"Microsoft.Extensions.PropertyActivator.Sources": {
"version": "1.1.0-rtm-22752",
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.AspNetCore.Mvc.Cors/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"description": "ASP.NET Core MVC cross-origin resource sharing (CORS) features.",
"version": "1.1.0",
"version": "1.1.2",
"packOptions": {
"repository": {
"type": "git",
Expand All @@ -21,8 +21,8 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Cors": "1.1.0",
"Microsoft.AspNetCore.Mvc.Core": "1.1.0",
"Microsoft.AspNetCore.Cors": "1.1.1",
"Microsoft.AspNetCore.Mvc.Core": "1.1.2",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"description": "ASP.NET Core MVC metadata and validation system using System.ComponentModel.DataAnnotations.",
"version": "1.1.0",
"version": "1.1.2",
"packOptions": {
"repository": {
"type": "git",
Expand All @@ -20,7 +20,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Mvc.Core": "1.1.0",
"Microsoft.AspNetCore.Mvc.Core": "1.1.2",
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
Expand All @@ -29,7 +29,7 @@
"version": "1.1.0-rtm-22752",
"type": "build"
},
"Microsoft.Extensions.Localization": "1.1.0",
"Microsoft.Extensions.Localization": "1.1.1",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"description": "ASP.NET Core MVC formatters for JSON input and output and for JSON PATCH input using Json.NET.",
"version": "1.1.0",
"version": "1.1.2",
"packOptions": {
"repository": {
"type": "git",
Expand All @@ -21,8 +21,8 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.JsonPatch": "1.1.0",
"Microsoft.AspNetCore.Mvc.Core": "1.1.0",
"Microsoft.AspNetCore.JsonPatch": "1.1.1",
"Microsoft.AspNetCore.Mvc.Core": "1.1.2",
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"description": "ASP.NET Core MVC formatters for XML input and output using DataContractSerializer and XmlSerializer.",
"version": "1.1.0",
"version": "1.1.2",
"packOptions": {
"repository": {
"type": "git",
Expand All @@ -21,7 +21,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Mvc.Core": "1.1.0",
"Microsoft.AspNetCore.Mvc.Core": "1.1.2",
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.AspNetCore.Mvc.Localization/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"description": "ASP.NET Core MVC features that enable globalization and localization of applications.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.Localization.IHtmlLocalizer<TResource>\r\nMicrosoft.AspNetCore.Mvc.Localization.IViewLocalizer",
"version": "1.1.0",
"version": "1.1.2",
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
Expand All @@ -10,10 +10,10 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Localization": "1.1.0",
"Microsoft.AspNetCore.Mvc.Razor": "1.1.0",
"Microsoft.AspNetCore.Localization": "1.1.1",
"Microsoft.AspNetCore.Mvc.Razor": "1.1.2",
"Microsoft.Extensions.DependencyInjection": "1.1.0",
"Microsoft.Extensions.Localization": "1.1.0",
"Microsoft.Extensions.Localization": "1.1.1",
"Microsoft.Extensions.PropertyHelper.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"description": "ASP.NET Core MVC design time hosting infrastructure for the Razor view engine.",
"version": "1.1.0",
"version": "1.1.2",
"packOptions": {
"repository": {
"type": "git",
Expand All @@ -22,8 +22,8 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Razor.Runtime": "1.1.0",
"Microsoft.Extensions.Caching.Memory": "1.1.0",
"Microsoft.AspNetCore.Razor.Runtime": "1.1.1",
"Microsoft.Extensions.Caching.Memory": "1.1.1",
"Microsoft.Extensions.FileProviders.Physical": "1.1.0",
"Microsoft.Extensions.PropertyHelper.Sources": {
"version": "1.1.0-rtm-22752",
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.AspNetCore.Mvc.Razor/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"description": "ASP.NET Core MVC Razor view engine for CSHTML files.",
"version": "1.1.0",
"version": "1.1.2",
"packOptions": {
"repository": {
"type": "git",
Expand All @@ -22,8 +22,8 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Mvc.Razor.Host": "1.1.0",
"Microsoft.AspNetCore.Mvc.ViewFeatures": "1.1.0",
"Microsoft.AspNetCore.Mvc.Razor.Host": "1.1.2",
"Microsoft.AspNetCore.Mvc.ViewFeatures": "1.1.2",
"Microsoft.CodeAnalysis.CSharp": "1.3.0",
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"version": "1.1.0-rtm-22752",
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"description": "ASP.NET Core MVC default tag helpers. Contains tag helpers for anchor tags, HTML input elements, caching, scripts, links (for CSS), and more.",
"version": "1.1.0",
"version": "1.1.2",
"packOptions": {
"repository": {
"type": "git",
Expand All @@ -22,9 +22,9 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Mvc.Razor": "1.1.0",
"Microsoft.AspNetCore.Routing.Abstractions": "1.1.0",
"Microsoft.Extensions.Caching.Memory": "1.1.0",
"Microsoft.AspNetCore.Mvc.Razor": "1.1.2",
"Microsoft.AspNetCore.Routing.Abstractions": "1.1.1",
"Microsoft.Extensions.Caching.Memory": "1.1.1",
"Microsoft.Extensions.FileSystemGlobbing": "1.1.0",
"Microsoft.Extensions.HashCodeCombiner.Sources": {
"version": "1.1.0-rtm-22752",
Expand Down
18 changes: 9 additions & 9 deletions src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"description": "ASP.NET Core MVC view rendering features. Contains common types used in most MVC applications as well as view rendering features such as view engines, views, view components, and HTML helpers.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.Controller\r\nMicrosoft.AspNetCore.Mvc.ValidateAntiForgeryTokenAttribute\r\nMicrosoft.AspNetCore.Mvc.ViewComponent",
"version": "1.1.0",
"version": "1.1.2",
"packOptions": {
"repository": {
"type": "git",
Expand All @@ -21,16 +21,16 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.AspNetCore.Antiforgery": "1.1.0",
"Microsoft.AspNetCore.Antiforgery": "1.1.1",
"Microsoft.AspNetCore.ChunkingCookieManager.Sources": {
"version": "1.1.0-rtm-22752",
"version": "1.1.1",
"type": "build"
},
"Microsoft.AspNetCore.Diagnostics.Abstractions": "1.1.0",
"Microsoft.AspNetCore.Html.Abstractions": "1.1.0",
"Microsoft.AspNetCore.Mvc.Core": "1.1.0",
"Microsoft.AspNetCore.Mvc.DataAnnotations": "1.1.0",
"Microsoft.AspNetCore.Mvc.Formatters.Json": "1.1.0",
"Microsoft.AspNetCore.Diagnostics.Abstractions": "1.1.1",
"Microsoft.AspNetCore.Html.Abstractions": "1.1.1",
"Microsoft.AspNetCore.Mvc.Core": "1.1.2",
"Microsoft.AspNetCore.Mvc.DataAnnotations": "1.1.2",
"Microsoft.AspNetCore.Mvc.Formatters.Json": "1.1.2",
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
Expand All @@ -51,7 +51,7 @@
"version": "1.1.0-rtm-22752",
"type": "build"
},
"Microsoft.Extensions.WebEncoders": "1.1.0",
"Microsoft.Extensions.WebEncoders": "1.1.1",
"NETStandard.Library": "1.6.1",
"Newtonsoft.Json": "9.0.1",
"System.Buffers": "4.3.0"
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"description": "Provides compatibility in ASP.NET Core MVC with ASP.NET Web API 2 to simplify migration of existing Web API implementations.\r\nCommonly used types:\r\nSystem.Web.Http.ApiController",
"version": "1.1.0",
"version": "1.1.2",
"packOptions": {
"repository": {
"type": "git",
Expand All @@ -22,9 +22,9 @@
},
"dependencies": {
"Microsoft.AspNet.WebApi.Client": "5.2.2",
"Microsoft.AspNetCore.Mvc.Core": "1.1.0",
"Microsoft.AspNetCore.Mvc.Formatters.Json": "1.1.0",
"Microsoft.AspNetCore.WebUtilities": "1.1.0",
"Microsoft.AspNetCore.Mvc.Core": "1.1.2",
"Microsoft.AspNetCore.Mvc.Formatters.Json": "1.1.2",
"Microsoft.AspNetCore.WebUtilities": "1.1.1",
"Microsoft.Extensions.PropertyHelper.Sources": {
"type": "build",
"version": "1.1.0-rtm-22752"
Expand Down
Loading

0 comments on commit 6087916

Please sign in to comment.