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

Commit c8c545e

Browse files
authored
1.1.2 patch train updates (#67)
* 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 7a487a8 commit c8c545e

File tree

6 files changed

+18
-10
lines changed

6 files changed

+18
-10
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: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
{
2-
"projects": ["src", "test/WebSites", "samples"]
3-
}
2+
"projects": [
3+
"src",
4+
"test/WebSites",
5+
"samples"
6+
],
7+
"sdk": {
8+
"version": "1.0.0-preview2-1-003177"
9+
}
10+
}

src/Microsoft.AspNetCore.JsonPatch/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
"description": "ASP.NET Core support for JSON PATCH.",
44
"buildOptions": {
55
"warningsAsErrors": true,

test/Microsoft.AspNetCore.JsonPatch.Test/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"dependencies": {
66
"dotnet-test-xunit": "2.2.0-*",
7-
"Microsoft.AspNetCore.JsonPatch": "1.1.0",
7+
"Microsoft.AspNetCore.JsonPatch": "1.1.1",
88
"Microsoft.AspNetCore.Testing": "1.1.0-rtm-22752",
99
"Moq": "4.6.36-*",
1010
"xunit": "2.2.0-*"
@@ -14,7 +14,7 @@
1414
"netcoreapp1.1": {
1515
"dependencies": {
1616
"Microsoft.NETCore.App": {
17-
"version": "1.1.0",
17+
"version": "1.1.1",
1818
"type": "platform"
1919
},
2020
"System.Diagnostics.TraceSource": "4.3.0"

0 commit comments

Comments
 (0)