diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 9aac31c5b31b..f3eb0197a617 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -108,12 +108,7 @@ jobs: ${{ if eq(parameters.agentOs, 'Windows') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Public - ${{ if ne(parameters.isTestingJob, true) }}: - # Visual Studio Build Tools - demands: ImageOverride -equals Build.Server.Amd64.VS2019.BT.Open - ${{ if eq(parameters.isTestingJob, true) }}: - # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing - demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open + demands: ImageOverride -equals 1es-windows-2019-open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing diff --git a/NuGet.config b/NuGet.config index 810921d0807f..0057e5ff395f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 81051f35bcd7..dc5385edc181 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - - - + + + @@ -34,120 +34,120 @@ - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - - + + - 6.0.6 + 6.0.7 - - + + - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - + - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 @@ -155,114 +155,114 @@ - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - + - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - + - 6.0.6 + 6.0.7 - - + + - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - - + + - 6.0.6 + 6.0.7 - + - 6.0.6 + 6.0.7 - - - + + + - 6.0.6 + 6.0.7 - - + + - 6.0.6 + 6.0.7 - - + + - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - - + + @@ -270,7 +270,7 @@ - 6.0.6 + 6.0.7 @@ -278,50 +278,50 @@ - 6.0.6 + 6.0.7 - + - + - + - + - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - - + + @@ -331,8 +331,8 @@ - - + + @@ -340,8 +340,8 @@ - - + + @@ -352,58 +352,58 @@ - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - - + + - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - + - 6.0.6 + 6.0.7 @@ -411,71 +411,71 @@ - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - + - + - + - + - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - - + + - 6.0.6 + 6.0.7 - - + + - 6.0.6 + 6.0.7 @@ -491,195 +491,195 @@ - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - + - 6.0.6 + 6.0.7 - - + + - 6.0.6 + 6.0.7 - - + + - 6.0.6 + 6.0.7 - + - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - + - 6.0.6 + 6.0.7 - - + + - - + + - - + + - 6.0.6 + 6.0.7 - - + + - - + + - - + + - - + + - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - - - - + + + + - 6.0.6 + 6.0.7 @@ -688,69 +688,69 @@ - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - + - 6.0.6 + 6.0.7 - + - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 @@ -769,7 +769,7 @@ - 6.0.6 + 6.0.7 @@ -788,7 +788,7 @@ - 6.0.6 + 6.0.7 @@ -804,46 +804,46 @@ - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - - - + + + - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 @@ -853,7 +853,7 @@ - 6.0.6 + 6.0.7 @@ -862,73 +862,73 @@ - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - + - + - + - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 @@ -957,11 +957,11 @@ - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 @@ -979,13 +979,13 @@ - 6.0.6 + 6.0.7 - 6.0.6 + 6.0.7 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 76c8a146dfb1..79b54e2ee34d 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,111 +4,111 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be56603fef02..2036ca3cb2d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d + 62e1b2f494af376a4588bf3d365f7be5443d4a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d + 62e1b2f494af376a4588bf3d365f7be5443d4a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d + 62e1b2f494af376a4588bf3d365f7be5443d4a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d + 62e1b2f494af376a4588bf3d365f7be5443d4a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d + 62e1b2f494af376a4588bf3d365f7be5443d4a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d + 62e1b2f494af376a4588bf3d365f7be5443d4a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d + 62e1b2f494af376a4588bf3d365f7be5443d4a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d + 62e1b2f494af376a4588bf3d365f7be5443d4a5d https://github.com/dotnet/runtime @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://github.com/dotnet/runtime @@ -221,9 +221,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://github.com/dotnet/runtime @@ -245,40 +245,40 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 038840512db8..c2703b08cf0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 - 7 + 8 true 6.0.0 - 6.0.7 - 6.0.7 - 6.0.7 - 6.0.7 - 6.0.7 - 6.0.7-servicing.22322.2 + 6.0.8 + 6.0.8 + 6.0.8 + 6.0.8 + 6.0.8 + 6.0.8-servicing.22363.6 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.7-servicing.22322.2 + 6.0.8-servicing.22363.6 6.0.0 6.0.0 6.0.1 @@ -114,7 +114,7 @@ 6.0.0 6.0.0 6.0.1 - 6.0.0 + 6.0.1 6.0.0 6.0.0 6.0.5 @@ -122,14 +122,14 @@ 6.0.5 - 6.0.7 - 6.0.7 - 6.0.7 - 6.0.7 - 6.0.7 - 6.0.7 - 6.0.7 - 6.0.7 + 6.0.8 + 6.0.8 + 6.0.8 + 6.0.8 + 6.0.8 + 6.0.8 + 6.0.8 + 6.0.8 6.0.0-beta.22314.7 6.0.0-beta.22314.7 @@ -205,16 +205,16 @@ 11.1.0 1.4.0 6.10.0 - 5.10.0-rc.7240 - 5.10.0-rc.7240 - 5.10.0-rc.7240 + 6.0.0 + 6.0.0 + 6.0.0 5.0.0 5.0.0-alpha.20560.6 5.0.0 2.1.1 2.2.0 - 3.1.26-servicing-22274-3 + 3.1.27-servicing-22316-11 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version) 5.0.17-servicing-22215-7 diff --git a/global.json b/global.json index 3c2a1ca8df4a..bbd837de7707 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "6.0.106" + "version": "6.0.107" }, "tools": { - "dotnet": "6.0.106", + "dotnet": "6.0.107", "runtimes": { "dotnet/x64": [ "2.1.30", @@ -13,7 +13,7 @@ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" ], "aspnetcore/x64": [ - "3.1.26" + "3.1.27" ] }, "Git": "2.22.0", diff --git a/src/Servers/Kestrel/test/SystemdActivation/Dockerfile b/src/Servers/Kestrel/test/SystemdActivation/Dockerfile deleted file mode 100644 index 5aee5312dd1c..000000000000 --- a/src/Servers/Kestrel/test/SystemdActivation/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM microsoft/dotnet-nightly:2.0-runtime-deps - -# The "container" environment variable is read by systemd. -ENV container=docker - -# Install and configure dependencies. -RUN ["apt-get", "-o", "Acquire::Check-Valid-Until=false", "update"] -RUN ["apt-get", "install", "-y", "--no-install-recommends", "systemd", "socat"] - -# Copy .NET installation. -ADD .dotnet/ /usr/share/dotnet/ -RUN ["ln", "-s", "/usr/share/dotnet/dotnet", "/usr/bin/dotnet"] - -# Copy "publish" app. -ADD publish/ /publish/ - -# Expose target ports. -EXPOSE 8080 8081 8082 8083 8084 8085 - -# Set entrypoint. -COPY ./docker-entrypoint.sh / -RUN chmod +x /docker-entrypoint.sh -ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/src/Servers/Kestrel/test/SystemdActivation/docker-entrypoint.sh b/src/Servers/Kestrel/test/SystemdActivation/docker-entrypoint.sh deleted file mode 100755 index cb8d2f2d6fc4..000000000000 --- a/src/Servers/Kestrel/test/SystemdActivation/docker-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -e - -cd /publish -systemd-socket-activate -l 8080 -E ASPNETCORE_BASE_PORT=7000 dotnet SystemdTestApp.dll & -socat TCP-LISTEN:8081,fork TCP-CONNECT:127.0.0.1:7000 & -socat TCP-LISTEN:8082,fork TCP-CONNECT:127.0.0.1:7001 & -systemd-socket-activate -l /tmp/activate-kestrel.sock -E ASPNETCORE_BASE_PORT=7100 dotnet SystemdTestApp.dll & -socat TCP-LISTEN:8083,fork UNIX-CLIENT:/tmp/activate-kestrel.sock & -socat TCP-LISTEN:8084,fork TCP-CONNECT:127.0.0.1:7100 & -socat TCP-LISTEN:8085,fork TCP-CONNECT:127.0.0.1:7101 & -trap 'exit 0' SIGTERM -wait diff --git a/src/Servers/Kestrel/test/SystemdActivation/docker.sh b/src/Servers/Kestrel/test/SystemdActivation/docker.sh deleted file mode 100755 index 2983d5a9dad4..000000000000 --- a/src/Servers/Kestrel/test/SystemdActivation/docker.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -e - -scriptDir=$(dirname "${BASH_SOURCE[0]}") -dotnetDir="$PWD/.build/.dotnet" -PATH="$dotnetDir:$PATH" -dotnet publish -f netcoreapp2.2 ./samples/SystemdTestApp/ -cp -R ./samples/SystemdTestApp/bin/Debug/netcoreapp2.2/publish/ $scriptDir -cp -R $dotnetDir $scriptDir - -image=$(docker build -qf $scriptDir/Dockerfile $scriptDir) -container=$(docker run -Pd $image) - -# Try to connect to SystemdTestApp once a second up to 10 times via all available ports. -for i in {1..10}; do - curl -f http://$(docker port $container 8080/tcp) \ - && curl -f http://$(docker port $container 8081/tcp) \ - && curl -fk https://$(docker port $container 8082/tcp) \ - && curl -f http://$(docker port $container 8083/tcp) \ - && curl -f http://$(docker port $container 8084/tcp) \ - && curl -fk https://$(docker port $container 8085/tcp) \ - && exit 0 || sleep 1; -done - -exit -1 diff --git a/src/submodules/googletest b/src/submodules/googletest index 548b13dc3c02..96f51426e4c7 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 548b13dc3c02b93f60eeff9a0cc6e11c1ea722ca +Subproject commit 96f51426e4c776a71d0a446c1e4f4c7a5ea921df