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

Commit e33bae0

Browse files
JunTaoLuoJunTaoLuo
authored
1.1.2 patch train updates (#603)
* 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 3676ff6 commit e33bae0

File tree

28 files changed

+67
-61
lines changed

28 files changed

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

‎samples/KeyVaultSample/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"copyToOutput": "settings.json"
77
},
88
"dependencies": {
9-
"Microsoft.Extensions.Configuration": "1.1.0",
10-
"Microsoft.Extensions.Configuration.AzureKeyVault": "1.0.0",
11-
"Microsoft.Extensions.Configuration.Json": "1.1.0",
9+
"Microsoft.Extensions.Configuration": "1.1.1",
10+
"Microsoft.Extensions.Configuration.AzureKeyVault": "1.0.1",
11+
"Microsoft.Extensions.Configuration.Json": "1.1.1",
1212
"NETStandard.Library": "1.6.1"
1313
},
1414
"frameworks": {

‎src/Microsoft.Extensions.Configuration.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.Extensions.Configuration.AzureKeyVault/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.0",
2+
"version": "1.0.1",
33
"buildOptions": {
44
"warningsAsErrors": true,
55
"keyFile": "../../tools/Key.snk",
@@ -19,8 +19,8 @@
1919
},
2020
"dependencies": {
2121
"Microsoft.Azure.KeyVault": "2.0.6",
22-
"Microsoft.Extensions.Configuration": "1.1.0",
23-
"Microsoft.Extensions.Configuration.FileExtensions": "1.1.0",
22+
"Microsoft.Extensions.Configuration": "1.1.1",
23+
"Microsoft.Extensions.Configuration.FileExtensions": "1.1.1",
2424
"Microsoft.IdentityModel.Clients.ActiveDirectory": "3.13.5",
2525
"NETStandard.Library": "1.6.1"
2626
},

‎src/Microsoft.Extensions.Configuration.Binder/project.json‎

Lines changed: 2 additions & 2 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
"keyFile": "../../tools/Key.snk",
@@ -16,7 +16,7 @@
1616
]
1717
},
1818
"dependencies": {
19-
"Microsoft.Extensions.Configuration": "1.1.0",
19+
"Microsoft.Extensions.Configuration": "1.1.1",
2020
"NETStandard.Library": "1.6.1"
2121
},
2222
"frameworks": {

‎src/Microsoft.Extensions.Configuration.CommandLine/project.json‎

Lines changed: 2 additions & 2 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
"keyFile": "../../tools/Key.snk",
@@ -17,7 +17,7 @@
1717
]
1818
},
1919
"dependencies": {
20-
"Microsoft.Extensions.Configuration": "1.1.0",
20+
"Microsoft.Extensions.Configuration": "1.1.1",
2121
"NETStandard.Library": "1.6.1"
2222
},
2323
"frameworks": {

‎src/Microsoft.Extensions.Configuration.EnvironmentVariables/project.json‎

Lines changed: 2 additions & 2 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
"keyFile": "../../tools/Key.snk",
@@ -18,7 +18,7 @@
1818
]
1919
},
2020
"dependencies": {
21-
"Microsoft.Extensions.Configuration": "1.1.0",
21+
"Microsoft.Extensions.Configuration": "1.1.1",
2222
"NETStandard.Library": "1.6.1"
2323
},
2424
"frameworks": {

0 commit comments

Comments
 (0)