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

1.1.2 patch train updates #111

Merged
merged 4 commits into from
Feb 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 "$@"
7 changes: 6 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{
"projects": ["src"]
"projects": [
"src"
],
"sdk": {
"version": "1.0.0-preview2-1-003177"
}
}
10 changes: 5 additions & 5 deletions samples/ResponseCachingSample/project.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"dependencies": {
"Microsoft.AspNetCore.ResponseCaching": "1.1.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
"Microsoft.Extensions.Caching.Memory": "1.1.0"
"Microsoft.AspNetCore.ResponseCaching": "1.1.1",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.1",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.1",
"Microsoft.Extensions.Caching.Memory": "1.1.1"
},
"buildOptions": {
"emitEntryPoint": true
Expand All @@ -13,7 +13,7 @@
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0",
"version": "1.1.1",
"type": "platform"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.0",
"version": "1.1.1",
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
Expand Down
12 changes: 6 additions & 6 deletions src/Microsoft.AspNetCore.ResponseCaching/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.0",
"version": "1.1.1",
"buildOptions": {
"warningsAsErrors": true,
"allowUnsafe": true,
Expand All @@ -22,11 +22,11 @@
]
},
"dependencies": {
"Microsoft.AspNetCore.Http": "1.1.0",
"Microsoft.AspNetCore.Http.Extensions": "1.1.0",
"Microsoft.AspNetCore.ResponseCaching.Abstractions": "1.1.0",
"Microsoft.Extensions.Caching.Memory": "1.1.0",
"Microsoft.Extensions.Logging.Abstractions": "1.1.0",
"Microsoft.AspNetCore.Http": "1.1.1",
"Microsoft.AspNetCore.Http.Extensions": "1.1.1",
"Microsoft.AspNetCore.ResponseCaching.Abstractions": "1.1.1",
"Microsoft.Extensions.Caching.Memory": "1.1.1",
"Microsoft.Extensions.Logging.Abstractions": "1.1.1",
"Microsoft.Extensions.TaskCache.Sources": {
"version": "1.1.0-rtm-22752",
"type": "build"
Expand Down
8 changes: 4 additions & 4 deletions test/Microsoft.AspNetCore.ResponseCaching.Tests/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
},
"dependencies": {
"dotnet-test-xunit": "2.2.0-*",
"Microsoft.AspNetCore.ResponseCaching": "1.1.0",
"Microsoft.AspNetCore.TestHost": "1.1.0",
"Microsoft.Extensions.Logging.Testing": "1.1.0-rtm-22752",
"Microsoft.AspNetCore.ResponseCaching": "1.1.1",
"Microsoft.AspNetCore.TestHost": "1.1.1",
"Microsoft.Extensions.Logging.Testing": "1.1.1",
"xunit": "2.2.0-*"
},
"frameworks": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0",
"version": "1.1.1",
"type": "platform"
}
}
Expand Down