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

Commit b435381

Browse files
authored
1.1.2 patch train updates (#111)
* 1.1.2 patch train updates * Update global.json and NuGet.config * Update Microsoft.NETCore.App to 1.1.1 * Update build scripts
1 parent 8699f47 commit b435381

File tree

8 files changed

+28
-22
lines changed

8 files changed

+28
-22
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 "$@"

global.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
{
2-
"projects": ["src"]
2+
"projects": [
3+
"src"
4+
],
5+
"sdk": {
6+
"version": "1.0.0-preview2-1-003177"
7+
}
38
}

samples/ResponseCachingSample/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"dependencies": {
3-
"Microsoft.AspNetCore.ResponseCaching": "1.1.0",
4-
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
5-
"Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
6-
"Microsoft.Extensions.Caching.Memory": "1.1.0"
3+
"Microsoft.AspNetCore.ResponseCaching": "1.1.1",
4+
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.1",
5+
"Microsoft.AspNetCore.Server.Kestrel": "1.1.1",
6+
"Microsoft.Extensions.Caching.Memory": "1.1.1"
77
},
88
"buildOptions": {
99
"emitEntryPoint": true
@@ -13,7 +13,7 @@
1313
"netcoreapp1.1": {
1414
"dependencies": {
1515
"Microsoft.NETCore.App": {
16-
"version": "1.1.0",
16+
"version": "1.1.1",
1717
"type": "platform"
1818
}
1919
}

src/Microsoft.AspNetCore.ResponseCaching.Abstractions/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.1.0",
2+
"version": "1.1.1",
33
"buildOptions": {
44
"warningsAsErrors": true,
55
"keyFile": "../../tools/Key.snk",

src/Microsoft.AspNetCore.ResponseCaching/project.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.1.0",
2+
"version": "1.1.1",
33
"buildOptions": {
44
"warningsAsErrors": true,
55
"allowUnsafe": true,
@@ -22,11 +22,11 @@
2222
]
2323
},
2424
"dependencies": {
25-
"Microsoft.AspNetCore.Http": "1.1.0",
26-
"Microsoft.AspNetCore.Http.Extensions": "1.1.0",
27-
"Microsoft.AspNetCore.ResponseCaching.Abstractions": "1.1.0",
28-
"Microsoft.Extensions.Caching.Memory": "1.1.0",
29-
"Microsoft.Extensions.Logging.Abstractions": "1.1.0",
25+
"Microsoft.AspNetCore.Http": "1.1.1",
26+
"Microsoft.AspNetCore.Http.Extensions": "1.1.1",
27+
"Microsoft.AspNetCore.ResponseCaching.Abstractions": "1.1.1",
28+
"Microsoft.Extensions.Caching.Memory": "1.1.1",
29+
"Microsoft.Extensions.Logging.Abstractions": "1.1.1",
3030
"Microsoft.Extensions.TaskCache.Sources": {
3131
"version": "1.1.0-rtm-22752",
3232
"type": "build"

test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
},
66
"dependencies": {
77
"dotnet-test-xunit": "2.2.0-*",
8-
"Microsoft.AspNetCore.ResponseCaching": "1.1.0",
9-
"Microsoft.AspNetCore.TestHost": "1.1.0",
10-
"Microsoft.Extensions.Logging.Testing": "1.1.0-rtm-22752",
8+
"Microsoft.AspNetCore.ResponseCaching": "1.1.1",
9+
"Microsoft.AspNetCore.TestHost": "1.1.1",
10+
"Microsoft.Extensions.Logging.Testing": "1.1.1",
1111
"xunit": "2.2.0-*"
1212
},
1313
"frameworks": {
1414
"netcoreapp1.1": {
1515
"dependencies": {
1616
"Microsoft.NETCore.App": {
17-
"version": "1.1.0",
17+
"version": "1.1.1",
1818
"type": "platform"
1919
}
2020
}

0 commit comments

Comments
 (0)