From c7918db0f219bd3d310dea8412c5df1b1d83660d Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Thu, 26 Sep 2024 22:06:45 +0200 Subject: [PATCH 01/10] (GH-4336) Switch to Central Package Management (CPM) * fixes #4336 --- src/Cake.Cli/Cake.Cli.csproj | 6 +-- .../Cake.Common.Tests.csproj | 10 ++--- src/Cake.Core.Tests/Cake.Core.Tests.csproj | 14 +++---- src/Cake.Core/Cake.Core.csproj | 4 +- .../Cake.DotNetTool.Module.Tests.csproj | 10 ++--- .../Cake.Frosting.Tests.csproj | 12 +++--- src/Cake.Frosting/Cake.Frosting.csproj | 2 +- src/Cake.NuGet.Tests/Cake.NuGet.Tests.csproj | 10 ++--- src/Cake.NuGet/Cake.NuGet.csproj | 16 ++++---- .../Cake.Testing.Xunit.csproj | 2 +- src/Cake.Tests/Cake.Tests.csproj | 10 ++--- src/Cake/Cake.csproj | 14 +++---- src/Directory.Build.props | 4 -- src/Directory.Packages.props | 39 +++++++++++++++++++ src/Shared.msbuild | 3 -- 15 files changed, 94 insertions(+), 62 deletions(-) create mode 100644 src/Directory.Packages.props diff --git a/src/Cake.Cli/Cake.Cli.csproj b/src/Cake.Cli/Cake.Cli.csproj index eed7226fd0..dadf5563c8 100644 --- a/src/Cake.Cli/Cake.Cli.csproj +++ b/src/Cake.Cli/Cake.Cli.csproj @@ -18,8 +18,8 @@ - - - + + + \ No newline at end of file diff --git a/src/Cake.Common.Tests/Cake.Common.Tests.csproj b/src/Cake.Common.Tests/Cake.Common.Tests.csproj index eac957736b..13006b8ef1 100644 --- a/src/Cake.Common.Tests/Cake.Common.Tests.csproj +++ b/src/Cake.Common.Tests/Cake.Common.Tests.csproj @@ -16,14 +16,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/src/Cake.Core.Tests/Cake.Core.Tests.csproj b/src/Cake.Core.Tests/Cake.Core.Tests.csproj index 35761988fe..4d65a57456 100644 --- a/src/Cake.Core.Tests/Cake.Core.Tests.csproj +++ b/src/Cake.Core.Tests/Cake.Core.Tests.csproj @@ -14,16 +14,16 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/src/Cake.Core/Cake.Core.csproj b/src/Cake.Core/Cake.Core.csproj index a3f0dc4585..1f4fb98c2e 100644 --- a/src/Cake.Core/Cake.Core.csproj +++ b/src/Cake.Core/Cake.Core.csproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/Cake.DotNetTool.Module.Tests/Cake.DotNetTool.Module.Tests.csproj b/src/Cake.DotNetTool.Module.Tests/Cake.DotNetTool.Module.Tests.csproj index 09fc56ada2..3a31d930d1 100644 --- a/src/Cake.DotNetTool.Module.Tests/Cake.DotNetTool.Module.Tests.csproj +++ b/src/Cake.DotNetTool.Module.Tests/Cake.DotNetTool.Module.Tests.csproj @@ -16,13 +16,13 @@ - - - + + + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/src/Cake.Frosting.Tests/Cake.Frosting.Tests.csproj b/src/Cake.Frosting.Tests/Cake.Frosting.Tests.csproj index 4ab5271321..abd5e96878 100644 --- a/src/Cake.Frosting.Tests/Cake.Frosting.Tests.csproj +++ b/src/Cake.Frosting.Tests/Cake.Frosting.Tests.csproj @@ -8,15 +8,15 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/Cake.Frosting/Cake.Frosting.csproj b/src/Cake.Frosting/Cake.Frosting.csproj index 629957d9ff..672899f081 100644 --- a/src/Cake.Frosting/Cake.Frosting.csproj +++ b/src/Cake.Frosting/Cake.Frosting.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Cake.NuGet.Tests/Cake.NuGet.Tests.csproj b/src/Cake.NuGet.Tests/Cake.NuGet.Tests.csproj index 5fce4630ad..5db3525641 100644 --- a/src/Cake.NuGet.Tests/Cake.NuGet.Tests.csproj +++ b/src/Cake.NuGet.Tests/Cake.NuGet.Tests.csproj @@ -15,14 +15,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/src/Cake.NuGet/Cake.NuGet.csproj b/src/Cake.NuGet/Cake.NuGet.csproj index 56dd8fe361..dca66d7bb3 100644 --- a/src/Cake.NuGet/Cake.NuGet.csproj +++ b/src/Cake.NuGet/Cake.NuGet.csproj @@ -18,17 +18,17 @@ - - - - - - - + + + + + + + - + All diff --git a/src/Cake.Testing.Xunit/Cake.Testing.Xunit.csproj b/src/Cake.Testing.Xunit/Cake.Testing.Xunit.csproj index 61909845ce..72ccdb4895 100644 --- a/src/Cake.Testing.Xunit/Cake.Testing.Xunit.csproj +++ b/src/Cake.Testing.Xunit/Cake.Testing.Xunit.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Cake.Tests/Cake.Tests.csproj b/src/Cake.Tests/Cake.Tests.csproj index 606de1552e..e58d52e762 100644 --- a/src/Cake.Tests/Cake.Tests.csproj +++ b/src/Cake.Tests/Cake.Tests.csproj @@ -10,14 +10,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/src/Cake/Cake.csproj b/src/Cake/Cake.csproj index 1683c25491..9a0c6c7247 100644 --- a/src/Cake/Cake.csproj +++ b/src/Cake/Cake.csproj @@ -26,12 +26,12 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b7c02cade1..9e02a2cca0 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -4,8 +4,4 @@ true true - - - - diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props new file mode 100644 index 0000000000..3622f46964 --- /dev/null +++ b/src/Directory.Packages.props @@ -0,0 +1,39 @@ + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Shared.msbuild b/src/Shared.msbuild index 5de0cd2088..13bbb99e00 100644 --- a/src/Shared.msbuild +++ b/src/Shared.msbuild @@ -58,8 +58,5 @@ - - All - From ea9a3165d3651f64cd2c104f33881abd5fbf22e0 Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Thu, 26 Sep 2024 22:11:07 +0200 Subject: [PATCH 02/10] (GH-4337) Update Xunit to 2.9.1 * fixes #4337 --- src/Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 3622f46964..ef973bca3c 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -33,7 +33,7 @@ - - + + From 20ef2a9f71503b60cf5917bc2618b628d9e2f5bf Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Thu, 26 Sep 2024 22:14:20 +0200 Subject: [PATCH 03/10] (GH-4338) Update Microsoft.NET.Test.Sdk to 17.11.1 * fixes #4338 --- src/Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index ef973bca3c..8c9e237077 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -15,9 +15,9 @@ - + - + From 6341c648f3a203667ba12fd0bec6661621c771f1 Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Thu, 26 Sep 2024 22:16:56 +0200 Subject: [PATCH 04/10] (GH-4339) Update Verify.Xunit to 26.6.0 * fixes #4339 --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 8c9e237077..4586bdb1ae 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -32,7 +32,7 @@ - + From 7ca34497579c2532c06299e8ac5ce5c67c5340db Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Thu, 26 Sep 2024 22:20:14 +0200 Subject: [PATCH 05/10] (GH-4340) Update NuGet.* to 6.11.0 * fixes #4340 --- src/Directory.Packages.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 4586bdb1ae..a0ad39c897 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -21,12 +21,12 @@ - - - - - - + + + + + + From 09d0507199321bfed757b0319f688257ed334b0c Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Thu, 26 Sep 2024 22:21:51 +0200 Subject: [PATCH 06/10] (GH-4341) Update Autofac to 8.1.0 * fixes #4341 --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index a0ad39c897..e5d0638999 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -6,7 +6,7 @@ - + From 7c6ef3d314e8a01df3785ced9de5ca93c04d07e4 Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Thu, 26 Sep 2024 22:24:09 +0200 Subject: [PATCH 07/10] (GH-4342) Update Basic.Reference.Assemblies.* to 1.7.9 * fixes #4342 --- src/Directory.Packages.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index e5d0638999..ee9253e655 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -7,9 +7,9 @@ - - - + + + From 9c15e2e59faed9ae85be2115b936dbb4434f4c77 Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Thu, 26 Sep 2024 22:26:20 +0200 Subject: [PATCH 08/10] (GH-4343) Update Microsoft.CodeAnalysis.CSharp.Scripting to 4.11.0 * fixes #4343 --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index ee9253e655..66f40aec38 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -12,7 +12,7 @@ - + From 88ec45ad46de13189eee19a00e663fb1ae61911c Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Thu, 26 Sep 2024 22:51:05 +0200 Subject: [PATCH 09/10] Address xUnit2029 Warning, replace Assert Empty with DoesNotContain --- src/Cake.Common.Tests/Unit/IO/DirectoryAliasesTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cake.Common.Tests/Unit/IO/DirectoryAliasesTests.cs b/src/Cake.Common.Tests/Unit/IO/DirectoryAliasesTests.cs index 64d043be14..ad12d8b6a3 100644 --- a/src/Cake.Common.Tests/Unit/IO/DirectoryAliasesTests.cs +++ b/src/Cake.Common.Tests/Unit/IO/DirectoryAliasesTests.cs @@ -126,7 +126,7 @@ public void Should_Delete_Files_Respecting_Predicate_In_Provided_Directory() DirectoryAliases.CleanDirectory(context, directory, wherePredicate); // Then - Assert.Empty(fixture.FileSystem.GetDirectory(directory).GetFiles("*", SearchScope.Recursive).Where(wherePredicate)); + Assert.DoesNotContain(fixture.FileSystem.GetDirectory(directory).GetFiles("*", SearchScope.Recursive), file => wherePredicate(file)); Assert.Equal(filesNotMatchingPredicate, fixture.FileSystem.GetDirectory(directory).GetFiles("*", SearchScope.Recursive)); } @@ -198,7 +198,7 @@ public void Should_Delete_Readonly_Files_Respecting_Predicate_In_Provided_Direct DirectoryAliases.CleanDirectory(context, directory, wherePredicate, new CleanDirectorySettings { Force = true }); // Then - Assert.Empty(fixture.FileSystem.GetDirectory(directory).GetFiles("*", SearchScope.Recursive).Where(wherePredicate)); + Assert.DoesNotContain(fixture.FileSystem.GetDirectory(directory).GetFiles("*", SearchScope.Recursive), file => wherePredicate(file)); Assert.Equal(filesNotMatchingPredicate, fixture.FileSystem.GetDirectory(directory).GetFiles("*", SearchScope.Recursive)); Assert.Single(filesNotMatchingPredicate); From 3cb268f389bd54f1182a7b2face23b9b24b0ac3f Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Thu, 26 Sep 2024 23:37:30 +0200 Subject: [PATCH 10/10] Update SDK to 8.0.402 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 05239f3b96..1204878d9d 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "src" ], "sdk": { - "version": "8.0.100", + "version": "8.0.402", "rollForward": "latestFeature" } } \ No newline at end of file