From c03738c50a4da50d9a13d96fa9d6134f5a59f150 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Mon, 20 Nov 2023 14:56:18 +0100 Subject: [PATCH] Apply Central package management https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management (requires package source mapping https://learn.microsoft.com/en-us/nuget/consume-packages/package-source-mapping) --- Directory.Packages.props | 43 +++++++++++++++++++ .../ICSharpCode.Decompiler.PowerShell.csproj | 6 +-- .../ICSharpCode.Decompiler.Tests.csproj | 38 ++++++++-------- .../ICSharpCode.Decompiler.csproj | 4 +- .../ICSharpCode.ILSpyCmd.csproj | 8 ++-- ICSharpCode.ILSpyX/ICSharpCode.ILSpyX.csproj | 14 +++--- ILSpy.AddIn.VS2022/ILSpy.AddIn.VS2022.csproj | 8 ++-- ILSpy.AddIn/ILSpy.AddIn.csproj | 8 ++-- .../ILSpy.BamlDecompiler.Tests.csproj | 12 +++--- .../ILSpy.BamlDecompiler.csproj | 2 - ILSpy.Installer/ILSpy.Installer.csproj | 4 ++ ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj | 10 ++--- ILSpy.Tests/ILSpy.Tests.csproj | 26 ++++++----- ILSpy/ILSpy.csproj | 16 +++---- NuGet.config | 14 +++++- SharpTreeView/ICSharpCode.TreeView.csproj | 4 +- packages.props | 35 --------------- 17 files changed, 131 insertions(+), 121 deletions(-) create mode 100644 Directory.Packages.props delete mode 100644 packages.props diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..b58fb9f4c --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,43 @@ + + + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj b/ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj index dc7b12372..f5d58901f 100644 --- a/ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj +++ b/ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj @@ -8,11 +8,9 @@ 8.0 - - - - + + diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj index ed29b4a3e..d7c4311b0 100644 --- a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj +++ b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj @@ -41,28 +41,26 @@ TRACE;ROSLYN;NET60;CS60;CS70;CS71;CS72;CS73;CS80;CS90;CS100 - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index 91cd5f649..fee5392a7 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -69,7 +69,9 @@ - + + false + diff --git a/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj b/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj index 6ee9a6c27..ca25d2eef 100644 --- a/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj +++ b/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj @@ -37,8 +37,6 @@ NU1605 - - @@ -49,9 +47,9 @@ - - - + + + diff --git a/ICSharpCode.ILSpyX/ICSharpCode.ILSpyX.csproj b/ICSharpCode.ILSpyX/ICSharpCode.ILSpyX.csproj index 373a7b7d9..a788e3659 100644 --- a/ICSharpCode.ILSpyX/ICSharpCode.ILSpyX.csproj +++ b/ICSharpCode.ILSpyX/ICSharpCode.ILSpyX.csproj @@ -44,8 +44,6 @@ - - @@ -64,12 +62,12 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ILSpy.AddIn.VS2022/ILSpy.AddIn.VS2022.csproj b/ILSpy.AddIn.VS2022/ILSpy.AddIn.VS2022.csproj index f59f65b53..e0d1db28c 100644 --- a/ILSpy.AddIn.VS2022/ILSpy.AddIn.VS2022.csproj +++ b/ILSpy.AddIn.VS2022/ILSpy.AddIn.VS2022.csproj @@ -34,7 +34,9 @@ true - + + false + @@ -45,14 +47,14 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/ILSpy.AddIn/ILSpy.AddIn.csproj b/ILSpy.AddIn/ILSpy.AddIn.csproj index 8c8870713..5ad17dfb5 100644 --- a/ILSpy.AddIn/ILSpy.AddIn.csproj +++ b/ILSpy.AddIn/ILSpy.AddIn.csproj @@ -39,7 +39,9 @@ - + + false + @@ -51,14 +53,14 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj b/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj index 15b9f07bc..5ff532b12 100644 --- a/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj +++ b/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj @@ -28,15 +28,13 @@ true - - - - - + + + - - + + diff --git a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj index 8d5b51d33..8658ab833 100644 --- a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj +++ b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj @@ -26,8 +26,6 @@ ..\ILSpy\bin\$(Configuration)\ - - diff --git a/ILSpy.Installer/ILSpy.Installer.csproj b/ILSpy.Installer/ILSpy.Installer.csproj index 0697d3872..c8f84010c 100644 --- a/ILSpy.Installer/ILSpy.Installer.csproj +++ b/ILSpy.Installer/ILSpy.Installer.csproj @@ -10,6 +10,10 @@ $(DefineConstants);$(PlatformForInstaller) + + false + + diff --git a/ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj b/ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj index eaffa19a1..5b894464a 100644 --- a/ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj +++ b/ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj @@ -34,18 +34,16 @@ - - - - + + - - + + diff --git a/ILSpy.Tests/ILSpy.Tests.csproj b/ILSpy.Tests/ILSpy.Tests.csproj index f2e5c724b..c5e5771c6 100644 --- a/ILSpy.Tests/ILSpy.Tests.csproj +++ b/ILSpy.Tests/ILSpy.Tests.csproj @@ -40,25 +40,23 @@ - - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + + + + + + + - + diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj index ce466046f..9a1aa2cdc 100644 --- a/ILSpy/ILSpy.csproj +++ b/ILSpy/ILSpy.csproj @@ -42,15 +42,13 @@ ..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.ruleset - - - - - - - - + + + + + + @@ -91,7 +89,7 @@ - + diff --git a/NuGet.config b/NuGet.config index 40b60b165..0c7a5326e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,8 +1,20 @@  - + + + + + + + + + + + + + diff --git a/SharpTreeView/ICSharpCode.TreeView.csproj b/SharpTreeView/ICSharpCode.TreeView.csproj index a5a575f8d..a0b1c2b99 100644 --- a/SharpTreeView/ICSharpCode.TreeView.csproj +++ b/SharpTreeView/ICSharpCode.TreeView.csproj @@ -20,10 +20,8 @@ true - - - + diff --git a/packages.props b/packages.props deleted file mode 100644 index cd5699586..000000000 --- a/packages.props +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - 8.0.0 - 8.0.0 - 6.0.0 - 8.0.0 - - 1.1.0-beta2-22171-02 - 0.11.5 - 6.3.0.90 - 2.10.0 - - - - 3.14.0 - 4.5.0 - 3.0.134 - 6.0.0 - 17.8.0 - 2017.7.26.1241 - - 4.8.0-3.final - - 8.0.0 - - 8.0.0 - -