Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to Centralized Package Management #798

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
<DebugType Condition="$(OS) == 'Windows_NT'">embedded</DebugType>
<LangVersion>latest</LangVersion>
<NoWarn>$(NoWarn);NU1701;CS8632</NoWarn>

<MSBuildPackageVersion>17.5.0</MSBuildPackageVersion>
<NuGetVersionNerdbankGitVersioning>3.6.133</NuGetVersionNerdbankGitVersioning>
</PropertyGroup>

</Project>
51 changes: 51 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<PropertyGroup>
<MSBuildPackageVersion>17.5.0</MSBuildPackageVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AdonisUI" Version="1.16.0" />
<PackageVersion Include="AdonisUI.ClassicTheme" Version="1.16.0" />
<PackageVersion Include="AutomaticGraphLayout.Drawing" Version="1.1.11" />
<PackageVersion Include="AutomaticGraphLayout.WpfGraphControl" Version="1.1.11" />
<PackageVersion Include="AvalonEdit" Version="6.3.0.90" />
<PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.0.6" />
<PackageVersion Include="Avalonia.Desktop" Version="11.1.1" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.1.1" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.1.1" />
<PackageVersion Include="DiffPlex" Version="1.7.0" />
<PackageVersion Include="DotUtils.MsBuild.BinlogRedactor.SensitiveDataDetector" Version="0.0.8" />
<PackageVersion Include="DotUtils.StreamUtils.Sources" Version="0.0.7" />
<PackageVersion Include="FluentAssertions" Version="6.11.0" />
<PackageVersion Include="GuiLabs.Language.Xml" Version="1.2.46" />
<PackageVersion Include="HarfBuzzSharp" Version="2.8.2-preview.187" />
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
<PackageVersion Include="Microsoft.Build" Version="$(MSBuildPackageVersion)" />
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MSBuildPackageVersion)" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.4.1" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MSBuildPackageVersion)" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageVersion)" />
<PackageVersion Include="Microsoft.DotNet.ILCompiler" Version="7.0.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
<PackageVersion Include="Mono.Cecil" Version="0.9.6.1" />
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.1.133" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<PackageVersion Include="NuGet.ProjectModel" Version="6.8.0" />
<PackageVersion Include="Nullable" Version="1.2.1" />
<PackageVersion Include="SkiaSharp" Version="2.88.6" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
<PackageVersion Include="squirrel.windows" Version="1.4.4" />
<PackageVersion Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
<PackageVersion Include="System.Collections.Immutable" Version="6.0.0" />
<PackageVersion Include="System.Memory" Version="4.5.5" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageVersion Include="xunit" Version="2.4.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>
</Project>
8 changes: 5 additions & 3 deletions MSBuildStructuredLog.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30128.74

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.12.35209.166
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StructuredLogViewer", "src\StructuredLogViewer\StructuredLogViewer.csproj", "{FAEE07FD-7384-40D4-B52B-4756D1011BA6}"
EndProject
Expand All @@ -13,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
appveyor.yml = appveyor.yml
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
Directory.Packages.props = Directory.Packages.props
nuget.config = nuget.config
README.md = README.md
version.json = version.json
Expand Down
1 change: 1 addition & 0 deletions nuget.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
4 changes: 2 additions & 2 deletions src/ResourcesGenerator/ResourcesGenerator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.Build.Locator" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Samples/TimesAndDurations/TimesAndDurations.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.133" />
<PackageReference Include="MSBuild.StructuredLogger" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="11.1.1" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.1" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.1.1" Condition=" '$(Configuration)' == 'Debug' " />
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.6" />
<PackageReference Include="Avalonia.AvaloniaEdit" />
<PackageReference Include="Avalonia.Desktop" />
<PackageReference Include="Avalonia.Diagnostics" Condition=" '$(Configuration)' == 'Debug' " />
<PackageReference Include="Avalonia.Themes.Fluent" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/StructuredLogViewer.Core/StructuredLogViewer.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="GuiLabs.Language.Xml" Version="1.2.46" />
<PackageReference Include="Nerdbank.GitVersioning" Version="$(NuGetVersionNerdbankGitVersioning)" PrivateAssets="all" />
<PackageReference Include="AutomaticGraphLayout.Drawing" Version="1.1.11" />
<PackageReference Include="Nullable" Version="1.2.1">
<PackageReference Include="GuiLabs.Language.Xml" />
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
<PackageReference Include="AutomaticGraphLayout.Drawing" />
<PackageReference Include="Nullable">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
20 changes: 10 additions & 10 deletions src/StructuredLogViewer/StructuredLogViewer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AdonisUI" Version="1.16.0" />
<PackageReference Include="AdonisUI.ClassicTheme" Version="1.16.0" />
<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" ExcludeAssets="build" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MSBuildPackageVersion)" />
<PackageReference Include="Mono.Cecil" Version="0.9.6.1" />
<PackageReference Include="Nerdbank.GitVersioning" Version="$(NuGetVersionNerdbankGitVersioning)" PrivateAssets="all" />
<PackageReference Include="squirrel.windows" Version="1.4.4" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
<PackageReference Include="AutomaticGraphLayout.WpfGraphControl" Version="1.1.11" />
<PackageReference Include="AdonisUI" />
<PackageReference Include="AdonisUI.ClassicTheme" />
<PackageReference Include="AvalonEdit" />
<PackageReference Include="Microsoft.Build.Locator" ExcludeAssets="build" />
<PackageReference Include="Microsoft.Build.Tasks.Core" />
<PackageReference Include="Mono.Cecil" />
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
<PackageReference Include="squirrel.windows" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="all" />
<PackageReference Include="AutomaticGraphLayout.WpfGraphControl" />
</ItemGroup>

<ItemGroup>
Expand Down
32 changes: 16 additions & 16 deletions src/StructuredLogger.Tests/StructuredLogger.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DiffPlex" Version="1.7.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
<PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
<PackageReference Include="Microsoft.Build" Version="$(MSBuildPackageVersion)" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Framework" Version="$(MSBuildPackageVersion)" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MSBuildPackageVersion)" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageVersion)" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="DiffPlex" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="System.Memory" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.Threading.Tasks.Dataflow" />
<PackageReference Include="System.Threading.Tasks.Extensions" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
<PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Tasks.Core" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Locator" />
<PackageReference Include="FluentAssertions" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\StructuredLogger\StructuredLogger.csproj" />
Expand Down
8 changes: 4 additions & 4 deletions src/StructuredLogger.Utils/StructuredLogger.Utils.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<PackageReference Include="Nerdbank.GitVersioning" Version="$(NuGetVersionNerdbankGitVersioning)" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
<PackageReference Include="DotUtils.MsBuild.BinlogRedactor.SensitiveDataDetector" Version="0.0.8" />
<PackageReference Include="NuGet.ProjectModel" Version="6.8.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
<PackageReference Include="DotUtils.MsBuild.BinlogRedactor.SensitiveDataDetector" />
<PackageReference Include="NuGet.ProjectModel" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\StructuredLogger\StructuredLogger.csproj" />
Expand Down
10 changes: 5 additions & 5 deletions src/StructuredLogger/StructuredLogger.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
<PackageTags>MSBuild Log Logger Structure Structured</PackageTags>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<PackageReference Include="Nerdbank.GitVersioning" Version="$(NuGetVersionNerdbankGitVersioning)" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" Version="$(MSBuildPackageVersion)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageVersion)" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
<PackageReference Include="DotUtils.StreamUtils.Sources" Version="0.0.7" PrivateAssets="all" />
<PackageReference Include="Microsoft.Build.Framework" />
<PackageReference Include="Microsoft.Build.Utilities.Core" />
<PackageReference Include="Microsoft.SourceLink.GitHub" />
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I notice that the NuGet package for MSBuild.StructuredLogger 2.2.317 is showing a dependency on Microsoft.SourceLink.GitHub 8.0.0, and I wonder if that was caused by the removal of PrivateAssets="all" here and whether that was intentional or not?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not intentional, I need to fix

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

Copy link
Contributor Author

@decriptor decriptor Sep 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My apologies. Sorry for that.

@KirillOsenkov I was looking through the <TargetFramework(s)> and noticed that most of them are net8.0 with a couple others (net472, netstandard2.0, netcoreapp3.1). Is there any reason to not moving everything over to net8.0? (Or net9.0 in the near future?)

If we could move everything to net8.0 we could completely remove the SourceLink PackageReference: https://github.com/dotnet/sourcelink/releases/tag/8.0.0

If so, let me know and I'll create a PR for this work.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might not need to actually change the TFMs to use the inbox SourceLink - just ensuring it's all built with the .NET 8.0 SDK might be sufficient?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Numpsy I'm not sure either. I err'ed on the side of it might be more beneficial to just move everything to net8.0?

The one thing I did forget about though is that this repo does generate some nuget packages, so to better support everyone out there it might not be practical to drop net472 or netstandard2.0?

I guess the only way to know for sure would be to test it out :) I'll see if I can do that this evening or in the near future because I've been wondering about that anyways.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My request is to minimize contributions that don't solve real problems - maintaining this repo (among dozens of other repos I maintain) is already taking a huge toll on me, and PRs that look like help actually just cause more work for me in the future.

You can read here for a recent example:
#801 (comment)

So ideally if you feel that there's a real problem with the app, file an issue, and for issues that I need help with, I can mark them as up-for-grabs, and then feel free to send PRs for those.

My time and attention is incredibly scarce and valuable, so ideally I'd minimize interruptions and disruptions and pings as respect for my time and what I'm already doing for the community.

Thanks for your understanding!

<PackageReference Include="DotUtils.StreamUtils.Sources" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Construction\TargetGraph.cs" />
Expand Down
6 changes: 3 additions & 3 deletions src/TaskRunner/TaskRunner.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" ExcludeAssets="build" />
<PackageReference Include="Microsoft.Build" Version="$(MSBuildPackageVersion)" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
<PackageReference Include="Microsoft.Build.Locator" ExcludeAssets="build" />
<PackageReference Include="Microsoft.Build" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
</ItemGroup>

</Project>