From 82c42d58aeb401968c2dcd779c99fc503935052c Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Sun, 22 Sep 2019 16:07:53 -0700 Subject: [PATCH 01/12] Update branding to 2.1.14 - aspnet/AspNetCore-Internal#3153 --- eng/Baseline.Designer.props | 9 +++++---- eng/Baseline.xml | 6 +++--- eng/PatchConfig.props | 12 ++++-------- .../ArchiveBaseline.2.1.13.txt | 1 + .../ArchiveBaseline.2.1.13.txt | 1 + version.props | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index a830a66044..c82f441f14 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.12 + 2.1.13 @@ -284,10 +284,11 @@ - 2.1.1 + 2.1.13 + @@ -1117,12 +1118,12 @@ - 2.1.1 + 2.1.13 - + diff --git a/eng/Baseline.xml b/eng/Baseline.xml index dff0b069c0..8ab070f7e9 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. --> - + @@ -36,7 +36,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + @@ -115,7 +115,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index e433208e89..71ff8312fd 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -18,14 +18,6 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.Authentication.Google; - - - - - - - - Microsoft.AspNetCore.Identity.UI; @@ -46,4 +38,8 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.SpaServices; + + + + diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt @@ -0,0 +1 @@ + diff --git a/version.props b/version.props index e65ef23479..ed48958394 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ 2 1 - 13 + 14 servicing Servicing t000 From 73ffb2d975f1f0faad0badba6db3c8f1620b4884 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 24 Sep 2019 15:51:17 -0700 Subject: [PATCH 02/12] Update package baseline --- eng/Baseline.Designer.props | 1545 +++++------------ eng/Baseline.xml | 219 +-- .../BaselineGenerator.csproj | 2 +- 3 files changed, 540 insertions(+), 1226 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 0b3cfa0c07..1e28129d00 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,1333 +2,694 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.7 + 3.0.0 - - - 2.2.0 + + + 3.0.0 + + + + 3.0.0 + + - 2.2.0 + 3.0.0 - - - 2.2.0 - - - - 2.2.0 - - - - 2.2.0 - - - - - - - - - 2.2.0-preview-35687 + 3.0.0 - - - - - - - - + + + + + + + + + + - - - 2.2.0 + + + 3.0.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2.2.7 - - - - - 2.2.7 - - - - - 2.2.0 - - - - - - - 2.2.0 + 3.0.0 - - - - - + + + - 2.2.0 + 3.0.0 - - - - - + + + - - - 2.2.0 + + + 3.0.0 - - - - - - 2.2.0 - - - - - - + - 2.2.0 + 3.0.0 - - - + - 2.2.2 + 3.0.0 - - - + - 2.2.0 + 3.0.0 - - - + + - 2.2.0 + 3.0.0 - - - - - - 2.2.0 + + + + 3.0.0 - - - + + - 2.2.0 + 3.0.0 - - - + + - 2.2.0 + 3.0.0 - - - + - 2.2.0 + 3.0.0 - - - - - - - - 2.2.0 - - - - - - - - - - - - - 2.2.0 - - - - + + + - 2.2.0 + 3.0.0 + + + + + - - + + + - 2.2.5 + 3.0.0 - - - + + + - - - - - - - + + + 3.0.0 + + + - 2.2.5 + 3.0.0 - - - + + + + + + 3.0.0-preview9.19465.2 + + + + + + + + + 3.0.0-preview9.19465.2 + + + + + + + 3.0.0-preview9.19465.2 + + + + 3.0.0-preview9.19465.2 + + + + + + + 3.0.0-preview9.19465.2 + + + + + + + + + + 3.0.0-preview9.19465.2 + + + + 3.0.0 + + + + + + + + + + + + + + + 3.0.0 + + + + 3.0.0 + + + + + + + + + + + + 3.0.0 + + + + + + + + + + + 3.0.0 + + + + + + + + + + + + + + + + 3.0.0 + + + + - 2.2.0 + 3.0.0 + + + + - - + + + - - - 2.2.0 - - - - - - - - - 2.2.0 - - - - - - - + + + - 2.2.0 + 3.0.0 - 2.2.0 + 3.0.0 - + - + + + + + 3.0.0 + + + + + + + + + + + + + + + + + + + + + - 2.2.0 + 3.0.0 - 2.2.0 + 3.0.0 - + - 2.2.7 + 3.0.0 - + + - - 2.2.0 + 3.0.0 - - - + + + - 2.2.0 + 3.0.0 + + + + - - + + - 2.2.5 + 3.0.0 - + - - - 2.2.0 - - - - - - - - 2.2.0 - - - - - - - - - - - - - - - 2.2.0 - - - 2.2.1 + 3.0.0 - - - + + - - - 2.2.0 + + + 3.0.0 - - - - - - - - - 2.2.0 - - - - - - - - - - - - - - - 2.2.0 - - - - - - - - - - 2.2.0 - - - - - - - - - 2.2.0 - - - - + + + - 2.2.0 + 3.0.0 - - - - - - - - - - 2.2.7 - - - - - - - - - - - - - - - - - - - 2.2.0 - - - - - - - 2.2.0 - - - - + + - 1.1.0 + 3.0.0 - - - - - - + + + + + + + + - 1.1.0 + 3.0.0 + + + - - - - - - - 1.1.0 - - - - - - - - - - - - - - - - - - - - - - - - 2.2.0 - - - - - - + + - 2.2.0 + 3.0.0 + + + + - - - - - 2.2.2 - - - - - - - - - - - 2.2.0 - - - - - - - - - 2.2.0 - - - - - - - + + - 2.2.0 + 3.0.0 - - - - + + + + + + + - 2.2.0 + 3.0.0 - - - - - - - + + + + + + + - 2.2.5 + 3.0.0 - - - - - - - - - - 2.2.0 - - - - - - + + + + - 2.2.0 + 3.0.0 - - + + - - - 2.2.0 + + + 3.0.0 - - - - - - - 2.2.0 - - - - - - - + - 2.2.0 + 3.0.0 - - - - + + - - - 2.2.0 + + + 3.0.0 - - - + + + + - - - 2.2.0 + + + 3.0.0 - - - - 2.2.6 - - - - - 2.2.0 - - - - - - - 2.2.5 - - - - - - - - - - - - - - - - - - - - - 2.2.0 - - - - - - - - 2.2.0 - - - - - - - - - 2.2.0 - - - - - - - - 2.2.0 - - - - - - - 2.2.0 - - - - - - - - - - 2.2.0 - - - - - - - - - - - - 2.2.0 - - - - - - - - - - - - - - - - - - - - - - - 2.2.5 - - - - - - - 2.2.0 - - - - - - - - + + + + - 2.2.0 + 3.0.0 - - - - - - - 2.2.0 - - - - - - - - - - - - - - 2.2.0 - - - - - - - - - - - - - - - + + + + - 2.2.0 + 3.0.0 - - - - + + + - 2.2.0 + 3.0.0 - - - - - - 2.2.0 - - - - - 2.2.0 - - - - - - 2.2.0 - - - - - - - - 2.2.0 - - - - - - - 2.2.0 - - - - - - - 2.2.0 - - - - - - - - - - - 2.2.0 - - - - - - - - - - - - - - - - - - - 2.2.0 - - - - - - - - - - - - 2.2.0 - - - - - - - 2.2.2 - - - - - - - - - - - - - - - - - - 2.2.6 - - - - - - - - - - - 2.2.6 - - - - - - - - - - - 2.2.1 - - - - - - - - - - - - - - - - - - - 2.2.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2.2.0 - - - - - - - - - - - - 2.2.0 - - - - + - 2.2.0 + 3.0.0 - - + + - - - - - - - 2.2.1 - - - - - - - - - - - - - - 2.2.0 - - - - - - - - - - 2.2.0 - - - - - - - - - - - 1.1.0 - - - - - - - + + - 1.1.0 + 3.0.0 - - + + + + + + 3.0.0 + + + + + + + + + + + + + + + - 1.1.0 + 3.0.0 - - - - - + + + - - - - - - - - 1.1.0 - - - - - - - - - + + + - 1.1.0 + 3.0.0 + + + - - + - 1.1.5 + 3.0.0 + - - - - 1.1.5 + + + 3.0.0 - - - - - + + + - 1.1.0 + 3.0.0 - - - - - - - - - - - - - + + + + + + + - 1.1.5 + 3.0.0 - + - - + - - - 1.1.0 - - - - - - - - 2.2.0 - - - - - - - - 2.2.7 + 3.0.0 - - - - + + - - - 2.2.0 + + + 3.0.0 - - - - - - + + + - 2.2.0 + 3.0.0 - - - + + - - - 2.2.1 + + + 3.0.0 - - - - - - - - - 2.2.0 + + + 3.0.0 - - - - - - - 2.2.0 + + + 3.0.0 - - - - - - - - - - - - - - - - - - - - - - - 2.2.0 + + + 3.0.0 + + + + 3.0.0 + + + + 3.0.0 + + + + 3.0.0 - - - - - - - - - - - - 2.2.0 + 3.0.0 - - - - + + + + - 2.2.0 + 3.0.0 + + + + + - - - - + + + - 2.2.0 + 3.0.0 + + + + - - - - - - - 2.2.0 - - - - - - - - 2.2.0 - - - - - - 2.2.0 - - - - + + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index b541b834a2..52cbb358f4 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -1,138 +1,91 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/tools/BaselineGenerator/BaselineGenerator.csproj b/eng/tools/BaselineGenerator/BaselineGenerator.csproj index 79fd9175cf..6bf2e6e67d 100644 --- a/eng/tools/BaselineGenerator/BaselineGenerator.csproj +++ b/eng/tools/BaselineGenerator/BaselineGenerator.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.0 - -s https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json + -s https://api.nuget.org/v3/index.json $(MSBuildThisFileDirectory)../../ From c97484217fbef9ec44dbf2a2cf4042d33855f00e Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 24 Sep 2019 17:21:49 -0700 Subject: [PATCH 03/12] Update branding to 3.0.1 - aspnet/AspNetCore-Internal#3153 --- Directory.Build.targets | 6 +++++ eng/PatchConfig.props | 55 +---------------------------------------- eng/Versions.props | 9 +++---- 3 files changed, 11 insertions(+), 59 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index c31b6f65b6..67e287d0c7 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -59,6 +59,12 @@ + + true $(PackagesInPatch.Contains(' $(PackageId);')) diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 2c26521f8c..b8b76f7355 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -4,8 +4,8 @@ This file contains a list of the package IDs which are patching in a given relea CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky. When adding a new package, make sure the new line ends with a semicolon and starts with a space. -Later on, this will be checked using this condition: +Directory.Build.props checks this property using the following condition: $(PackagesInPatch.Contains(' $(PackageId);')) --> @@ -17,57 +17,4 @@ Later on, this will be checked using this condition: - - - @aspnet/signalr; - Microsoft.AspNetCore.AspNetCoreModuleV2; - Microsoft.AspNetCore.Authentication.Google; - Microsoft.AspNetCore.Http; - Microsoft.AspNetCore.Mvc.Core; - Microsoft.AspNetCore.Routing; - Microsoft.AspNetCore.Server.IIS; - java:signalr; - - - - - @aspnet/signalr; - Microsoft.AspNetCore.AspNetCoreModuleV2; - - - - - Microsoft.AspNetCore.AspNetCoreModule; - Microsoft.AspNetCore.AspNetCoreModuleV2; - Microsoft.AspNetCore.Identity.UI; - java:signalr; - Microsoft.AspNetCore.SignalR.Protocols.MessagePack; - Microsoft.AspNetCore.SignalR.Redis; - Microsoft.AspNetCore.SignalR.StackExchangeRedis; - Microsoft.AspNetCore.DataProtection.StackExchangeRedis; - Microsoft.AspNetCore.Mvc.Core; - Microsoft.AspNetCore.Mvc.RazorPages; - Microsoft.AspNetCore.AzureAppServicesIntegration; - Microsoft.AspNetCore.AzureAppServices.HostingStartup; - Microsoft.AspNetCore.AzureAppServices.SiteExtension; - - - - - Microsoft.AspNetCore.Mvc.Api.Analyzers; - Microsoft.AspNetCore.Server.HttpSys; - Microsoft.AspNetCore.Server.IIS; - - - - - Microsoft.AspNetCore.DataProtection.AzureStorage; - Microsoft.AspNetCore.Hosting; - Microsoft.AspNetCore.SpaServices; - - - - - - diff --git a/eng/Versions.props b/eng/Versions.props index 023598352f..23496f30b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,19 +8,18 @@ 3 0 - 0 - 2 + 1 - true + false release true false - rc$(PreReleasePreviewNumber) - Release Candidate $(PreReleasePreviewNumber) + servicing + Servicing 9 preview$(BlazorClientPreReleasePreviewNumber) From fcad3da55816ac4c9c94ad8e5f62196dec518c2f Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 24 Sep 2019 19:28:40 -0700 Subject: [PATCH 04/12] Disable up-to-date check of package baselines --- eng/targets/Packaging.targets | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets index fdef1de7a3..2d738a8cab 100644 --- a/eng/targets/Packaging.targets +++ b/eng/targets/Packaging.targets @@ -1,7 +1,11 @@ + From 8bfb2a77bfa68b1df79c7aa191023d3157e01fa1 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 24 Sep 2019 20:04:57 -0700 Subject: [PATCH 05/12] Correct and centralize a couple of conditions - add `$(IgnorePackageBaselines)` property --- Directory.Build.targets | 6 +++--- eng/Versions.props | 5 +++++ eng/targets/Packaging.targets | 6 +----- eng/targets/ResolveReferences.targets | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 67e287d0c7..89f3cb733c 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -60,11 +60,11 @@ true + Condition="'$(IsPackageInThisPatch)' == '' AND '$(StabilizePackageVersion)' != 'true'">true $(PackagesInPatch.Contains(' $(PackageId);')) diff --git a/eng/Versions.props b/eng/Versions.props index 23496f30b2..5aa6860892 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,6 +26,11 @@ $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) false + + true true $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets index 2d738a8cab..0d31c13ea6 100644 --- a/eng/targets/Packaging.targets +++ b/eng/targets/Packaging.targets @@ -1,11 +1,7 @@ - diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 263edf3eaa..1000b4a1ff 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -45,7 +45,8 @@ * when a project is a test or sample project We don't use project references between components in servicing builds between compontents to preserve the baseline as much as possible. --> - true + true + true true false From 2d9d13aa38af185612848fe88bd9da8fefd5e73d Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 25 Sep 2019 15:12:51 -0700 Subject: [PATCH 06/12] Further centralize choice to opt out of servicing features for now - no changes in known frameworks, targeting pack features, et cetera --- Directory.Build.targets | 9 ++------- eng/Versions.props | 10 ++++++---- eng/targets/Packaging.targets | 2 +- eng/targets/ResolveReferences.targets | 4 ++-- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 89f3cb733c..0bbb16aa49 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -58,13 +58,8 @@ - - - true + $(PackagesInPatch.Contains(' $(PackageId);')) diff --git a/eng/Versions.props b/eng/Versions.props index 5aa6860892..a0c39b7f4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,12 +27,14 @@ false - true + true - true + true $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) $(VersionPrefix) diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets index 0d31c13ea6..fdef1de7a3 100644 --- a/eng/targets/Packaging.targets +++ b/eng/targets/Packaging.targets @@ -1,7 +1,7 @@ diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 1000b4a1ff..3471b276f3 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -36,7 +36,8 @@ --> true true - true + true false - true true true false From e233890a257b5a20b1c9b300a7a37dff92acfec0 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 26 Sep 2019 15:21:48 -0700 Subject: [PATCH 07/12] Suppress errors for removed references in Components.csproj --- .../Components/src/Microsoft.AspNetCore.Components.csproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj index a7ad3493c9..b0607265dd 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj @@ -23,6 +23,14 @@ + + + + + + + + Date: Thu, 26 Sep 2019 21:56:40 -0700 Subject: [PATCH 08/12] Disable building targeting pack - `$(IsServicingBuild)` disabled at the moment --- Directory.Build.props | 2 +- eng/targets/ResolveReferences.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 66e5b316b1..3e016ff908 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -86,7 +86,7 @@ aspnetcore-targeting-pack - false + false + <_TarArchiveOutputPath>$(TarArchiveOutputPath) + <_TarArchiveOutputPath + Condition="Exists('$(repoRoot)\.tools\tar.fromGit')">/$(TarArchiveOutputPath.Replace('\','/').Replace(':','')) + + + - + + + + + + From fd34e14f4aa920b57d2136295ef8408d11c84e04 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Mon, 30 Sep 2019 19:14:00 -0700 Subject: [PATCH 10/12] Create missing directory and simplify workaround slightly --- eng/scripts/InstallTar.ps1 | 6 ++---- .../ref/Microsoft.AspNetCore.App.Ref.csproj | 14 +++----------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/eng/scripts/InstallTar.ps1 b/eng/scripts/InstallTar.ps1 index 93f419b213..12159a8d0b 100644 --- a/eng/scripts/InstallTar.ps1 +++ b/eng/scripts/InstallTar.ps1 @@ -25,13 +25,10 @@ $installDir = "$repoRoot\.tools\Git\win-x64" $tarCommand = "$installDir\usr\bin\tar.exe" $finalCommand = "$repoRoot\.tools\tar.exe" -Write-Host "Windows version and other information, because who knows" +Write-Host "Windows version and other information..." cmd.exe /c ver systeminfo.exe - Write-Host "Processor Architecture: $env:PROCESSOR_ARCHITECTURE" -Write-Host "Dumping environment" -Get-ChildItem env:\ Write-Host "Checking $env:SystemRoot\System32\tar.exe" Get-ChildItem "$env:SystemRoot\System32\ta*.exe" @@ -68,6 +65,7 @@ else { } } +New-Item "$repoRoot\.tools\" -ErrorAction SilentlyContinue -ItemType Directory Copy-Item "$tarCommand" "$finalCommand" -Verbose Write-Host "Tar now available at '$finalCommand'" diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index f1a73df741..ff5fa19191 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -170,8 +170,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant Outputs="$(ZipArchiveOutputPath);$(TarArchiveOutputPath)" Condition="'$(IsPackable)' == 'true'"> + <_TarCommand>tar <_TarCommand Condition="Exists('$(RepoRoot).tools\tar.exe')">$(RepoRoot).tools\tar.exe - <_TarCommand Condition="'$(_TarCommand)' == ''">tar <_TarArchiveOutputPath>$(TarArchiveOutputPath) @@ -185,17 +185,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant Overwrite="true" /> - - + - - + WorkingDirectory="$(TargetingPackLayoutRoot)" /> From 029a4c0a6801b5a17f07f2e25ad8e33e15ba851c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 2 Oct 2019 08:06:39 +0900 Subject: [PATCH 11/12] Update check for 413 in IIS (#14589) --- .../Inprocess/MaxRequestBodySizeTests.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs index ce112e28b2..f8e88efa84 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs @@ -49,8 +49,9 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess var result = await deploymentResult.HttpClient.PostAsync("/ReadRequestBody", new StringContent("test")); - // IIS returns a 404 instead of a 413... - Assert.Equal(HttpStatusCode.NotFound, result.StatusCode); + // IIS either returns a 404 or a 413 based on versions of IIS. + // Check for both as we don't know which specific patch version. + Assert.True(result.StatusCode == HttpStatusCode.NotFound || result.StatusCode == HttpStatusCode.RequestEntityTooLarge); } [ConditionalFact] @@ -68,7 +69,8 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess "Host: localhost", "", "A"); - await connection.Receive("HTTP/1.1 404 Not Found"); + var requestLine = await connection.ReadLineAsync(); + Assert.True(requestLine.Contains("404") || requestLine.Contains("413")); } } From 59bdc3449f44912686df0ba79d7bff00117fa028 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 2 Oct 2019 08:06:56 +0900 Subject: [PATCH 12/12] [release/2.2] Backport memory leak fix from 3.0 (#13840) --- eng/PatchConfig.props | 1 + .../src/EntityFrameworkCoreXmlRepository.cs | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 36217a524c..dc15b2cbe0 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -78,6 +78,7 @@ Later on, this will be checked using this condition: + Microsoft.AspNetCore.DataProtection.EntityFrameworkCore; diff --git a/src/DataProtection/EntityFrameworkCore/src/EntityFrameworkCoreXmlRepository.cs b/src/DataProtection/EntityFrameworkCore/src/EntityFrameworkCoreXmlRepository.cs index 62250cf3ef..0c9ff11639 100644 --- a/src/DataProtection/EntityFrameworkCore/src/EntityFrameworkCoreXmlRepository.cs +++ b/src/DataProtection/EntityFrameworkCore/src/EntityFrameworkCoreXmlRepository.cs @@ -42,8 +42,10 @@ namespace Microsoft.AspNetCore.DataProtection.EntityFrameworkCore { using (var scope = _services.CreateScope()) { - var context = scope.ServiceProvider.GetRequiredService(); - return context.DataProtectionKeys.AsNoTracking().Select(key => TryParseKeyXml(key.Xml)).ToList().AsReadOnly(); + var context = scope.ServiceProvider.GetRequiredService(); + // Put logger in a local such that `this` isn't captured. + var logger = _logger; + return context.DataProtectionKeys.AsNoTracking().Select(key => TryParseKeyXml(key.Xml, logger)).ToList().AsReadOnly(); } } @@ -65,7 +67,7 @@ namespace Microsoft.AspNetCore.DataProtection.EntityFrameworkCore } } - private XElement TryParseKeyXml(string xml) + private static XElement TryParseKeyXml(string xml, ILogger logger) { try { @@ -73,7 +75,7 @@ namespace Microsoft.AspNetCore.DataProtection.EntityFrameworkCore } catch (Exception e) { - _logger?.LogExceptionWhileParsingKeyXml(xml, e); + logger?.LogExceptionWhileParsingKeyXml(xml, e); return null; } }