From 3ea94951e9912a76a0bb5df68824448002b708b6 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Mon, 29 Jul 2024 09:28:53 +0200 Subject: [PATCH 01/14] curations: Extract setting the VCS info into a separate curation Remove some redundancy. Signed-off-by: Frank Viernau --- curations/NuGet/_/log4net.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/curations/NuGet/_/log4net.yml b/curations/NuGet/_/log4net.yml index c4e1ab64..5d20321f 100644 --- a/curations/NuGet/_/log4net.yml +++ b/curations/NuGet/_/log4net.yml @@ -2,15 +2,11 @@ curations: comment: "Set the VCS revision because there are multiple tags matching the version." vcs: - type: Git - url: "https://github.com/apache/logging-log4net.git" revision: "rel/2.0.8" - id: "NuGet::log4net:2.0.9" curations: comment: "Set the VCS revision because there are multiple tags matching the version." vcs: - type: Git - url: "https://github.com/apache/logging-log4net.git" revision: "rel/2.0.9" - id: "NuGet::log4net:2.0.10" curations: @@ -37,3 +33,9 @@ comment: "Set the VCS revision because there are multiple tags matching the version." vcs: revision: "rel/2.0.14" +- id: "NuGet::log4net:(,2.0.9]" + curations: + comment: "The package metadata lacks the VCS info." + vcs: + type: Git + url: "https://github.com/apache/logging-log4net.git" From 2769daef061a96a4278a68ab86b118289c373625 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Mon, 29 Jul 2024 09:30:05 +0200 Subject: [PATCH 02/14] curations: Simplify comments for the `log4net` curations Signed-off-by: Frank Viernau --- curations/NuGet/_/log4net.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/curations/NuGet/_/log4net.yml b/curations/NuGet/_/log4net.yml index 5d20321f..15391c09 100644 --- a/curations/NuGet/_/log4net.yml +++ b/curations/NuGet/_/log4net.yml @@ -1,36 +1,36 @@ - id: "NuGet::log4net:2.0.8" curations: - comment: "Set the VCS revision because there are multiple tags matching the version." + comment: "Multiple tags matching this version." vcs: revision: "rel/2.0.8" - id: "NuGet::log4net:2.0.9" curations: - comment: "Set the VCS revision because there are multiple tags matching the version." + comment: "Multiple tags matching this version." vcs: revision: "rel/2.0.9" - id: "NuGet::log4net:2.0.10" curations: - comment: "Set the VCS revision because there are multiple tags matching the version." + comment: "Multiple tags matching this version." vcs: revision: "rel/2.0.10" - id: "NuGet::log4net:2.0.11" curations: - comment: "Set the VCS revision because there are multiple tags matching the version." + comment: "Multiple tags matching this version." vcs: revision: "rel/2.0.11" - id: "NuGet::log4net:2.0.12" curations: - comment: "Set the VCS revision because there are multiple tags matching the version." + comment: "Multiple tags matching this version." vcs: revision: "rel/2.0.12" - id: "NuGet::log4net:2.0.13" curations: - comment: "Set the VCS revision because there are multiple tags matching the version." + comment: "Multiple tags matching this version." vcs: revision: "rel/2.0.13" - id: "NuGet::log4net:2.0.14" curations: - comment: "Set the VCS revision because there are multiple tags matching the version." + comment: "Multiple tags matching this version." vcs: revision: "rel/2.0.14" - id: "NuGet::log4net:(,2.0.9]" From 2a0a082dfa6a125640fafa39c95c743d73c29f8b Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Mon, 29 Jul 2024 09:31:50 +0200 Subject: [PATCH 03/14] curations: Set the VCS path for `log4net` Signed-off-by: Frank Viernau --- curations/NuGet/_/log4net.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/curations/NuGet/_/log4net.yml b/curations/NuGet/_/log4net.yml index 15391c09..3636746c 100644 --- a/curations/NuGet/_/log4net.yml +++ b/curations/NuGet/_/log4net.yml @@ -39,3 +39,8 @@ vcs: type: Git url: "https://github.com/apache/logging-log4net.git" +- id: "NuGet::log4net:" + curations: + comment: "The package resides in its own directory." + vcs: + path: "src/log4net" From 968f43b8718bbfcce690e964216baf3fe38742a3 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Mon, 29 Jul 2024 09:37:20 +0200 Subject: [PATCH 04/14] curations: Set the VCS path for `Microsoft.Net` Signed-off-by: Frank Viernau --- curations/NuGet/Microsoft.Net/Http.Headers.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/curations/NuGet/Microsoft.Net/Http.Headers.yml b/curations/NuGet/Microsoft.Net/Http.Headers.yml index 6d0a66f4..2604d374 100644 --- a/curations/NuGet/Microsoft.Net/Http.Headers.yml +++ b/curations/NuGet/Microsoft.Net/Http.Headers.yml @@ -1,4 +1,19 @@ -- id: "NuGet:Microsoft.Net:Http.Headers:[2.1.7,)" +- id: "NuGet:Microsoft.Net:Http.Headers:(,2.1.14[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.Net.Http.Headers" +- id: "NuGet:Microsoft.Net:Http.Headers:2.1.14" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Http/Headers/src" +- id: "NuGet:Microsoft.Net:Http.Headers:2.2.0" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.Net.Http.Headers" +- id: "NuGet:Microsoft.Net:Http.Headers:[2.2.8,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: From 6a0e169bb499c3e81f1cb52033b0067621c1b203 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Mon, 29 Jul 2024 09:37:45 +0200 Subject: [PATCH 05/14] curations: Set the VCS path for `System.Drawing.Common` Signed-off-by: Frank Viernau --- curations/NuGet/System.Drawing/Common.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/curations/NuGet/System.Drawing/Common.yml b/curations/NuGet/System.Drawing/Common.yml index ce4fe5f0..a0b7ed92 100644 --- a/curations/NuGet/System.Drawing/Common.yml +++ b/curations/NuGet/System.Drawing/Common.yml @@ -1,5 +1,10 @@ -- id: "NuGet:System.Drawing:Common:[5.0.0,)" +- id: "NuGet:System.Drawing:Common:[5.0.0,8.0.0[" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/libraries/System.Drawing.Common" +- id: "NuGet:System.Drawing:Common:[8.0.0,)" + curations: + comment: "The package has been moved from directory 'src/libraries/System.Drawing.Common'" + vcs: + path: "src/System.Drawing.Common" From 1aa029083a48283f968621871bbf54a97d8b7eb6 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Mon, 29 Jul 2024 09:19:08 +0200 Subject: [PATCH 06/14] curations: Set VCS path of some `Microsoft.AspNetCore` packages Signed-off-by: Frank Viernau --- .../Authentication.Abstractions.yml | 7 ++++++- .../Authentication.Core.yml | 7 ++++++- curations/NuGet/Microsoft.AspNetCore/Cors.yml | 6 +++--- .../Hosting.Abstractions.yml | 7 ++++++- .../Hosting.Server.Abstractions.yml | 8 +++++++- .../Microsoft.AspNetCore/Http.Abstractions.yml | 8 +++++++- .../Microsoft.AspNetCore/Http.Extensions.yml | 18 +++++++++++++++++- .../Microsoft.AspNetCore/Http.Features.yml | 8 +++++++- curations/NuGet/Microsoft.AspNetCore/Http.yml | 17 ++++++++++++++++- .../NuGet/Microsoft.AspNetCore/JsonPatch.yml | 7 ++++++- .../ResponseCaching.Abstractions.yml | 6 +++--- .../Routing.Abstractions.yml | 7 ++++++- .../NuGet/Microsoft.AspNetCore/Routing.yml | 8 +++++++- .../Microsoft.AspNetCore/WebUtilities.yml | 7 ++++++- 14 files changed, 103 insertions(+), 18 deletions(-) diff --git a/curations/NuGet/Microsoft.AspNetCore/Authentication.Abstractions.yml b/curations/NuGet/Microsoft.AspNetCore/Authentication.Abstractions.yml index c69a1463..75aa9fac 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Authentication.Abstractions.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Authentication.Abstractions.yml @@ -1,5 +1,10 @@ -- id: "NuGet:Microsoft.AspNetCore:Authentication.Abstractions:[2.1.7,)" +- id: "NuGet:Microsoft.AspNetCore:Authentication.Abstractions:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Http/Authentication.Abstractions/src" +- id: "NuGet:Microsoft.AspNetCore:Authentication.Abstractions:(,3.0.0[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.Authentication.Abstractions" diff --git a/curations/NuGet/Microsoft.AspNetCore/Authentication.Core.yml b/curations/NuGet/Microsoft.AspNetCore/Authentication.Core.yml index 9aa9d985..86f1f0ed 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Authentication.Core.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Authentication.Core.yml @@ -1,5 +1,10 @@ -- id: "NuGet:Microsoft.AspNetCore:Authentication.Core:[2.1.7,)" +- id: "NuGet:Microsoft.AspNetCore:Authentication.Core:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Http/Authentication.Core/src" +- id: "NuGet:Microsoft.AspNetCore:Authentication.Core:(,3.0.0[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.Authentication.Core" diff --git a/curations/NuGet/Microsoft.AspNetCore/Cors.yml b/curations/NuGet/Microsoft.AspNetCore/Cors.yml index 8ab7c37f..2a6070f4 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Cors.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Cors.yml @@ -1,10 +1,10 @@ -- id: "NuGet:Microsoft.AspNetCore:Cors:2.1.7" +- id: "NuGet:Microsoft.AspNetCore:Cors:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/CORS/src/Microsoft.AspNetCore.Cors" -- id: "NuGet:Microsoft.AspNetCore:Cors:[2.1.8,)" +- id: "NuGet:Microsoft.AspNetCore:Cors:(,3.0.0[" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Middleware/CORS/src" + path: "src/Microsoft.AspNetCore.Cors" diff --git a/curations/NuGet/Microsoft.AspNetCore/Hosting.Abstractions.yml b/curations/NuGet/Microsoft.AspNetCore/Hosting.Abstractions.yml index ac2a5ee1..dfdb904a 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Hosting.Abstractions.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Hosting.Abstractions.yml @@ -1,5 +1,10 @@ -- id: "NuGet:Microsoft.AspNetCore:Hosting.Abstractions:[2.1.7,)" +- id: "NuGet:Microsoft.AspNetCore:Hosting.Abstractions:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Hosting/Abstractions/src" +- id: "NuGet:Microsoft.AspNetCore:Hosting.Abstractions:(,3.0.0[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.Hosting.Abstractions" diff --git a/curations/NuGet/Microsoft.AspNetCore/Hosting.Server.Abstractions.yml b/curations/NuGet/Microsoft.AspNetCore/Hosting.Server.Abstractions.yml index 65f1b99f..7786bf3a 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Hosting.Server.Abstractions.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Hosting.Server.Abstractions.yml @@ -1,5 +1,11 @@ -- id: "NuGet:Microsoft.AspNetCore:Hosting.Server.Abstractions:[2.1.7,)" +- id: "NuGet:Microsoft.AspNetCore:Hosting.Server.Abstractions:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Hosting/Server.Abstractions/src" + +- id: "NuGet:Microsoft.AspNetCore:Hosting.Server.Abstractions:(,3.0.0[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.Hosting.Server.Abstractions" diff --git a/curations/NuGet/Microsoft.AspNetCore/Http.Abstractions.yml b/curations/NuGet/Microsoft.AspNetCore/Http.Abstractions.yml index 5680e397..a5d159d1 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Http.Abstractions.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Http.Abstractions.yml @@ -1,5 +1,11 @@ -- id: "NuGet:Microsoft.AspNetCore:Http.Abstractions:[2.1.7,)" +- id: "NuGet:Microsoft.AspNetCore:Http.Abstractions:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Http/Http.Abstractions/src" + +- id: "NuGet:Microsoft.AspNetCore:Http.Abstractions:(,3.0.0[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.Http.Abstractions" diff --git a/curations/NuGet/Microsoft.AspNetCore/Http.Extensions.yml b/curations/NuGet/Microsoft.AspNetCore/Http.Extensions.yml index eb7d5fc8..a016280b 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Http.Extensions.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Http.Extensions.yml @@ -1,5 +1,21 @@ -- id: "NuGet:Microsoft.AspNetCore:Http.Extensions:[2.1.7,)" +- id: "NuGet:Microsoft.AspNetCore:Http.Extensions:(,2.1.21[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.Http.Extensions" +- id: "NuGet:Microsoft.AspNetCore:Http.Extensions:2.1.21" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Http/Http.Extensions/src" +- id: "NuGet:Microsoft.AspNetCore:Http.Extensions:(2.1.21,3.0.0[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.Http.Extensions" +- id: "NuGet:Microsoft.AspNetCore:Http.Extensions:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Http/Http.Extensions/src" + diff --git a/curations/NuGet/Microsoft.AspNetCore/Http.Features.yml b/curations/NuGet/Microsoft.AspNetCore/Http.Features.yml index 6b39fc05..59025783 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Http.Features.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Http.Features.yml @@ -1,5 +1,11 @@ -- id: "NuGet:Microsoft.AspNetCore:Http.Features:[2.1.7,)" +- id: "NuGet:Microsoft.AspNetCore:Http.Features:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Http/Http.Features/src" +- id: "NuGet:Microsoft.AspNetCore:Http.Features:(,3.0.0[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.Http.Features" + diff --git a/curations/NuGet/Microsoft.AspNetCore/Http.yml b/curations/NuGet/Microsoft.AspNetCore/Http.yml index f1c6c457..577259a1 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Http.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Http.yml @@ -1,4 +1,19 @@ -- id: "NuGet:Microsoft.AspNetCore:Http:[2.1.7,)" +- id: "NuGet:Microsoft.AspNetCore:Http:(,2.1.22[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.Http" +- id: "NuGet:Microsoft.AspNetCore:Http:[2.1.22,2.1.34]" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Http/Http/src" +- id: "NuGet:Microsoft.AspNetCore:Http:(2.1.34,3.0.0[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.Http" +- id: "NuGet:Microsoft.AspNetCore:Http:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: diff --git a/curations/NuGet/Microsoft.AspNetCore/JsonPatch.yml b/curations/NuGet/Microsoft.AspNetCore/JsonPatch.yml index c9f846bb..37ad0ad4 100644 --- a/curations/NuGet/Microsoft.AspNetCore/JsonPatch.yml +++ b/curations/NuGet/Microsoft.AspNetCore/JsonPatch.yml @@ -1,5 +1,10 @@ -- id: "NuGet:Microsoft.AspNetCore:JsonPatch:[2.1.7,)" +- id: "NuGet:Microsoft.AspNetCore:JsonPatch:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Features/JsonPatch/src" +- id: "NuGet:Microsoft.AspNetCore:JsonPatch:(,3.0.0[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.JsonPatch" diff --git a/curations/NuGet/Microsoft.AspNetCore/ResponseCaching.Abstractions.yml b/curations/NuGet/Microsoft.AspNetCore/ResponseCaching.Abstractions.yml index 4b75df34..11b72091 100644 --- a/curations/NuGet/Microsoft.AspNetCore/ResponseCaching.Abstractions.yml +++ b/curations/NuGet/Microsoft.AspNetCore/ResponseCaching.Abstractions.yml @@ -1,10 +1,10 @@ -- id: "NuGet:Microsoft.AspNetCore:ResponseCaching.Abstractions:2.1.7" +- id: "NuGet:Microsoft.AspNetCore:ResponseCaching.Abstractions:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.Abstractions" -- id: "NuGet:Microsoft.AspNetCore:ResponseCaching.Abstractions:[2.1.8,)" +- id: "NuGet:Microsoft.AspNetCore:ResponseCaching.Abstractions:(,3.0.0[" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Middleware/ResponseCaching.Abstractions/src" + path: "src/Microsoft.AspNetCore.ResponseCaching.Abstractions" diff --git a/curations/NuGet/Microsoft.AspNetCore/Routing.Abstractions.yml b/curations/NuGet/Microsoft.AspNetCore/Routing.Abstractions.yml index 0bda6293..97f875e3 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Routing.Abstractions.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Routing.Abstractions.yml @@ -1,5 +1,10 @@ -- id: "NuGet:Microsoft.AspNetCore:Routing.Abstractions:[2.1.7,)" +- id: "NuGet:Microsoft.AspNetCore:Routing.Abstractions:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Http/Routing.Abstractions/src" +- id: "NuGet:Microsoft.AspNetCore:Routing.Abstractions:(,3.0.0[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.Routing.Abstractions" diff --git a/curations/NuGet/Microsoft.AspNetCore/Routing.yml b/curations/NuGet/Microsoft.AspNetCore/Routing.yml index 97ffc986..c49fc77a 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Routing.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Routing.yml @@ -1,5 +1,11 @@ -- id: "NuGet:Microsoft.AspNetCore:Routing:[2.1.7,)" +- id: "NuGet:Microsoft.AspNetCore:Routing:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Http/Routing/src" + +- id: "NuGet:Microsoft.AspNetCore:Routing:(,3.0.0[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.Routing" diff --git a/curations/NuGet/Microsoft.AspNetCore/WebUtilities.yml b/curations/NuGet/Microsoft.AspNetCore/WebUtilities.yml index 246e8134..de49f413 100644 --- a/curations/NuGet/Microsoft.AspNetCore/WebUtilities.yml +++ b/curations/NuGet/Microsoft.AspNetCore/WebUtilities.yml @@ -1,5 +1,10 @@ -- id: "NuGet:Microsoft.AspNetCore:WebUtilities:[2.1.7,)" +- id: "NuGet:Microsoft.AspNetCore:WebUtilities:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Http/WebUtilities/src" +- id: "NuGet:Microsoft.AspNetCore:WebUtilities:(,3.0.0[" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Microsoft.AspNetCore.WebUtilities" From d7b83bdce96f7735ebfaa3130d2291b0c0da52a5 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Mon, 29 Jul 2024 09:13:36 +0200 Subject: [PATCH 07/14] curations: Simplify two comments for setting the VCS path Signed-off-by: Frank Viernau --- curations/NuGet/Azure/Core.yml | 2 +- curations/NuGet/Azure/Identity.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/curations/NuGet/Azure/Core.yml b/curations/NuGet/Azure/Core.yml index 81e2ab59..b17bf504 100644 --- a/curations/NuGet/Azure/Core.yml +++ b/curations/NuGet/Azure/Core.yml @@ -1,5 +1,5 @@ - id: "NuGet:Azure:Core:" curations: - comment: "Set the VCS path of the module inside the multi-module repository." + comment: "The project resides in its own directory." vcs: path: "sdk/core/Azure.Core" diff --git a/curations/NuGet/Azure/Identity.yml b/curations/NuGet/Azure/Identity.yml index c07b64e1..2aa0bc42 100644 --- a/curations/NuGet/Azure/Identity.yml +++ b/curations/NuGet/Azure/Identity.yml @@ -1,5 +1,5 @@ - id: "NuGet:Azure:Identity:" curations: - comment: "Set the VCS path of the module inside the multi-module repository." + comment: "The project resides in its own directory." vcs: path: "sdk/identity/Azure.Identity" From 5b284e8392872786e26dea77a2671b90faaa8465 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Thu, 1 Aug 2024 12:15:15 +0200 Subject: [PATCH 08/14] fix(curations): Fix VCS paths for `AspNetCore.Authentication` Several targeted versions do not exist, see [1]. [1] https://www.nuget.org/packages/Microsoft.AspNetCore.Authentication Signed-off-by: Frank Viernau --- .../Microsoft.AspNetCore/Authentication.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/curations/NuGet/Microsoft.AspNetCore/Authentication.yml b/curations/NuGet/Microsoft.AspNetCore/Authentication.yml index d7f9ab95..0b2ea22b 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Authentication.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Authentication.yml @@ -1,20 +1,5 @@ -- id: "NuGet:Microsoft.AspNetCore:Authentication:2.1.7" +- id: "NuGet:Microsoft.AspNetCore:Authentication:(,2.2.0]" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Security/src/Microsoft.AspNetCore.Authentication" -- id: "NuGet:Microsoft.AspNetCore:Authentication:2.2.1" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Security/src/Microsoft.AspNetCore.Authentication" -- id: "NuGet:Microsoft.AspNetCore:Authentication:[2.1.8,2.1.31]" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Security/Authentication/Core/src" -- id: "NuGet:Microsoft.AspNetCore:Authentication:[2.2.2,)" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Security/Authentication/Core/src" + path: "src/Microsoft.AspNetCore.Authentication" From f925f66aceef87a36f3696138887c050109608cd Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Thu, 1 Aug 2024 12:20:05 +0200 Subject: [PATCH 09/14] fix(curations): Fix VCS paths for `AspNetCore.Authentication.Policy` Several targeted versions do not exist, see [1]. [1] https://www.nuget.org/packages/Microsoft.AspNetCore.Authorization.Policy Signed-off-by: Frank Viernau --- .../Authorization.Policy.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/curations/NuGet/Microsoft.AspNetCore/Authorization.Policy.yml b/curations/NuGet/Microsoft.AspNetCore/Authorization.Policy.yml index eba4b72e..7ec8d4dd 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Authorization.Policy.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Authorization.Policy.yml @@ -1,20 +1,5 @@ -- id: "NuGet:Microsoft.AspNetCore:Authorization.Policy:2.1.7" +- id: "NuGet:Microsoft.AspNetCore:Authorization.Policy:(,2.2.0]" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Security/src/Microsoft.AspNetCore.Authorization.Policy" -- id: "NuGet:Microsoft.AspNetCore:Authorization.Policy:2.2.1" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Security/src/Microsoft.AspNetCore.Authorization.Policy" -- id: "NuGet:Microsoft.AspNetCore:Authorization.Policy:[2.1.8,2.1.31]" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Security/Authorization/Policy/src" -- id: "NuGet:Microsoft.AspNetCore:Authorization.Policy:[2.2.2,)" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Security/Authorization/Policy/src" + path: "src/Microsoft.AspNetCore.Authorization.Policy" From 7c09ea55fe38fe268c8346462dd9ec61cdbd0a37 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Thu, 1 Aug 2024 12:23:18 +0200 Subject: [PATCH 10/14] fix(curations): Fix VCS paths for `AspNetCore.Authorization` Several targeted versions do not exist, see [1]. [1] https://www.nuget.org/packages/Microsoft.AspNetCore.Authorization Signed-off-by: Frank Viernau --- .../NuGet/Microsoft.AspNetCore/Authorization.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/curations/NuGet/Microsoft.AspNetCore/Authorization.yml b/curations/NuGet/Microsoft.AspNetCore/Authorization.yml index 8f222f1c..2fb8dd63 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Authorization.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Authorization.yml @@ -1,19 +1,9 @@ -- id: "NuGet:Microsoft.AspNetCore:Authorization:2.1.7" +- id: "NuGet:Microsoft.AspNetCore:Authorization:(,2.2.0]" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Security/src/Microsoft.AspNetCore.Authorization" -- id: "NuGet:Microsoft.AspNetCore:Authorization:2.2.1" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Security/src/Microsoft.AspNetCore.Authorization" -- id: "NuGet:Microsoft.AspNetCore:Authorization:[2.1.8,2.1.31]" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Security/Authorization/Core/src" -- id: "NuGet:Microsoft.AspNetCore:Authorization:[2.2.2,)" + path: "src/Microsoft.AspNetCore.Authorization" +- id: "NuGet:Microsoft.AspNetCore:Authorization:[3.0.0,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: From d2e1ddaf19f11156321193c43b666223564eea52 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Thu, 1 Aug 2024 12:24:42 +0200 Subject: [PATCH 11/14] fix(curations): Fix VCS paths for `AspNetCore.Mvc.Abstractions` Several targeted versions do not exist, see [1]. [1] https://www.nuget.org/packages/Microsoft.AspNetCore.Mvc.Abstractions Signed-off-by: Frank Viernau --- .../Microsoft.AspNetCore/Mvc.Abstractions.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/curations/NuGet/Microsoft.AspNetCore/Mvc.Abstractions.yml b/curations/NuGet/Microsoft.AspNetCore/Mvc.Abstractions.yml index 7c1f079b..2eeb591e 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Mvc.Abstractions.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Mvc.Abstractions.yml @@ -1,20 +1,15 @@ -- id: "NuGet:Microsoft.AspNetCore:Mvc.Abstractions:[2.1.7,2.1.8]" +- id: "NuGet:Microsoft.AspNetCore:Mvc.Abstractions:(,2.1.3]" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions" -- id: "NuGet:Microsoft.AspNetCore:Mvc.Abstractions:[2.1.9,2.1.31]" + path: "src/Microsoft.AspNetCore.Mvc.Abstractions" +- id: "NuGet:Microsoft.AspNetCore:Mvc.Abstractions:[2.1.37,2.2.0[" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Mvc/Mvc.Abstractions/src" -- id: "NuGet:Microsoft.AspNetCore:Mvc.Abstractions:[2.2.1,2.2.2]" +- id: "NuGet:Microsoft.AspNetCore:Mvc.Abstractions:2.2.0" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions" -- id: "NuGet:Microsoft.AspNetCore:Mvc.Abstractions:[2.2.3,)" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Mvc/Mvc.Abstractions/src" + path: "src/Microsoft.AspNetCore.Mvc.Abstractions" From b1d046dc5e6d60b2d036649f8cda76366c404bb9 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Thu, 1 Aug 2024 15:12:54 +0200 Subject: [PATCH 12/14] fix(curations): Fix VCS paths for `AspNetCore.Authentication.Policy` Several targeted versions do not exist, see [1]. Note that versions lower or equal to 2.2.0 have been released from [2], and later one from [3], with the exception that 2.1.11 through 2.1.31 have been release from [3]. [1] https://www.nuget.org/packages/Microsoft.AspNetCore.Mvc.Abstractions [2] https://github.com/aspnet/Mvc/tree [3] https://github.com/dotnet/aspnetcore Signed-off-by: Frank Viernau --- .../NuGet/Microsoft.AspNetCore/Mvc.Core.yml | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/curations/NuGet/Microsoft.AspNetCore/Mvc.Core.yml b/curations/NuGet/Microsoft.AspNetCore/Mvc.Core.yml index 0f7bfa0c..0b6035db 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Mvc.Core.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Mvc.Core.yml @@ -1,20 +1,26 @@ -- id: "NuGet:Microsoft.AspNetCore:Mvc.Core:[2.1.7,2.1.8]" +- id: "NuGet:Microsoft.AspNetCore:Mvc.Core:(,2.1.3]" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Mvc/src/Microsoft.AspNetCore.Mvc.Core" -- id: "NuGet:Microsoft.AspNetCore:Mvc.Core:[2.1.9,2.1.31]" + path: "src/Microsoft.AspNetCore.Mvc.Core" +- id: "NuGet:Microsoft.AspNetCore:Mvc.Core:[2.1.11,2.1.31]" + curations: + comment: "Set the VCS path of the module inside the multi-module repository." + vcs: + path: "src/Mvc/Mvc.Core" +- id: "NuGet:Microsoft.AspNetCore:Mvc.Core:2.2.0" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Mvc/Mvc.Core/src" -- id: "NuGet:Microsoft.AspNetCore:Mvc.Core:[2.2.1,2.2.2]" + path: "src/Microsoft.AspNetCore.Mvc.Core" +- id: "NuGet:Microsoft.AspNetCore:Mvc.Core:2.2.2" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: path: "src/Mvc/src/Microsoft.AspNetCore.Mvc.Core" -- id: "NuGet:Microsoft.AspNetCore:Mvc.Core:[2.2.3,)" +- id: "NuGet:Microsoft.AspNetCore:Mvc.Core:[2.2.5,)" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Mvc/Mvc.Core/src" + path: "src/Mvc/Mvc.Core" + From 00bfd792cc3afb1fffa2079116fe030308d2b6a7 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Thu, 1 Aug 2024 15:27:12 +0200 Subject: [PATCH 13/14] fix(curations): Fix VCS paths for `AspNetCore.Mvc.Formatters.Json` Several targeted versions do not exist, see [1]. [1] https://github.com/dotnet/aspnetcore/tree/v2.1.18/src/Mvc/Mvc.Formatters.Json Signed-off-by: Frank Viernau --- .../Mvc.Formatters.Json.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/curations/NuGet/Microsoft.AspNetCore/Mvc.Formatters.Json.yml b/curations/NuGet/Microsoft.AspNetCore/Mvc.Formatters.Json.yml index 6b11cdda..16a78271 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Mvc.Formatters.Json.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Mvc.Formatters.Json.yml @@ -1,20 +1,15 @@ -- id: "NuGet:Microsoft.AspNetCore:Mvc.Formatters.Json:[2.1.7,2.1.8]" +- id: "NuGet:Microsoft.AspNetCore:Mvc.Formatters.Json:(,2.1.3]" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json" -- id: "NuGet:Microsoft.AspNetCore:Mvc.Formatters.Json:[2.1.9,2.1.31]" + path: "src/Microsoft.AspNetCore.Mvc.Formatters.Json" +- id: "NuGet:Microsoft.AspNetCore:Mvc.Formatters.Json:2.2.0" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Mvc/Mvc.Formatters.Json/src" -- id: "NuGet:Microsoft.AspNetCore:Mvc.Formatters.Json:[2.2.1,2.2.2]" + path: "src/Microsoft.AspNetCore.Mvc.Formatters.Json" +- id: "NuGet:Microsoft.AspNetCore:Mvc.Formatters.Json:2.1.18" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json" -- id: "NuGet:Microsoft.AspNetCore:Mvc.Formatters.Json:[2.2.3,)" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Mvc/Mvc.Formatters.Json/src" + path: "src/Mvc/Mvc.Formatters.Json" From 056025b7cc6694f3128aeb5422daa72d932e8654 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Thu, 1 Aug 2024 15:30:11 +0200 Subject: [PATCH 14/14] fix(curations): Fix VCS paths for `AspNetCore.Mvc.WebApiCompatShim` Several targeted versions do not exist, see [1]. [1] https://www.nuget.org/packages/Microsoft.AspNetCore.Mvc.WebApiCompatShim Signed-off-by: Frank Viernau --- .../Mvc.WebApiCompatShim.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/curations/NuGet/Microsoft.AspNetCore/Mvc.WebApiCompatShim.yml b/curations/NuGet/Microsoft.AspNetCore/Mvc.WebApiCompatShim.yml index edc27da8..32ab49be 100644 --- a/curations/NuGet/Microsoft.AspNetCore/Mvc.WebApiCompatShim.yml +++ b/curations/NuGet/Microsoft.AspNetCore/Mvc.WebApiCompatShim.yml @@ -1,20 +1,5 @@ -- id: "NuGet:Microsoft.AspNetCore:Mvc.WebApiCompatShim:[2.1.7,2.1.8]" +- id: "NuGet:Microsoft.AspNetCore:Mvc.WebApiCompatShim:(,2.2.0]" curations: comment: "Set the VCS path of the module inside the multi-module repository." vcs: - path: "src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim" -- id: "NuGet:Microsoft.AspNetCore:Mvc.WebApiCompatShim:[2.1.9,2.1.31]" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Mvc/Mvc.WebApiCompatShim/src" -- id: "NuGet:Microsoft.AspNetCore:Mvc.WebApiCompatShim:[2.2.1,2.2.2]" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim" -- id: "NuGet:Microsoft.AspNetCore:Mvc.WebApiCompatShim:[2.2.3,)" - curations: - comment: "Set the VCS path of the module inside the multi-module repository." - vcs: - path: "src/Mvc/Mvc.WebApiCompatShim/src" + path: "src/Microsoft.AspNetCore.Mvc.WebApiCompatShim"