diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000..6e84fea885 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,45 @@ + + + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj b/ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj index dc7b123725..f5d58901fe 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/Helpers/Tester.cs b/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs index f7cf877dd8..b8e4bdf82d 100644 --- a/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs +++ b/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs @@ -109,8 +109,15 @@ static Tester() #else testRunnerBasePath = Path.Combine(TesterPath, "../../../../../ICSharpCode.Decompiler.TestRunner/bin/Release/net8.0"); #endif - packagesPropsFile = Path.Combine(TesterPath, "../../../../../packages.props"); - roslynLatestVersion = XDocument.Load(packagesPropsFile).XPathSelectElement("//RoslynVersion").Value; + // To parse: + packagesPropsFile = Path.Combine(TesterPath, "../../../../../Directory.Packages.props"); + roslynLatestVersion = ((IEnumerable)(XDocument + .Load(packagesPropsFile) + .XPathEvaluate("//Project//ItemGroup//PackageVersion[@Include='Microsoft.CodeAnalysis.CSharp']/@Version"))) + .OfType() + .Single() + .Value; + roslynToolset = new RoslynToolset(); vswhereToolset = new VsWhereToolset(); } diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj index ed29b4a3e4..1e7101a6f2 100644 --- a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj +++ b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj @@ -41,28 +41,28 @@ 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 91cd5f649a..fee5392a7b 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 6ee9a6c27b..ca25d2eef7 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 373a7b7d9f..a788e3659d 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 f59f65b534..e0d1db28c2 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 8c88707135..5ad17dfb59 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 15b9f07bce..5ff532b129 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 8d5b51d339..8658ab8334 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 0697d38728..c8f84010cd 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 eaffa19a18..5b894464ad 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 f2e5c724bf..c5e5771c68 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 ce466046f2..5e8184796c 100644 --- a/ILSpy/ILSpy.csproj +++ b/ILSpy/ILSpy.csproj @@ -42,15 +42,13 @@ ..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.ruleset - - - - - - - - + + + + + + @@ -91,7 +89,9 @@ - + + + diff --git a/NuGet.config b/NuGet.config index 40b60b1652..8c93079308 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,8 +1,23 @@  - + + + + + + + + + + + + + + + + --> diff --git a/SharpTreeView/ICSharpCode.TreeView.csproj b/SharpTreeView/ICSharpCode.TreeView.csproj index a5a575f8db..a0b1c2b99e 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 cd5699586b..0000000000 --- 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 - -