From 970bced25c6ad2f13826c84904bb3c464d143f50 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Mon, 14 Jan 2019 11:40:01 -0800 Subject: [PATCH] Update branding to 2.2.2 (#6608) - pin System.Net.WebSockets.WebSocketProtocol to version 4.5.3 - update Directory.Build.targets files to correct build issues - fix duplicate metadata during static analysis --- build/dependencies.props | 6 ++--- build/repo.targets | 8 ------- eng/Baseline.Designer.props | 22 +++++++++---------- eng/Baseline.xml | 16 +++++++------- eng/PatchConfig.props | 4 ++++ modules/EntityFrameworkCore | 2 +- modules/Scaffolding | 2 +- .../ArchiveBaseline.2.2.1.txt | 2 ++ .../ArchiveBaseline.2.2.1.txt | 2 ++ .../Directory.Build.targets | 10 +++++---- .../Directory.Build.targets | 8 ++++--- src/Templating/version.props | 2 +- version.props | 2 +- 13 files changed, 45 insertions(+), 41 deletions(-) create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.1.txt create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.1.txt diff --git a/build/dependencies.props b/build/dependencies.props index 1a7f1a79a3..92a658f8f7 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,9 +2,8 @@ - 2.2.0 - 2.2.0 - 4.5.2 + 2.2.1 + 2.2.1 @@ -254,6 +253,7 @@ 4.9.0 4.5.1 4.5.0 + 4.5.3 1.3.7 9.0.1 2.9.0-beta4-62911-02 diff --git a/build/repo.targets b/build/repo.targets index 06ee707f2e..78d2deaee5 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -96,14 +96,6 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0 + 2.2.1 @@ -77,11 +77,11 @@ - 2.2.0 + 2.2.1 - 2.2.0 + 2.2.1 @@ -361,7 +361,7 @@ - 2.2.0 + 2.2.1 @@ -951,7 +951,7 @@ - 2.2.0 + 2.2.1 @@ -962,7 +962,7 @@ - 2.2.0 + 2.2.1 @@ -1045,16 +1045,16 @@ - 2.2.0 + 2.2.1 - + - + @@ -1228,13 +1228,13 @@ - 2.2.0 + 2.2.1 - + diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 8e7c274216..ffbac36785 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.2.x. Update this list when preparing for a new patch. --> - + @@ -12,8 +12,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - - + + @@ -46,7 +46,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - + @@ -102,13 +102,13 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - - + + - + @@ -125,7 +125,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index a73fcec019..2636d7aaab 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -25,5 +25,9 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore; + + + + diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 8e7402701e..536335387b 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 8e7402701ea1416b7fe55e1863ae65b3147c02c7 +Subproject commit 536335387bb56f17621c7e4b4a1139bbbdd8f555 diff --git a/modules/Scaffolding b/modules/Scaffolding index a8a3c4d6bc..8295c4b56c 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit a8a3c4d6bcef48a3dd464d03f629a0a18dbf3110 +Subproject commit 8295c4b56c125d3f536020618a49c6a16017ca25 diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.1.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.1.txt new file mode 100644 index 0000000000..32e44e3dfa --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.1.txt @@ -0,0 +1,2 @@ +system.diagnostics.process\4.3.0\.signature.p7s +system.reflection.emit.ilgeneration\4.3.0\.signature.p7s diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.1.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.1.txt new file mode 100644 index 0000000000..32e44e3dfa --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.1.txt @@ -0,0 +1,2 @@ +system.diagnostics.process\4.3.0\.signature.p7s +system.reflection.emit.ilgeneration\4.3.0\.signature.p7s diff --git a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets index 9b37939d97..6c98f58361 100644 --- a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets +++ b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets @@ -22,15 +22,17 @@ $(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg - + NuGetPackage $(PackageId) - $(PackageVersion) - $(PackageSigningCertName) - true + $(PackageVersion) + $(BaselinePackageVersion) + $(PackageSigningCertName) + $(IsPackageInThisPatch) true + true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets index 3ccb87cc94..fd5dee1767 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets +++ b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets @@ -21,15 +21,17 @@ $(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg - + NuGetPackage $(PackageId) - $(PackageVersion) + $(PackageVersion) + $(BaselinePackageVersion) $(PackageSigningCertName) - true + $(IsPackageInThisPatch) true + true diff --git a/src/Templating/version.props b/src/Templating/version.props index 44c860c5f8..4531e641d0 100644 --- a/src/Templating/version.props +++ b/src/Templating/version.props @@ -1,6 +1,6 @@ - 2.2.1 + 2.2.2 servicing $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final diff --git a/version.props b/version.props index 8b3c0b4ccf..4169779f11 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ 2 2 - 1 + 2 servicing $([System.DateTime]::Now.ToString('yyMMdd'))-99