Skip to content
This repository was archived by the owner on Mar 19, 2019. It is now read-only.
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
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-release/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<add key="AspNetCore-Patch" value="https://dotnet.myget.org/F/aspnet-1-1-1-patch/api/v3/index.json" />
</packageSources>
</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 "$@"
4 changes: 2 additions & 2 deletions samples/HelloWorld/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.Net.Http.Server": "1.1.1-*"
"Microsoft.Net.Http.Server": "1.1.1"
},
"commands": {
"sample": "HelloWorld"
Expand All @@ -13,7 +13,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 samples/HotAddSample/project.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.AspNetCore.Server.WebListener": "1.1.1-*",
"Microsoft.Extensions.Logging.Console": "1.1.0-*"
"Microsoft.AspNetCore.Server.WebListener": "1.1.1",
"Microsoft.Extensions.Logging.Console": "1.1.1"
},
"buildOptions": {
"emitEntryPoint": true
Expand All @@ -14,7 +14,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 samples/SelfHostServer/project.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.AspNetCore.Server.WebListener": "1.1.1-*",
"Microsoft.Extensions.Logging.Console": "1.1.0-*"
"Microsoft.AspNetCore.Server.WebListener": "1.1.1",
"Microsoft.Extensions.Logging.Console": "1.1.1"
},
"buildOptions": {
"emitEntryPoint": true
Expand All @@ -14,7 +14,7 @@
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",
"version": "1.1.1",
"type": "platform"
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.AspNetCore.Server.WebListener/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.1-*",
"version": "1.1.1",
"description": "ASP.NET Core HTTP server for Windows.",
"packOptions": {
"tags": [
Expand All @@ -8,13 +8,13 @@
]
},
"dependencies": {
"Microsoft.AspNetCore.Hosting": "1.1.0-*",
"Microsoft.AspNetCore.Hosting": "1.1.1",
"Microsoft.Extensions.TaskCache.Sources": {
"version": "1.1.0-*",
"type": "build"
},
"Microsoft.Net.Http.Headers": "1.1.0-*",
"Microsoft.Net.Http.Server": "1.1.1-*",
"Microsoft.Net.Http.Headers": "1.1.1",
"Microsoft.Net.Http.Server": "1.1.1",
"NETStandard.Library": "1.6.1-*"
},
"buildOptions": {
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Net.Http.Server/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.1-*",
"version": "1.1.1",
"description": ".NET HTTP server that uses the Windows HTTP Server API.",
"packOptions": {
"tags": [
Expand All @@ -8,7 +8,7 @@
]
},
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "1.1.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.1.1",
"Microsoft.Extensions.Primitives": "1.1.0-*",
"NETStandard.Library": "1.6.1-*"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"testRunner": "xunit",
"dependencies": {
"dotnet-test-xunit": "2.2.0-*",
"Microsoft.AspNetCore.Server.WebListener": "1.1.1-*",
"Microsoft.AspNetCore.Server.WebListener": "1.1.1",
"Microsoft.AspNetCore.Testing": "1.1.0-*",
"xunit": "2.2.0-*"
},
"frameworks": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.1.0-*",
"version": "1.1.1",
"type": "platform"
},
"System.Net.Http.WinHttpHandler": "4.3.0-*",
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.Net.Http.Server.FunctionalTests/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"dotnet-test-xunit": "2.2.0-*",
"Microsoft.AspNetCore.Testing": "1.1.0-*",
"Microsoft.Net.Http.Server": "1.1.1-*",
"Microsoft.Net.Http.Server": "1.1.1",
"xunit": "2.2.0-*"
},
"frameworks": {
Expand All @@ -18,7 +18,7 @@
"version": "1.1.0-*"
},
"Microsoft.NETCore.App": {
"version": "1.1.0-*",
"version": "1.1.1",
"type": "platform"
},
"System.Net.Http.WinHttpHandler": "4.3.0-*",
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.Net.Http.Server.Tests/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"testRunner": "xunit",
"dependencies": {
"dotnet-test-xunit": "2.2.0-*",
"Microsoft.Net.Http.Server": "1.1.1-*",
"Microsoft.Net.Http.Server": "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