From 93e778b6abe34ae6f79703c193824986cab68828 Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Thu, 9 Jan 2025 19:37:57 +0100 Subject: [PATCH] convert nuget packages to use central package management --- src/Directory.Build.props | 10 ++--- src/Directory.Packages.props | 37 ++++++++++++++++++ .../GitReleaseManager.Cli.csproj | 26 ++++++------- .../GitReleaseManager.Core.Tests.csproj | 38 +++++++++---------- .../GitReleaseManager.Core.csproj | 36 +++++++++--------- src/GitReleaseManager.Core/VcsService.cs | 2 +- .../GitReleaseManager.IntegrationTests.csproj | 38 +++++++++---------- .../GitReleaseManager.Tests.csproj | 34 ++++++++--------- .../GitReleaseManager.Tool.csproj | 29 +++++++------- src/GitReleaseManager.sln | 1 + 10 files changed, 143 insertions(+), 108 deletions(-) create mode 100644 src/Directory.Packages.props diff --git a/src/Directory.Build.props b/src/Directory.Build.props index dd4b1848..5f9ac9f3 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -14,20 +14,20 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + All diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props new file mode 100644 index 00000000..d9ecf82b --- /dev/null +++ b/src/Directory.Packages.props @@ -0,0 +1,37 @@ + + + true + true + $(NoWarn);NU1507 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj b/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj index a067c4cc..a3c7fb80 100644 --- a/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj +++ b/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj @@ -16,18 +16,18 @@ - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all - - - - - - + + + + + + - \ No newline at end of file + diff --git a/src/GitReleaseManager.Core.Tests/GitReleaseManager.Core.Tests.csproj b/src/GitReleaseManager.Core.Tests/GitReleaseManager.Core.Tests.csproj index b2d3b652..6cd27416 100644 --- a/src/GitReleaseManager.Core.Tests/GitReleaseManager.Core.Tests.csproj +++ b/src/GitReleaseManager.Core.Tests/GitReleaseManager.Core.Tests.csproj @@ -1,37 +1,37 @@ - 8.0 + 9.0 net6.0;net7.0 GitReleaseManager.Core.Tests Test Project for GitReleaseManager.Core $(NoWarn);CA1707;Serilog004; - + - - runtime; build; native; contentfiles; analyzers; buildtransitive - all + + runtime; build; native; contentfiles; analyzers; buildtransitive + all - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all - - - - - all - runtime; build; native; contentfiles; analyzers + + + + + all + runtime; build; native; contentfiles; analyzers - - - + + + diff --git a/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj b/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj index ec0f6e45..350a0959 100644 --- a/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj +++ b/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj @@ -17,18 +17,18 @@ - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all - - - - - - + + + + + + @@ -38,13 +38,13 @@ - - TextTemplatingFileGenerator - ReleaseTemplates.g.cs - - + + TextTemplatingFileGenerator + ReleaseTemplates.g.cs + + - + - \ No newline at end of file + diff --git a/src/GitReleaseManager.Core/VcsService.cs b/src/GitReleaseManager.Core/VcsService.cs index 601a20b3..9940cd1f 100644 --- a/src/GitReleaseManager.Core/VcsService.cs +++ b/src/GitReleaseManager.Core/VcsService.cs @@ -128,7 +128,7 @@ public async Task DiscardReleaseAsync(string owner, string repository, string ta } } - public async Task AddAssetsAsync(string owner, string repository, string tagName, IList assets) => await AddAssetsAsync(owner, repository, tagName, assets, null); + public async Task AddAssetsAsync(string owner, string repository, string tagName, IList assets) => await AddAssetsAsync(owner, repository, tagName, assets, null).ConfigureAwait(false); private async Task AddAssetsAsync(string owner, string repository, string tagName, IList assets, Release currentRelease) { diff --git a/src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj b/src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj index 1d7dc36c..ad10fe59 100644 --- a/src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj +++ b/src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj @@ -7,31 +7,31 @@ $(NoWarn);CA1707;Serilog004; - + - - runtime; build; native; contentfiles; analyzers; buildtransitive - all + + runtime; build; native; contentfiles; analyzers; buildtransitive + all - - runtime; build; native; contentfiles; analyzers; buildtransitive - all + + runtime; build; native; contentfiles; analyzers; buildtransitive + all - - - - all - runtime; build; native; contentfiles; analyzers + + + + all + runtime; build; native; contentfiles; analyzers - - - - - - + + + + + + - \ No newline at end of file + diff --git a/src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj b/src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj index 3c44ca4b..0317ee61 100644 --- a/src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj +++ b/src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj @@ -7,30 +7,30 @@ $(NoWarn);CA1707;Serilog004; - + - - runtime; build; native; contentfiles; analyzers; buildtransitive - all + + runtime; build; native; contentfiles; analyzers; buildtransitive + all - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all - - - - - all - runtime; build; native; contentfiles; analyzers + + + + + all + runtime; build; native; contentfiles; analyzers - - + + diff --git a/src/GitReleaseManager.Tool/GitReleaseManager.Tool.csproj b/src/GitReleaseManager.Tool/GitReleaseManager.Tool.csproj index ad60f84a..37e8446b 100644 --- a/src/GitReleaseManager.Tool/GitReleaseManager.Tool.csproj +++ b/src/GitReleaseManager.Tool/GitReleaseManager.Tool.csproj @@ -1,15 +1,12 @@ - 8.0 Exe GitReleaseManager - true net6.0;net7.0 dotnet-gitreleasemanager GitReleaseManager.Tool - GitReleaseManager Tool GitTools Contributors https://github.com/GitTools/GitReleaseManager @@ -31,19 +28,19 @@ - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all - - - - - - + + + + + + @@ -51,4 +48,4 @@ - \ No newline at end of file + diff --git a/src/GitReleaseManager.sln b/src/GitReleaseManager.sln index 5ae09c23..637b075a 100644 --- a/src/GitReleaseManager.sln +++ b/src/GitReleaseManager.sln @@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets stylecop.json = stylecop.json + Directory.Packages.props = Directory.Packages.props EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitReleaseManager.IntegrationTests", "GitReleaseManager.IntegrationTests\GitReleaseManager.IntegrationTests.csproj", "{53D8DA02-2BF8-454A-997C-B6BE62F90F9E}"