From efaaa55d44c2bae10e85c357ff240de064a138c8 Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Fri, 22 Feb 2019 10:54:36 -0800 Subject: [PATCH 1/7] [Templating] Add favicon.ico to the components template --- .../wwwroot/favicon.ico | Bin 0 -> 32038 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/wwwroot/favicon.ico 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 0000000000000000000000000000000000000000..a3a799985c43bc7309d701b2cad129023377dc71 GIT binary patch literal 32038 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 Date: Fri, 22 Feb 2019 16:04:43 -0800 Subject: [PATCH 2/7] Skip RunsWithIterationEnvVariable (#7879) --- src/Tools/dotnet-watch/test/DotNetWatcherTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tools/dotnet-watch/test/DotNetWatcherTests.cs b/src/Tools/dotnet-watch/test/DotNetWatcherTests.cs index 7a38b94926..6b064e2a8e 100644 --- a/src/Tools/dotnet-watch/test/DotNetWatcherTests.cs +++ b/src/Tools/dotnet-watch/test/DotNetWatcherTests.cs @@ -34,7 +34,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests Assert.Equal("1", envValue); } - [Fact] + [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1826")] public async Task RunsWithIterationEnvVariable() { await _app.StartWatcherAsync(); From e65004907a633a21e7e93b1c00e3944ffb10d8f8 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 22 Feb 2019 16:55:30 -0800 Subject: [PATCH 3/7] Docker support not available for multi-project templates (#7878) --- .../GrpcService-CSharp/.template.config/vs-2017.3.host.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } From 1b27c9905c45de45d57546c52663304570d7a2ad Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 22 Feb 2019 19:09:08 -0800 Subject: [PATCH 4/7] Update dependencies and react to changes (#7844) * Add workaround for dotnet/sdk#2976 * Add new restore sources * Update BAR manifest to point to https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json * Obsolete WithCulture * Add retries to dockerbuild.sh * Ensure each test run gets a unique in-memory database --- .azure/pipelines/ci.yml | 2 - build/Maestro/Maestro.csproj | 2 +- build/sources.props | 3 + dockerbuild.sh | 16 + eng/Version.Details.xml | 374 +++++++++--------- eng/Versions.props | 188 ++++----- eng/Workarounds.targets | 5 + .../test/DbContextHealthCheckTest.cs | 5 +- src/Mvc/Mvc.Localization/src/HtmlLocalizer.cs | 5 +- .../Mvc.Localization/src/HtmlLocalizerOfT.cs | 5 +- .../Mvc.Localization/src/IHtmlLocalizer.cs | 4 +- src/Mvc/Mvc.Localization/src/ViewLocalizer.cs | 6 +- .../test/HtmlLocalizerTest.cs | 2 + ...lizationServiceCollectionExtensionsTest.cs | 2 + .../test/TestStringLocalizer.cs | 2 + .../test/ViewLocalizerTest.cs | 3 + 16 files changed, 335 insertions(+), 289 deletions(-) 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/Version.Details.xml b/eng/Version.Details.xml index 0c58a8e17a..74091dcf1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,4 +1,4 @@ - + - + https://github.com/aspnet/AspNetCore-Tooling - 182b2c81a5a3c2d5219cf20205e49dbe86823e18 + b4570871aa86bbaf5c826306134ed2b837d8f3b2 - + https://github.com/aspnet/AspNetCore-Tooling - 182b2c81a5a3c2d5219cf20205e49dbe86823e18 + b4570871aa86bbaf5c826306134ed2b837d8f3b2 - + https://github.com/aspnet/AspNetCore-Tooling - 182b2c81a5a3c2d5219cf20205e49dbe86823e18 + b4570871aa86bbaf5c826306134ed2b837d8f3b2 - + https://github.com/aspnet/AspNetCore-Tooling - 182b2c81a5a3c2d5219cf20205e49dbe86823e18 + b4570871aa86bbaf5c826306134ed2b837d8f3b2 - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + 542529a022a2260ba94e60bd40fbe319850b8887 - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + 542529a022a2260ba94e60bd40fbe319850b8887 - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + 542529a022a2260ba94e60bd40fbe319850b8887 - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + 542529a022a2260ba94e60bd40fbe319850b8887 - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + 542529a022a2260ba94e60bd40fbe319850b8887 - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + 542529a022a2260ba94e60bd40fbe319850b8887 - + https://github.com/aspnet/EntityFrameworkCore - df4350283ae7ff0c67e08af16c0f00fdbd5e22ac + 542529a022a2260ba94e60bd40fbe319850b8887 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/dotnet/core-setup - 2c740c0ea828ceac8b333dff566d117ad600a248 + 84174943d9ea6cf34ade0dbab8e7f0319378f0ab - + https://github.com/dotnet/core-setup - 2c740c0ea828ceac8b333dff566d117ad600a248 + 84174943d9ea6cf34ade0dbab8e7f0319378f0ab - + https://github.com/dotnet/core-setup - 2c740c0ea828ceac8b333dff566d117ad600a248 + 84174943d9ea6cf34ade0dbab8e7f0319378f0ab - + https://github.com/dotnet/corefx - 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + b07bc5efcad439d5157f65df176e08f26ccb4b88 - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f - + https://github.com/aspnet/Extensions - 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 + 924015e98bc443023a6b0eea2c0016b876e4051f diff --git a/eng/Versions.props b/eng/Versions.props index ac9bc81423..5a0236cb92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,4 +1,4 @@ - + - 3.0.0-preview3-27414-8 - 3.0.0-preview3-27414-8 - 3.0.0-preview3-27414-8 + 3.0.0-preview3-27419-3 + 3.0.0-preview3-27419-3 + 3.0.0-preview3-27419-3 - 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-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.7.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 1.7.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 + 4.6.0-preview3.19115.9 - 3.0.0-preview.19109.6 + 3.0.0-preview3.19115.9 - 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-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 + 3.0.0-preview3.19120.3 - 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-preview3.19122.12 + 3.0.0-preview3.19122.12 + 3.0.0-preview3.19122.12 + 3.0.0-preview3.19122.12 + 3.0.0-preview3.19122.12 + 3.0.0-preview3.19122.12 + 3.0.0-preview3.19122.12 - 3.0.0-preview3.19119.5 - 3.0.0-preview3.19119.5 - 3.0.0-preview3.19119.5 - 3.0.0-preview3.19119.5 + 3.0.0-preview3.19122.5 + 3.0.0-preview3.19122.5 + 3.0.0-preview3.19122.5 + 3.0.0-preview3.19122.5 + + + + > 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/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)); From 8d0da78681d8591c054a0e66135506ae881d785b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Sun, 24 Feb 2019 09:31:53 -0800 Subject: [PATCH 5/7] Update dependencies --- eng/Version.Details.xml | 372 ++++++++++++++++++++-------------------- eng/Versions.props | 186 ++++++++++---------- 2 files changed, 279 insertions(+), 279 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0760078a03..905b075be4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,384 +9,384 @@ --> - + 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 - @@ -91,6 +90,7 @@ <_CompilationOnlyReference Include="System.Buffers" /> <_CompilationOnlyReference Include="System.ComponentModel.Annotations" /> + <_CompilationOnlyReference Include="System.Runtime.CompilerServices.Unsafe" />