diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 6c1d448e81..f7cd050b7f 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -9,8 +9,6 @@ trigger: include: - master - release/* - - internal/release/* - - ci/* # Run PR validation on all branches pr: diff --git a/build/Maestro/Maestro.csproj b/build/Maestro/Maestro.csproj index a114661e63..67a5210bc4 100644 --- a/build/Maestro/Maestro.csproj +++ b/build/Maestro/Maestro.csproj @@ -29,7 +29,7 @@ Artifacts="@(PackageToPublish)" OutputPath="$(ManifestsPath)aspnetcore-$(TargetRuntimeIdentifier)-$(PackageVersion).xml" BuildId="$(PackageVersion)" - BuildData="Location=https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" + BuildData="Location=https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" RepoUri="$(RepositoryUrl)" RepoBranch="$(BUILD_SOURCEBRANCH)" RepoCommit="$(BUILD_SOURCEVERSION)" /> diff --git a/build/sources.props b/build/sources.props index e32fdfb649..717242fc60 100644 --- a/build/sources.props +++ b/build/sources.props @@ -10,6 +10,9 @@ $(RestoreSources); + https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json; + https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json; + https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json; https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; https://api.nuget.org/v3/index.json; https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; diff --git a/dockerbuild.sh b/dockerbuild.sh index 9bbab769be..9d5d6ace11 100755 --- a/dockerbuild.sh +++ b/dockerbuild.sh @@ -104,6 +104,22 @@ fi dockerfile="$DIR/build/docker/$image.Dockerfile" tagname="aspnetcore-build-$image" +# Use docker pull with retries to pre-pull the image need by the dockerfile +# docker build regularly fails with TLS handshake issues for unclear reasons. +base_imagename="$(grep -E -o 'FROM (.*)' $dockerfile | cut -c 6-)" +pull_retries=3 +while [ $pull_retries -gt 0 ]; do + failed=false + docker pull $base_imagename || failed=true + if [ "$failed" = true ]; then + let pull_retries=pull_retries-1 + echo -e "${YELLOW}Failed to pull $base_imagename Retries left: $pull_retries.${RESET}" + sleep 1 + else + pull_retries=0 + fi +done + docker build "$(dirname "$dockerfile")" \ --build-arg "USER=$(whoami)" \ --build-arg "USER_ID=$(id -u)" \ diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props index 83705b2145..04f1c98d4b 100644 --- a/eng/SharedFramework.External.props +++ b/eng/SharedFramework.External.props @@ -52,7 +52,6 @@ - @@ -91,6 +90,7 @@ <_CompilationOnlyReference Include="System.Buffers" /> <_CompilationOnlyReference Include="System.ComponentModel.Annotations" /> + <_CompilationOnlyReference Include="System.Runtime.CompilerServices.Unsafe" /> - + https://github.com/aspnet/AspNetCore-Tooling - d63c6bbc2cfdc6e89ebc06763674b94ab66ae3fb + f7d175b0afd3b57342fd6978d552623fbdd02cc8 - + https://github.com/aspnet/AspNetCore-Tooling - d63c6bbc2cfdc6e89ebc06763674b94ab66ae3fb + f7d175b0afd3b57342fd6978d552623fbdd02cc8 - + https://github.com/aspnet/AspNetCore-Tooling - d63c6bbc2cfdc6e89ebc06763674b94ab66ae3fb + f7d175b0afd3b57342fd6978d552623fbdd02cc8 - + https://github.com/aspnet/AspNetCore-Tooling - d63c6bbc2cfdc6e89ebc06763674b94ab66ae3fb + f7d175b0afd3b57342fd6978d552623fbdd02cc8 - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + d1a2d66354d42ff951048124252f81d051736ffe - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + d1a2d66354d42ff951048124252f81d051736ffe - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + d1a2d66354d42ff951048124252f81d051736ffe - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + d1a2d66354d42ff951048124252f81d051736ffe - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + d1a2d66354d42ff951048124252f81d051736ffe - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + d1a2d66354d42ff951048124252f81d051736ffe - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + d1a2d66354d42ff951048124252f81d051736ffe - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/dotnet/core-setup - 2c740c0ea828ceac8b333dff566d117ad600a248 + e1e36e48fb64a7637cbb3d340e44fb97256dfb3c - + https://github.com/dotnet/core-setup - 2c740c0ea828ceac8b333dff566d117ad600a248 + e1e36e48fb64a7637cbb3d340e44fb97256dfb3c - + https://github.com/dotnet/core-setup - 2c740c0ea828ceac8b333dff566d117ad600a248 + e1e36e48fb64a7637cbb3d340e44fb97256dfb3c - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + 327def063eb5eddb723edcee84815d9495b4021c - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 https://github.com/dotnet/arcade 660f6cd006b276edb3764f4d7d726cedf6c29d8e - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + f263e24ff720381ba0c17f10ce0b4d1725e1c062 diff --git a/eng/Versions.props b/eng/Versions.props index 7a2d2b89ee..a7b9e7c8db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,104 +20,104 @@ 1.0.0-beta.19121.5 - 3.0.0-preview3-27414-8 - 3.0.0-preview3-27414-8 - 3.0.0-preview3-27414-8 + 3.0.0-preview4-27424-1 + 3.0.0-preview4-27424-1 + 3.0.0-preview4-27424-1 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.7.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 1.7.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 - 4.6.0-preview.19109.6 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.7.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 1.7.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 + 4.6.0-preview4.19123.2 - 3.0.0-preview.19109.6 + 3.0.0-preview4.19123.2 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 - 3.0.0-preview3.19115.4 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 + 3.0.0-preview4.19122.13 - 3.0.0-preview.19080.1 - 3.0.0-preview.19080.1 - 3.0.0-preview.19080.1 - 3.0.0-preview.19080.1 - 3.0.0-preview.19080.1 - 3.0.0-preview.19080.1 - 3.0.0-preview.19080.1 + 3.0.0-preview4.19124.2 + 3.0.0-preview4.19124.2 + 3.0.0-preview4.19124.2 + 3.0.0-preview4.19124.2 + 3.0.0-preview4.19124.2 + 3.0.0-preview4.19124.2 + 3.0.0-preview4.19124.2 - 3.0.0-preview4.19121.3 - 3.0.0-preview4.19121.3 - 3.0.0-preview4.19121.3 - 3.0.0-preview4.19121.3 + 3.0.0-preview4.19123.2 + 3.0.0-preview4.19123.2 + 3.0.0-preview4.19123.2 + 3.0.0-preview4.19123.2 + + + + > testQuery = null, HealthStatus failureStatus = HealthStatus.Unhealthy) { var serviceCollection = new ServiceCollection(); - serviceCollection.AddDbContext(o => o.UseInMemoryDatabase("Test")); + serviceCollection.AddDbContext(o => o.UseInMemoryDatabase("Test" + Interlocked.Increment(ref _testDbCounter))); var builder = serviceCollection.AddHealthChecks(); builder.AddDbContextCheck("test", failureStatus, new[] { "tag1", "tag2", }, testQuery); diff --git a/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.netcoreapp3.0.cs b/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.netcoreapp3.0.cs index 6a58da85d1..c6a84e9236 100644 --- a/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.netcoreapp3.0.cs +++ b/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.netcoreapp3.0.cs @@ -13,6 +13,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization public virtual Microsoft.Extensions.Localization.LocalizedString GetString(string name, params object[] arguments) { throw null; } protected virtual Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString ToHtmlString(Microsoft.Extensions.Localization.LocalizedString result) { throw null; } protected virtual Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString ToHtmlString(Microsoft.Extensions.Localization.LocalizedString result, object[] arguments) { throw null; } + [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] public virtual Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer WithCulture(System.Globalization.CultureInfo culture) { throw null; } } public static partial class HtmlLocalizerExtensions @@ -35,6 +36,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization public virtual System.Collections.Generic.IEnumerable GetAllStrings(bool includeParentCultures) { throw null; } public virtual Microsoft.Extensions.Localization.LocalizedString GetString(string name) { throw null; } public virtual Microsoft.Extensions.Localization.LocalizedString GetString(string name, params object[] arguments) { throw null; } + [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] public virtual Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer WithCulture(System.Globalization.CultureInfo culture) { throw null; } } public partial interface IHtmlLocalizer @@ -44,6 +46,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization System.Collections.Generic.IEnumerable GetAllStrings(bool includeParentCultures); Microsoft.Extensions.Localization.LocalizedString GetString(string name); Microsoft.Extensions.Localization.LocalizedString GetString(string name, params object[] arguments); + [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer WithCulture(System.Globalization.CultureInfo culture); } public partial interface IHtmlLocalizerFactory @@ -76,6 +79,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization public System.Collections.Generic.IEnumerable GetAllStrings(bool includeParentCultures) { throw null; } public Microsoft.Extensions.Localization.LocalizedString GetString(string name) { throw null; } public Microsoft.Extensions.Localization.LocalizedString GetString(string name, params object[] values) { throw null; } + [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] public Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer WithCulture(System.Globalization.CultureInfo culture) { throw null; } } } diff --git a/src/Mvc/Mvc.Localization/src/HtmlLocalizer.cs b/src/Mvc/Mvc.Localization/src/HtmlLocalizer.cs index 9ef531438f..1287f7f8c4 100644 --- a/src/Mvc/Mvc.Localization/src/HtmlLocalizer.cs +++ b/src/Mvc/Mvc.Localization/src/HtmlLocalizer.cs @@ -85,6 +85,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization _localizer.GetAllStrings(includeParentCultures); /// + [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] public virtual IHtmlLocalizer WithCulture(CultureInfo culture) { if (culture == null) @@ -92,7 +93,9 @@ namespace Microsoft.AspNetCore.Mvc.Localization throw new ArgumentNullException(nameof(culture)); } +#pragma warning disable CS0618 // Type or member is obsolete return new HtmlLocalizer(_localizer.WithCulture(culture)); +#pragma warning restore CS0618 // Type or member is obsolete } /// @@ -105,4 +108,4 @@ namespace Microsoft.AspNetCore.Mvc.Localization protected virtual LocalizedHtmlString ToHtmlString(LocalizedString result, object[] arguments) => new LocalizedHtmlString(result.Name, result.Value, result.ResourceNotFound, arguments); } -} \ No newline at end of file +} diff --git a/src/Mvc/Mvc.Localization/src/HtmlLocalizerOfT.cs b/src/Mvc/Mvc.Localization/src/HtmlLocalizerOfT.cs index cea9a40a1c..736a1af6af 100644 --- a/src/Mvc/Mvc.Localization/src/HtmlLocalizerOfT.cs +++ b/src/Mvc/Mvc.Localization/src/HtmlLocalizerOfT.cs @@ -81,6 +81,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization _localizer.GetAllStrings(includeParentCultures); /// + [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] public virtual IHtmlLocalizer WithCulture(CultureInfo culture) { if (culture == null) @@ -88,7 +89,9 @@ namespace Microsoft.AspNetCore.Mvc.Localization throw new ArgumentNullException(nameof(culture)); } +#pragma warning disable CS0618 // Type or member is obsolete return _localizer.WithCulture(culture); +#pragma warning restore CS0618 // Type or member is obsolete } } -} \ No newline at end of file +} diff --git a/src/Mvc/Mvc.Localization/src/IHtmlLocalizer.cs b/src/Mvc/Mvc.Localization/src/IHtmlLocalizer.cs index f9589a990c..0b41530fc5 100644 --- a/src/Mvc/Mvc.Localization/src/IHtmlLocalizer.cs +++ b/src/Mvc/Mvc.Localization/src/IHtmlLocalizer.cs @@ -1,6 +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. +using System; using System.Collections.Generic; using System.Globalization; using Microsoft.Extensions.Localization; @@ -58,6 +59,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization /// /// The to use. /// A culture-specific . + [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] IHtmlLocalizer WithCulture(CultureInfo culture); } -} \ No newline at end of file +} diff --git a/src/Mvc/Mvc.Localization/src/ViewLocalizer.cs b/src/Mvc/Mvc.Localization/src/ViewLocalizer.cs index f8e86c4c38..72a47f5551 100644 --- a/src/Mvc/Mvc.Localization/src/ViewLocalizer.cs +++ b/src/Mvc/Mvc.Localization/src/ViewLocalizer.cs @@ -80,7 +80,11 @@ namespace Microsoft.AspNetCore.Mvc.Localization public LocalizedString GetString(string name, params object[] values) => _localizer.GetString(name, values); /// + [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] + +#pragma warning disable CS0618 // Type or member is obsolete public IHtmlLocalizer WithCulture(CultureInfo culture) => _localizer.WithCulture(culture); +#pragma warning restore CS0618 // Type or member is obsolete /// public IEnumerable GetAllStrings(bool includeParentCultures) => @@ -127,4 +131,4 @@ namespace Microsoft.AspNetCore.Mvc.Localization return builder.ToString(); } } -} \ No newline at end of file +} diff --git a/src/Mvc/Mvc.Localization/test/HtmlLocalizerTest.cs b/src/Mvc/Mvc.Localization/test/HtmlLocalizerTest.cs index d7cf25b528..6a6a4ba6a4 100644 --- a/src/Mvc/Mvc.Localization/test/HtmlLocalizerTest.cs +++ b/src/Mvc/Mvc.Localization/test/HtmlLocalizerTest.cs @@ -212,7 +212,9 @@ namespace Microsoft.AspNetCore.Mvc.Localization.Test var htmlLocalizer = new HtmlLocalizer(stringLocalizer); // Act +#pragma warning disable CS0618 // Type or member is obsolete var actualLocalizedHtmlString = htmlLocalizer.WithCulture(new CultureInfo("fr"))["John"]; +#pragma warning restore CS0618 // Type or member is obsolete // Assert Assert.Equal("Bonjour John", actualLocalizedHtmlString.Value); diff --git a/src/Mvc/Mvc.Localization/test/MvcLocalizationServiceCollectionExtensionsTest.cs b/src/Mvc/Mvc.Localization/test/MvcLocalizationServiceCollectionExtensionsTest.cs index f67e5f466d..1308e9790e 100644 --- a/src/Mvc/Mvc.Localization/test/MvcLocalizationServiceCollectionExtensionsTest.cs +++ b/src/Mvc/Mvc.Localization/test/MvcLocalizationServiceCollectionExtensionsTest.cs @@ -99,6 +99,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization throw new NotImplementedException(); } + [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] public IHtmlLocalizer WithCulture(CultureInfo culture) { throw new NotImplementedException(); @@ -127,6 +128,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization throw new NotImplementedException(); } + [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] public IHtmlLocalizer WithCulture(CultureInfo culture) { throw new NotImplementedException(); diff --git a/src/Mvc/Mvc.Localization/test/TestStringLocalizer.cs b/src/Mvc/Mvc.Localization/test/TestStringLocalizer.cs index a2268d47c9..adb4b7ff64 100644 --- a/src/Mvc/Mvc.Localization/test/TestStringLocalizer.cs +++ b/src/Mvc/Mvc.Localization/test/TestStringLocalizer.cs @@ -1,6 +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. +using System; using System.Collections.Generic; using System.Globalization; using Microsoft.Extensions.Localization; @@ -67,6 +68,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization.Test return allStrings; } + [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] public IStringLocalizer WithCulture(CultureInfo culture) { return new TestStringLocalizer(culture); diff --git a/src/Mvc/Mvc.Localization/test/ViewLocalizerTest.cs b/src/Mvc/Mvc.Localization/test/ViewLocalizerTest.cs index 991abf81db..529dfbd744 100644 --- a/src/Mvc/Mvc.Localization/test/ViewLocalizerTest.cs +++ b/src/Mvc/Mvc.Localization/test/ViewLocalizerTest.cs @@ -280,7 +280,9 @@ namespace Microsoft.AspNetCore.Mvc.Localization.Test viewLocalizer.Contextualize(viewContext); // Act +#pragma warning disable CS0618 // Type or member is obsolete var actualLocalizedString = viewLocalizer.WithCulture(new CultureInfo("fr"))["John"]; +#pragma warning restore CS0618 // Type or member is obsolete // Assert Assert.Equal("Bonjour John", actualLocalizedString.Value); @@ -325,6 +327,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization.Test return _stringLocalizer.GetAllStrings(includeParentCultures); } + [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] public IHtmlLocalizer WithCulture(CultureInfo culture) { return new TestHtmlLocalizer(new TestStringLocalizer(culture)); diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/vs-2017.3.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/vs-2017.3.host.json index 56170fd196..e6c17ff7f1 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/vs-2017.3.host.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/vs-2017.3.host.json @@ -14,6 +14,6 @@ "icon": "vs-2017.3/Empty.png", "learnMoreLink": "https://go.microsoft.com/fwlink/?LinkID=784883", "uiFilters": [ "oneaspnet" ], - "supportsDocker": true, + "supportsDocker": false, "excludeLaunchSettings": false } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/wwwroot/favicon.ico b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/wwwroot/favicon.ico new file mode 100644 index 0000000000..a3a799985c Binary files /dev/null and b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/wwwroot/favicon.ico differ diff --git a/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj index 8f9019ebdc..7067e9a85d 100644 --- a/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -13,7 +13,6 @@ - diff --git a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj index ca33bbaba6..80220bc29a 100644 --- a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -19,7 +19,6 @@ - diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index 5980cddf5a..a7e5f1b75a 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -13,7 +13,6 @@ - diff --git a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index c12d43df2d..02e82bb23d 100644 --- a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -23,7 +23,6 @@ - diff --git a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj index 84e378410f..797278050b 100644 --- a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj +++ b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj @@ -19,7 +19,6 @@ - diff --git a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj index f8d77775a0..c564d1974e 100644 --- a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj +++ b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj @@ -6,13 +6,12 @@ - + - diff --git a/src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj b/src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj index 5b3b0540b5..6b877415aa 100644 --- a/src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj +++ b/src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj @@ -16,12 +16,12 @@ - + diff --git a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj index f4e0546756..aa6ace09f8 100644 --- a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj +++ b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj @@ -7,14 +7,13 @@ - + - diff --git a/src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj b/src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj index a727cb48ad..66dae2f3c0 100644 --- a/src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj +++ b/src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj @@ -21,12 +21,12 @@ - +