From 4d86ae065349ed6071b76e4c09badb1801049887 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 4 Feb 2021 07:41:23 +0000 Subject: [PATCH 01/17] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 6 +++++- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3745056e3842..7a1414045d17 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,6 +19,7 @@ + @@ -35,10 +36,13 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81118f21b461..e8a0c7c15ed2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -199,7 +199,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + d1e2874de3956c618626ee46554a093f28a330e2 https://github.com/dotnet/runtime @@ -207,7 +207,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + d1e2874de3956c618626ee46554a093f28a330e2 https://github.com/dotnet/runtime @@ -296,22 +296,22 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + d1e2874de3956c618626ee46554a093f28a330e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + d1e2874de3956c618626ee46554a093f28a330e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + d1e2874de3956c618626ee46554a093f28a330e2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + d1e2874de3956c618626ee46554a093f28a330e2 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index fb3f936243a2..da574f3de637 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.3-servicing.21072.12 + 5.0.3-servicing.21103.12 5.0.0 5.0.3 - 5.0.3-servicing.21072.12 + 5.0.3-servicing.21103.12 5.0.0 5.0.0 5.0.0 From 3da1f90d82f3f7f48f84bd13ea9d6bbc8798eabf Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 10 Feb 2021 17:52:10 +0000 Subject: [PATCH 02/17] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 19 ++----------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7a1414045d17..e7d2d341a3eb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,9 @@ - - + @@ -20,22 +19,8 @@ - - - - - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8a0c7c15ed2..bf595bda14ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -294,17 +294,17 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d1e2874de3956c618626ee46554a093f28a330e2 + 8a5d98fbfbc4ae88cc0889d0f9f4152f9f73f7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d1e2874de3956c618626ee46554a093f28a330e2 + 8a5d98fbfbc4ae88cc0889d0f9f4152f9f73f7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d1e2874de3956c618626ee46554a093f28a330e2 + 8a5d98fbfbc4ae88cc0889d0f9f4152f9f73f7a6 diff --git a/eng/Versions.props b/eng/Versions.props index 0d1043327e5b..9bcf72b2d15c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.3-servicing.21103.12 + 5.0.4-servicing.21110.6 5.0.0 - 5.0.3 - 5.0.3-servicing.21103.12 + 5.0.4 + 5.0.4-servicing.21110.6 5.0.0 5.0.0 5.0.0 From f605914f4af78e0fff07506e38b4852b8bbe74d4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 10 Feb 2021 21:49:32 +0000 Subject: [PATCH 03/17] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index e7d2d341a3eb..77b6de04d2cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf595bda14ee..1783cc8c42be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8a5d98fbfbc4ae88cc0889d0f9f4152f9f73f7a6 + 1034492d1887f2de0564524e869674f09c43154a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8a5d98fbfbc4ae88cc0889d0f9f4152f9f73f7a6 + 1034492d1887f2de0564524e869674f09c43154a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8a5d98fbfbc4ae88cc0889d0f9f4152f9f73f7a6 + 1034492d1887f2de0564524e869674f09c43154a diff --git a/eng/Versions.props b/eng/Versions.props index 9bcf72b2d15c..7dd249f683c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.4-servicing.21110.6 + 5.0.4-servicing.21110.9 5.0.0 5.0.4 - 5.0.4-servicing.21110.6 + 5.0.4-servicing.21110.9 5.0.0 5.0.0 5.0.0 From 0ebd814d2ddebc31694ef4633d029f5b8b391450 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 11 Feb 2021 07:25:57 +0000 Subject: [PATCH 04/17] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 7 ++----- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 450e4f1135c7..b7152b991bc2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -20,12 +20,9 @@ - - - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5828da5fffc..bc732643ef19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1034492d1887f2de0564524e869674f09c43154a + e705470d27292290a458aa165d3fb63120692a58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1034492d1887f2de0564524e869674f09c43154a + e705470d27292290a458aa165d3fb63120692a58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1034492d1887f2de0564524e869674f09c43154a + e705470d27292290a458aa165d3fb63120692a58 diff --git a/eng/Versions.props b/eng/Versions.props index b837240add4d..98c91e59b40e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.4-servicing.21110.9 + 5.0.4-servicing.21110.18 5.0.0 5.0.4 - 5.0.4-servicing.21110.9 + 5.0.4-servicing.21110.18 5.0.0 5.0.0 5.0.0 From 0b6dec7ccca28c42c7681e6405509ef329782a36 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 11 Feb 2021 10:23:44 +0000 Subject: [PATCH 05/17] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index b7152b991bc2..9b5bd277ef1e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc732643ef19..033729a3401d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e705470d27292290a458aa165d3fb63120692a58 + 7b663e3fddb1b98070abb0ca665b0f8ec54219e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e705470d27292290a458aa165d3fb63120692a58 + 7b663e3fddb1b98070abb0ca665b0f8ec54219e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e705470d27292290a458aa165d3fb63120692a58 + 7b663e3fddb1b98070abb0ca665b0f8ec54219e3 diff --git a/eng/Versions.props b/eng/Versions.props index 98c91e59b40e..84fe1e7c753e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.4-servicing.21110.18 + 5.0.4-servicing.21110.23 5.0.0 5.0.4 - 5.0.4-servicing.21110.18 + 5.0.4-servicing.21110.23 5.0.0 5.0.0 5.0.0 From d1303d01b3f48e9ebe8288fc680869e7df72238e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 11 Feb 2021 13:02:43 +0000 Subject: [PATCH 06/17] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9b5bd277ef1e..7bf8d4889090 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 033729a3401d..49858be7f8ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7b663e3fddb1b98070abb0ca665b0f8ec54219e3 + c54f5250738ddd9f31604aec3f44404606f5ce2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7b663e3fddb1b98070abb0ca665b0f8ec54219e3 + c54f5250738ddd9f31604aec3f44404606f5ce2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7b663e3fddb1b98070abb0ca665b0f8ec54219e3 + c54f5250738ddd9f31604aec3f44404606f5ce2a diff --git a/eng/Versions.props b/eng/Versions.props index 84fe1e7c753e..ad930b4b98fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.4-servicing.21110.23 + 5.0.4-servicing.21111.4 5.0.0 5.0.4 - 5.0.4-servicing.21110.23 + 5.0.4-servicing.21111.4 5.0.0 5.0.0 5.0.0 From 1db035bc91c496360f468e0bb12ed463ad46757d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 15 Feb 2021 02:41:35 +0000 Subject: [PATCH 07/17] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7bf8d4889090..451fed08072f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49858be7f8ed..82dd39e9204a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c54f5250738ddd9f31604aec3f44404606f5ce2a + 3b7784607e2aa3a830fb13bb800e72a41e1f5436 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c54f5250738ddd9f31604aec3f44404606f5ce2a + 3b7784607e2aa3a830fb13bb800e72a41e1f5436 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c54f5250738ddd9f31604aec3f44404606f5ce2a + 3b7784607e2aa3a830fb13bb800e72a41e1f5436 diff --git a/eng/Versions.props b/eng/Versions.props index ad930b4b98fb..75f1d74df6a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.4-servicing.21111.4 + 5.0.4-servicing.21111.14 5.0.0 5.0.4 - 5.0.4-servicing.21111.4 + 5.0.4-servicing.21111.14 5.0.0 5.0.0 5.0.0 From 1df900ee4398d8385a7df2bbc96b4367680a7e8c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Feb 2021 22:37:35 +0000 Subject: [PATCH 08/17] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 451fed08072f..61e6f09ca0c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10584f4d57c4..1076c743da36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d1e2874de3956c618626ee46554a093f28a330e2 + 10fccb80d13fa9becf8646cbcd9a0eb00dbdf48e https://github.com/dotnet/runtime @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b7784607e2aa3a830fb13bb800e72a41e1f5436 + 10fccb80d13fa9becf8646cbcd9a0eb00dbdf48e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b7784607e2aa3a830fb13bb800e72a41e1f5436 + 10fccb80d13fa9becf8646cbcd9a0eb00dbdf48e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b7784607e2aa3a830fb13bb800e72a41e1f5436 + 10fccb80d13fa9becf8646cbcd9a0eb00dbdf48e diff --git a/eng/Versions.props b/eng/Versions.props index 7ece5b6c2b75..749db50a607b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.4-servicing.21111.14 + 5.0.4-servicing.21116.6 5.0.0 5.0.4 - 5.0.4-servicing.21111.14 + 5.0.4-servicing.21116.6 5.0.0 5.0.0 5.0.0 @@ -103,7 +103,7 @@ 5.0.1 5.0.1 5.0.0 - 5.0.1 + 5.0.2 5.0.1 5.0.0 5.0.0 From 324cf99ce3fcc63ae5c596efe41ed9902253d39c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Feb 2021 20:43:45 +0000 Subject: [PATCH 09/17] Merged PR 12929: [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:d7d10d70-26ab-4663-2902-08d89c6af29b) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: d7d10d70-26ab-4663-2902-08d89c6af29b - **Build**: 20210216.14 - **Date Produced**: 2/16/2021 11:36 PM - **Commit**: f27d33729518f5aa478aa818b7b4f54a4d50bef1 - **Branch**: refs/heads/internal/release/5.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **System.Drawing.Common**: [from 5.0.2 to 5.0.2][1] - **Microsoft.NETCore.App.Internal**: [from 5.0.4-servicing.21116.6 to 5.0.4-servicing.21116.14][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 5.0.4 to 5.0.4][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 5.0.4-servicing.21116.6 to 5.0.4-servicing.21116.14][1] - **System.Text.Encodings.Web**: [from 5.0.0 to 5.0.1][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC10fccb8&targetVersion=GCf27d337&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCcf258a1&targetVersion=GCf27d337&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d7d10d70-26ab-4663-2902-08d89c6af29b) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- .../AppWithP2PReference.csproj | 5 +++++ .../ClassLibrary/ClassLibrary.csproj | 5 +++++ .../ClassLibrary2/ClassLibrary2.csproj | 5 +++++ .../LargeProject/LargeProject.csproj | 5 +++++ .../MvcWithComponents/MvcWithComponents.csproj | 5 +++++ .../PackageLibraryDirectDependency.csproj | 5 +++++ .../PackageLibraryTransitiveDependency.csproj | 5 +++++ .../test/testassets/SimpleMvc/SimpleMvc.csproj | 5 +++++ .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj | 5 +++++ .../testassets/SimplePages/SimplePages.csproj | 5 +++++ 13 files changed, 64 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 61e6f09ca0c4..9c291bc5afba 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1076c743da36..d80e20be1ebc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,7 +207,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10fccb80d13fa9becf8646cbcd9a0eb00dbdf48e + f27d33729518f5aa478aa818b7b4f54a4d50bef1 https://github.com/dotnet/runtime @@ -266,9 +266,9 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + f27d33729518f5aa478aa818b7b4f54a4d50bef1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10fccb80d13fa9becf8646cbcd9a0eb00dbdf48e + f27d33729518f5aa478aa818b7b4f54a4d50bef1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10fccb80d13fa9becf8646cbcd9a0eb00dbdf48e + f27d33729518f5aa478aa818b7b4f54a4d50bef1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10fccb80d13fa9becf8646cbcd9a0eb00dbdf48e + f27d33729518f5aa478aa818b7b4f54a4d50bef1 diff --git a/eng/Versions.props b/eng/Versions.props index 749db50a607b..86222eb7b5b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.4-servicing.21116.6 + 5.0.4-servicing.21116.14 5.0.0 5.0.4 - 5.0.4-servicing.21116.6 + 5.0.4-servicing.21116.14 5.0.0 5.0.0 5.0.0 @@ -119,7 +119,7 @@ 5.0.0 5.0.0 5.0.0 - 5.0.0 + 5.0.1 5.0.1 5.0.0 5.0.0 diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj index 55d3ad9e6636..31c17ddd10d8 100644 --- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj +++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj @@ -29,4 +29,9 @@ + + + + + diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj index 42c33c219c81..04c8fd3770ce 100644 --- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj +++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj @@ -27,6 +27,11 @@ + + + + + diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj index 75deedd8cbb7..7956ba1433ed 100644 --- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj +++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj @@ -24,6 +24,11 @@ + + + + + diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj index 38ee709aec9e..46f4c830f275 100644 --- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj +++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj @@ -31,6 +31,11 @@ + + + + + diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj index 6bb3fcca8db2..f5e72f635e57 100644 --- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj +++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj @@ -24,6 +24,11 @@ + + + + + diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj index 2b81a4d5d771..721163731da8 100644 --- a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj +++ b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj @@ -29,6 +29,11 @@ + + + + + diff --git a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj index f5d0455baf2b..352a8a0e4b94 100644 --- a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj +++ b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj @@ -30,6 +30,11 @@ + + + + + diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj index 999e94839fe3..9eae58f9bfd0 100644 --- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj +++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj @@ -24,6 +24,11 @@ + + + + + diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj index c4d3fba39973..6356224e8980 100644 --- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj +++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj @@ -29,6 +29,11 @@ + + + + + diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj index 999e94839fe3..9eae58f9bfd0 100644 --- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj +++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj @@ -24,6 +24,11 @@ + + + + + From 94ab46fb663c38f4565c77bece4dc9b1900211dc Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 18 Feb 2021 15:57:18 +0000 Subject: [PATCH 10/17] Merged PR 13034: Fixup shas for 5.0.3 incrementally serviced packages Fixup shas for 5.0.3 incrementally serviced packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d80e20be1ebc..5d6e1d63f5b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -199,7 +199,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d1e2874de3956c618626ee46554a093f28a330e2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb https://github.com/dotnet/runtime @@ -311,7 +311,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d1e2874de3956c618626ee46554a093f28a330e2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb https://github.com/dotnet/arcade From e882394a7bb38930da748291fe2c2ceaa6a80588 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 Feb 2021 01:12:18 +0000 Subject: [PATCH 11/17] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 2 ++ eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9c291bc5afba..c48dc08f42b3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -23,6 +24,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d6e1d63f5b1..2a163cc3eb06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - - https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - efc2924e6e36db17611c7da480d5bc97a4514cb8 + + https://github.com/dotnet/efcore + cfd206aa4bc7c878dbbd91959f1c9edada70da93 - - https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - efc2924e6e36db17611c7da480d5bc97a4514cb8 + + https://github.com/dotnet/efcore + cfd206aa4bc7c878dbbd91959f1c9edada70da93 - - https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - efc2924e6e36db17611c7da480d5bc97a4514cb8 + + https://github.com/dotnet/efcore + cfd206aa4bc7c878dbbd91959f1c9edada70da93 - - https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - efc2924e6e36db17611c7da480d5bc97a4514cb8 + + https://github.com/dotnet/efcore + cfd206aa4bc7c878dbbd91959f1c9edada70da93 - - https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - efc2924e6e36db17611c7da480d5bc97a4514cb8 + + https://github.com/dotnet/efcore + cfd206aa4bc7c878dbbd91959f1c9edada70da93 - - https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - efc2924e6e36db17611c7da480d5bc97a4514cb8 + + https://github.com/dotnet/efcore + cfd206aa4bc7c878dbbd91959f1c9edada70da93 - - https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - efc2924e6e36db17611c7da480d5bc97a4514cb8 + + https://github.com/dotnet/efcore + cfd206aa4bc7c878dbbd91959f1c9edada70da93 - - https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - efc2924e6e36db17611c7da480d5bc97a4514cb8 + + https://github.com/dotnet/efcore + cfd206aa4bc7c878dbbd91959f1c9edada70da93 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 86222eb7b5b3..ac99629e6ec2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,14 +126,14 @@ 5.0.1 - 5.0.3 - 5.0.3 - 5.0.3 - 5.0.3 - 5.0.3 - 5.0.3 - 5.0.3 - 5.0.3 + 5.0.4 + 5.0.4 + 5.0.4 + 5.0.4 + 5.0.4 + 5.0.4 + 5.0.4 + 5.0.4 5.0.0-beta.21112.3 From 6704a0143f082b65f1a9ad54e7ce2252adc6ba55 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Mar 2021 11:03:58 -0800 Subject: [PATCH 12/17] Update `$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)` --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e8ff7e89d520..5909d86b715d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -236,7 +236,7 @@ 2.1.1 2.2.0 - 3.1.12-servicing-21070-12 + 3.1.13-servicing-21117-13 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) From a52244340b43f541d02fb310bedb6ca97b4fd432 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Mar 2021 11:09:13 -0800 Subject: [PATCH 13/17] Update package baselines --- eng/Baseline.Designer.props | 420 ++++++++++++++++++------------------ eng/Baseline.xml | 200 ++++++++--------- 2 files changed, 310 insertions(+), 310 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 3435aff1b4a6..29a1cde45a95 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - - - + + + @@ -37,108 +37,108 @@ - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - - + + - 5.0.3 + 5.0.4 - - + + - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - + - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 @@ -146,110 +146,110 @@ - 5.0.3 + 5.0.4 - + - + - + - 5.0.3 + 5.0.4 - + - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - + - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - - + + - 5.0.3 + 5.0.4 - + - 5.0.3 + 5.0.4 - - - + + + - 5.0.3 + 5.0.4 - - + + - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - - + + - 5.0.3 + 5.0.4 - - + + - 5.0.3 + 5.0.4 @@ -257,86 +257,86 @@ - 5.0.3 + 5.0.4 - + - + - + - + - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - + - + - + - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - - + + - 5.0.3 + 5.0.4 - + - + - + - 5.0.3 + 5.0.4 - + - + - 5.0.3 + 5.0.4 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.3 + 5.0.4 - + - 5.0.3 + 5.0.4 @@ -383,50 +383,50 @@ - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - + - + - + - 5.0.3 + 5.0.4 - + - + - + - 5.0.3 + 5.0.4 @@ -442,27 +442,27 @@ - 5.0.3 + 5.0.4 - - + + - - + + - 5.0.3 + 5.0.4 - - + + - 5.0.3 + 5.0.4 @@ -474,185 +474,185 @@ - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - + - 5.0.3 + 5.0.4 - - + + - 5.0.3 + 5.0.4 - - + + - 5.0.3 + 5.0.4 - + - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - + - 5.0.3 + 5.0.4 - + - 5.0.3 + 5.0.4 - - + + - - + + - - + + - 5.0.3 + 5.0.4 - - + + - - + + - 5.0.3 + 5.0.4 - + - + - + - 5.0.3 + 5.0.4 - + - + - + - 5.0.3 + 5.0.4 - + - + - 5.0.3 + 5.0.4 - + - + - 5.0.3 + 5.0.4 - - - - + + + + - 5.0.3 + 5.0.4 @@ -661,65 +661,65 @@ - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - + - 5.0.3 + 5.0.4 - + - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 @@ -735,42 +735,42 @@ - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - - - + + + - 5.0.3 + 5.0.4 - + - + - + - 5.0.3 + 5.0.4 @@ -780,73 +780,73 @@ - 5.0.3 + 5.0.4 - + - + - + - 5.0.3 + 5.0.4 - + - + - + - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - + - + - + - 5.0.3 + 5.0.4 @@ -867,16 +867,16 @@ - 5.0.3 + 5.0.4 - 5.0.3 + 5.0.4 - + @@ -885,17 +885,17 @@ - + - 5.0.3 + 5.0.4 - + - 5.0.3 + 5.0.4 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index f86170929541..dc276a967c75 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,105 +4,105 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 0332d9d9293a41f3cf106bef6bfd25efbfbfef88 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Mar 2021 11:13:56 -0800 Subject: [PATCH 14/17] Update SDK and runtime versions --- global.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index 5e4856113ad7..316dfecfae4e 100644 --- a/global.json +++ b/global.json @@ -1,19 +1,19 @@ { "sdk": { - "version": "5.0.103" + "version": "5.0.104" }, "tools": { - "dotnet": "5.0.103", + "dotnet": "5.0.104", "runtimes": { "dotnet/x64": [ - "2.1.25", + "2.1.26", "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "dotnet/x86": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "aspnetcore/x64": [ - "3.1.12" + "3.1.13" ] }, "Git": "2.22.0", From dfad24463ef2b78ea0a37c50118ebc5025d3d6d9 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Mar 2021 15:21:05 -0800 Subject: [PATCH 15/17] Re-enable package baseline validation --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5909d86b715d..0e3193d6d843 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 5 0 5 - false + true From f190980f6249cf5f6c79d45be190851b7d092862 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Mar 2021 15:21:41 -0800 Subject: [PATCH 16/17] Update `BaselineGenerator` - handle `netcoreapp5.0` from `NuspecReader` --- eng/tools/BaselineGenerator/Program.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/tools/BaselineGenerator/Program.cs b/eng/tools/BaselineGenerator/Program.cs index e77b35edeeeb..cd8c41d39468 100644 --- a/eng/tools/BaselineGenerator/Program.cs +++ b/eng/tools/BaselineGenerator/Program.cs @@ -91,9 +91,11 @@ private async Task Run() var baselineVersion = input.Root.Attribute("Version").Value; // Baseline and .NET Core versions always align in non-preview releases. + // But, NuspecReader reports netcoreapp5.0 instead of net5.0. We use net5.0 in Baseline.Designer.props. var parsedVersion = Version.Parse(baselineVersion); var defaultTarget = ((parsedVersion.Major < 5) ? "netcoreapp" : "net") + $"{parsedVersion.Major}.{parsedVersion.Minor}"; + var matchTarget = $"netcoreapp{parsedVersion.Major}.{parsedVersion.Minor}"; var doc = new XDocument( new XComment(" Auto generated. Do not edit manually, use eng/tools/BaselineGenerator/ to recreate. "), @@ -152,11 +154,11 @@ private async Task Run() var targetCondition = $"'$(TargetFramework)' == '{group.TargetFramework.GetShortFolderName()}'"; if (string.Equals( group.TargetFramework.GetShortFolderName(), - defaultTarget, + matchTarget, StringComparison.OrdinalIgnoreCase)) { targetCondition = - $"('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR {targetCondition})"; + $"('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == '{defaultTarget}')"; } var itemGroup = new XElement( From f636f74ac2f2bdf4eb9234531dacd14043e6c04c Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Mar 2021 15:25:25 -0800 Subject: [PATCH 17/17] Update conditions in Baseline.Designer.props - run fixed `BaselineGenerator` --- eng/Baseline.Designer.props | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 29a1cde45a95..60779e1f16b7 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -20,7 +20,7 @@ 5.0.4 - + @@ -79,7 +79,7 @@ 5.0.4 - + @@ -87,7 +87,7 @@ 5.0.4 - + @@ -95,7 +95,7 @@ 5.0.4 - + @@ -110,7 +110,7 @@ 5.0.4 - + @@ -121,7 +121,7 @@ 5.0.4 - + @@ -129,7 +129,7 @@ 5.0.4 - + @@ -140,7 +140,7 @@ 5.0.4 - + @@ -179,7 +179,7 @@ 5.0.4 - + @@ -251,7 +251,7 @@ 5.0.4 - + @@ -370,14 +370,14 @@ 5.0.4 - + 5.0.4 - + @@ -385,7 +385,7 @@ 5.0.4 - + @@ -456,7 +456,7 @@ 5.0.4 - + @@ -480,14 +480,14 @@ 5.0.4 - + 5.0.4 - + @@ -504,7 +504,7 @@ 5.0.4 - + @@ -513,7 +513,7 @@ 5.0.4 - + @@ -530,7 +530,7 @@ 5.0.4 - + @@ -539,7 +539,7 @@ 5.0.4 - + @@ -642,7 +642,7 @@ 5.0.4 - + @@ -654,7 +654,7 @@ 5.0.4 - + @@ -663,14 +663,14 @@ 5.0.4 - + 5.0.4 - +