From fe9da3c57b18407a61df1f8a6d9851bf7b8407e1 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 8 May 2018 16:34:37 -0700 Subject: [PATCH] Revert "Don't touch product repos" This reverts commit 8e9f05b90229333981149836b07f27f135f4c8bc. --- Directory.Build.targets | 5 +- build/dependencies.props | 53 +++++++++---------- build/repo.props | 3 +- korebuild-lock.txt | 4 +- samples/Http2SampleApp/Dockerfile | 2 +- samples/Http2SampleApp/Http2SampleApp.csproj | 2 +- .../Http2SampleApp/scripts/build-docker.ps1 | 2 +- .../Http2SampleApp/scripts/build-docker.sh | 2 +- .../LargeResponseApp/LargeResponseApp.csproj | 2 +- samples/PlaintextApp/PlaintextApp.csproj | 4 +- samples/SampleApp/SampleApp.csproj | 4 +- samples/SystemdTestApp/SystemdTestApp.csproj | 4 +- .../Adapter/Internal/RawStream.cs | 2 +- src/Kestrel.Core/Internal/Http/MessageBody.cs | 2 +- test/Directory.Build.props | 4 +- .../HttpRequestStreamTests.cs | 2 +- .../GeneratedCodeTests.cs | 2 +- .../HttpsConnectionAdapterTests.cs | 6 +-- test/SystemdActivation/docker.sh | 4 +- 19 files changed, 52 insertions(+), 57 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 78626b773e..53b3f6e1da 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,10 +1,7 @@ - + $(MicrosoftNETCoreApp20PackageVersion) $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) $(NETStandardLibrary20PackageVersion) - - 99.9 diff --git a/build/dependencies.props b/build/dependencies.props index 4ac90bf045..99ca909e09 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,39 +1,38 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 0.10.13 - 2.2.0-preview1-17048 + 2.2.0-preview1-17047 1.10.0 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 2.0.0 2.2.0-preview1-26424-04 - 2.2.0-preview1-26502-01 - 2.2.0-preview1-34140 + 2.2.0-preview1-34135 15.6.1 4.7.49 2.0.3 diff --git a/build/repo.props b/build/repo.props index fb1ef593d7..2c858d96cf 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,4 +1,4 @@ - + @@ -11,6 +11,5 @@ - diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 2573a03995..a16d4b9ee4 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17048 -commithash:de14a0ee5fb48508ee8a29c14280a2928f8dabf8 +version:2.2.0-preview1-17047 +commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c diff --git a/samples/Http2SampleApp/Dockerfile b/samples/Http2SampleApp/Dockerfile index a3d9cd697f..e93d563bde 100644 --- a/samples/Http2SampleApp/Dockerfile +++ b/samples/Http2SampleApp/Dockerfile @@ -9,6 +9,6 @@ ARG CONFIGURATION=Debug WORKDIR /app -COPY ./bin/${CONFIGURATION}/netcoreapp2.2/publish/ /app +COPY ./bin/${CONFIGURATION}/netcoreapp2.0/publish/ /app ENTRYPOINT [ "/usr/bin/dotnet", "/app/Http2SampleApp.dll" ] diff --git a/samples/Http2SampleApp/Http2SampleApp.csproj b/samples/Http2SampleApp/Http2SampleApp.csproj index 7a2f07145f..cd660a6c80 100644 --- a/samples/Http2SampleApp/Http2SampleApp.csproj +++ b/samples/Http2SampleApp/Http2SampleApp.csproj @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp2.1 false true diff --git a/samples/Http2SampleApp/scripts/build-docker.ps1 b/samples/Http2SampleApp/scripts/build-docker.ps1 index 375aea994b..eda82ace6f 100644 --- a/samples/Http2SampleApp/scripts/build-docker.ps1 +++ b/samples/Http2SampleApp/scripts/build-docker.ps1 @@ -1,3 +1,3 @@ -dotnet publish --framework netcoreapp2.2 "$PSScriptRoot/../Http2SampleApp.csproj" +dotnet publish --framework netcoreapp2.0 "$PSScriptRoot/../Http2SampleApp.csproj" docker build -t kestrel-http2-sample (Convert-Path "$PSScriptRoot/..") diff --git a/samples/Http2SampleApp/scripts/build-docker.sh b/samples/Http2SampleApp/scripts/build-docker.sh index 7ca38313d7..ca226f0b53 100755 --- a/samples/Http2SampleApp/scripts/build-docker.sh +++ b/samples/Http2SampleApp/scripts/build-docker.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -dotnet publish --framework netcoreapp2.2 "$DIR/../Http2SampleApp.csproj" +dotnet publish --framework netcoreapp2.0 "$DIR/../Http2SampleApp.csproj" docker build -t kestrel-http2-sample "$DIR/.." diff --git a/samples/LargeResponseApp/LargeResponseApp.csproj b/samples/LargeResponseApp/LargeResponseApp.csproj index 3bdc59c230..13fab4a63e 100644 --- a/samples/LargeResponseApp/LargeResponseApp.csproj +++ b/samples/LargeResponseApp/LargeResponseApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2;net461 + netcoreapp2.0;net461 false true diff --git a/samples/PlaintextApp/PlaintextApp.csproj b/samples/PlaintextApp/PlaintextApp.csproj index 93390f3270..238983e4f8 100644 --- a/samples/PlaintextApp/PlaintextApp.csproj +++ b/samples/PlaintextApp/PlaintextApp.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.2;net461 + netcoreapp2.1;net461 false true diff --git a/samples/SampleApp/SampleApp.csproj b/samples/SampleApp/SampleApp.csproj index 391d54420e..036867ebc1 100644 --- a/samples/SampleApp/SampleApp.csproj +++ b/samples/SampleApp/SampleApp.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.2;net461 + netcoreapp2.1;netcoreapp2.0;net461 false true diff --git a/samples/SystemdTestApp/SystemdTestApp.csproj b/samples/SystemdTestApp/SystemdTestApp.csproj index 3ebca42550..28c159a38e 100644 --- a/samples/SystemdTestApp/SystemdTestApp.csproj +++ b/samples/SystemdTestApp/SystemdTestApp.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.2;net461 + netcoreapp2.1;netcoreapp2.0;net461 false true diff --git a/src/Kestrel.Core/Adapter/Internal/RawStream.cs b/src/Kestrel.Core/Adapter/Internal/RawStream.cs index 7be7d276f8..ea381c22b2 100644 --- a/src/Kestrel.Core/Adapter/Internal/RawStream.cs +++ b/src/Kestrel.Core/Adapter/Internal/RawStream.cs @@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal if (!readableBuffer.IsEmpty) { // buffer.Count is int - var count = (int)Math.Min(readableBuffer.Length, destination.Length); + var count = (int) Math.Min(readableBuffer.Length, destination.Length); readableBuffer = readableBuffer.Slice(0, count); readableBuffer.CopyTo(destination.Span); return count; diff --git a/src/Kestrel.Core/Internal/Http/MessageBody.cs b/src/Kestrel.Core/Internal/Http/MessageBody.cs index d96aa99d47..a406e64ffa 100644 --- a/src/Kestrel.Core/Internal/Http/MessageBody.cs +++ b/src/Kestrel.Core/Internal/Http/MessageBody.cs @@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http if (!readableBuffer.IsEmpty) { // buffer.Count is int - var actual = (int)Math.Min(readableBuffer.Length, buffer.Length); + var actual = (int) Math.Min(readableBuffer.Length, buffer.Length); var slice = readableBuffer.Slice(0, actual); consumed = readableBuffer.GetPosition(actual); slice.CopyTo(buffer.Span); diff --git a/test/Directory.Build.props b/test/Directory.Build.props index b1bcfee077..44033a6dc3 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,9 +2,9 @@ - netcoreapp2.2 + netcoreapp2.1 $(DeveloperBuildTestTfms) - + netcoreapp2.1 $(StandardTestTfms);net461 diff --git a/test/Kestrel.Core.Tests/HttpRequestStreamTests.cs b/test/Kestrel.Core.Tests/HttpRequestStreamTests.cs index 4c8e53a82e..1ffa74b027 100644 --- a/test/Kestrel.Core.Tests/HttpRequestStreamTests.cs +++ b/test/Kestrel.Core.Tests/HttpRequestStreamTests.cs @@ -92,7 +92,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var stream = new HttpRequestStream(Mock.Of()); Assert.Throws(() => stream.BeginWrite(new byte[1], 0, 1, null, null)); } -#elif NETCOREAPP2_2 +#elif NETCOREAPP2_1 #else #error Target framework needs to be updated #endif diff --git a/test/Kestrel.FunctionalTests/GeneratedCodeTests.cs b/test/Kestrel.FunctionalTests/GeneratedCodeTests.cs index 3a4a55a8b3..bcf34ccaf9 100644 --- a/test/Kestrel.FunctionalTests/GeneratedCodeTests.cs +++ b/test/Kestrel.FunctionalTests/GeneratedCodeTests.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETCOREAPP2_2 +#if NETCOREAPP2_1 using System.IO; using Xunit; diff --git a/test/Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs b/test/Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs index 6f7b55a3a2..1531e07b97 100644 --- a/test/Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs +++ b/test/Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs @@ -152,7 +152,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { Assert.NotNull(connection); Assert.NotNull(connection.Features.Get()); -#if NETCOREAPP2_2 +#if NETCOREAPP2_1 Assert.Equal("localhost", name); #else Assert.Null(name); @@ -192,7 +192,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { Assert.NotNull(connection); Assert.NotNull(connection.Features.Get()); -#if NETCOREAPP2_2 +#if NETCOREAPP2_1 Assert.Equal("localhost", name); #else Assert.Null(name); @@ -280,7 +280,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { Assert.NotNull(connection); Assert.NotNull(connection.Features.Get()); -#if NETCOREAPP2_2 +#if NETCOREAPP2_1 Assert.Equal("localhost", name); #else Assert.Null(name); diff --git a/test/SystemdActivation/docker.sh b/test/SystemdActivation/docker.sh index b6a3a174c8..f2ba5fe506 100644 --- a/test/SystemdActivation/docker.sh +++ b/test/SystemdActivation/docker.sh @@ -4,8 +4,8 @@ set -e scriptDir=$(dirname "${BASH_SOURCE[0]}") PATH="$PWD/.dotnet/:$PATH" -dotnet publish -f netcoreapp2.2 ./samples/SystemdTestApp/ -cp -R ./samples/SystemdTestApp/bin/Debug/netcoreapp2.2/publish/ $scriptDir +dotnet publish -f netcoreapp2.0 ./samples/SystemdTestApp/ +cp -R ./samples/SystemdTestApp/bin/Debug/netcoreapp2.0/publish/ $scriptDir cp -R ./.dotnet/ $scriptDir image=$(docker build -qf $scriptDir/Dockerfile $scriptDir)