From 7f6e9556c2952a0bb07f451add8a1c563f7727e3 Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Mon, 2 Oct 2023 11:00:57 -0700 Subject: [PATCH 1/2] Use central package management --- Directory.Build.props | 4 +++ Directory.Packages.props | 31 +++++++++++++++++++ eng/Analyzers.props | 3 +- eng/Versions.props | 6 ++-- eng/dependabot/net7.0/Packages.props | 1 + eng/dependabot/net7.0/Versions.props | 2 ++ .../DiagnosticsReleaseTool.csproj | 1 + src/Directory.Build.props | 4 --- .../AzureBlobStorage/AzureBlobStorage.csproj | 6 ++-- src/Extensions/S3Storage/S3Storage.csproj | 2 +- ...nostics.Monitoring.Extension.Common.csproj | 9 ++---- ...osoft.Diagnostics.Monitoring.WebApi.csproj | 4 +-- src/Tests/Directory.Build.props | 8 ----- ...oring.ConfigurationSchema.UnitTests.csproj | 2 +- ...tics.Monitoring.ConfigurationSchema.csproj | 6 ++-- ...s.Monitoring.EgressExtensibilityApp.csproj | 2 +- ...ics.Monitoring.OpenApiGen.UnitTests.csproj | 2 +- ...ics.Monitoring.Profiler.UnitTestApp.csproj | 2 +- ...t.Diagnostics.Monitoring.TestCommon.csproj | 10 +++--- .../Directory.Build.props | 2 +- ...ics.Monitoring.Tool.FunctionalTests.csproj | 6 ++-- ...tics.Monitoring.Tool.UnitTestCommon.csproj | 2 +- ...agnostics.Monitoring.Tool.UnitTests.csproj | 2 +- ....Diagnostics.Monitoring.UnitTestApp.csproj | 2 +- ...nostics.Monitoring.WebApi.UnitTests.csproj | 2 +- .../dotnet-monitor/dotnet-monitor.csproj | 14 ++++----- src/archives/pkgs/Common.targets | 2 +- 27 files changed, 81 insertions(+), 56 deletions(-) create mode 100644 Directory.Packages.props delete mode 100644 src/Tests/Directory.Build.props diff --git a/Directory.Build.props b/Directory.Build.props index d354b43f1dd..45b01fc6f81 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,6 +9,10 @@ 4 true true + true + true + + $(NoWarn);NU1507 diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000000..588553accaa --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Analyzers.props b/eng/Analyzers.props index 760c10297da..53eada6f2b7 100644 --- a/eng/Analyzers.props +++ b/eng/Analyzers.props @@ -4,7 +4,6 @@ - - + diff --git a/eng/Versions.props b/eng/Versions.props index 5f7a4a25fe7..3a1c31770e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -100,19 +100,21 @@ $(MicrosoftAspNetCoreApp60Version) $(MicrosoftExtensionsConfigurationAbstractions60Version) $(MicrosoftExtensionsLogging60Version) - $(MicrosoftExtensionsConfigurationAbstractions60Version) + $(MicrosoftExtensionsLoggingAbstractions60Version) $(MicrosoftExtensionsLoggingConsole60Version) + $(MicrosoftAspNetCoreApp70Version) $(MicrosoftExtensionsConfigurationAbstractions70Version) $(MicrosoftExtensionsLogging70Version) + $(MicrosoftExtensionsLoggingAbstractions70Version) $(MicrosoftExtensionsLoggingConsole70Version) $(MicrosoftAspNetCoreApp80Version) $(MicrosoftAspNetCoreApp80Version) - $(MicrosoftNETCoreApp80Version) $(MicrosoftNETCoreApp80Version) + $(MicrosoftNETCoreApp80Version) $(MicrosoftNETCoreApp80Version) $(MicrosoftNETCoreApp80Version) diff --git a/eng/dependabot/net7.0/Packages.props b/eng/dependabot/net7.0/Packages.props index 301d2c3a77e..a63f247f84a 100644 --- a/eng/dependabot/net7.0/Packages.props +++ b/eng/dependabot/net7.0/Packages.props @@ -5,6 +5,7 @@ + diff --git a/eng/dependabot/net7.0/Versions.props b/eng/dependabot/net7.0/Versions.props index e184d31675d..398443d2cbc 100644 --- a/eng/dependabot/net7.0/Versions.props +++ b/eng/dependabot/net7.0/Versions.props @@ -5,6 +5,8 @@ 7.0.0 7.0.0 + + 7.0.1 7.0.0 diff --git a/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj b/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj index 46ace05f444..fc0720a3fb5 100644 --- a/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj +++ b/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj @@ -3,6 +3,7 @@ Exe net6.0 + false diff --git a/src/Directory.Build.props b/src/Directory.Build.props index f091c4f7114..69e366ef90e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -37,10 +37,6 @@ $(TestRunnerAdditionalArguments) --filter "$(TestRunnerFilterArguments)" - - - - diff --git a/src/Extensions/AzureBlobStorage/AzureBlobStorage.csproj b/src/Extensions/AzureBlobStorage/AzureBlobStorage.csproj index d69de40c4e3..2e04ae14929 100644 --- a/src/Extensions/AzureBlobStorage/AzureBlobStorage.csproj +++ b/src/Extensions/AzureBlobStorage/AzureBlobStorage.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/src/Extensions/S3Storage/S3Storage.csproj b/src/Extensions/S3Storage/S3Storage.csproj index 01e5cc6e730..d002c596239 100644 --- a/src/Extensions/S3Storage/S3Storage.csproj +++ b/src/Extensions/S3Storage/S3Storage.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Microsoft.Diagnostics.Monitoring.Extension.Common/Microsoft.Diagnostics.Monitoring.Extension.Common.csproj b/src/Microsoft.Diagnostics.Monitoring.Extension.Common/Microsoft.Diagnostics.Monitoring.Extension.Common.csproj index fa9dc87f802..8879d6f8eb6 100644 --- a/src/Microsoft.Diagnostics.Monitoring.Extension.Common/Microsoft.Diagnostics.Monitoring.Extension.Common.csproj +++ b/src/Microsoft.Diagnostics.Monitoring.Extension.Common/Microsoft.Diagnostics.Monitoring.Extension.Common.csproj @@ -13,10 +13,6 @@ - - - - @@ -24,8 +20,9 @@ - - + + + diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Microsoft.Diagnostics.Monitoring.WebApi.csproj b/src/Microsoft.Diagnostics.Monitoring.WebApi/Microsoft.Diagnostics.Monitoring.WebApi.csproj index 8ad431a856e..957e71ca7a8 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Microsoft.Diagnostics.Monitoring.WebApi.csproj +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Microsoft.Diagnostics.Monitoring.WebApi.csproj @@ -6,7 +6,7 @@ assemblies have a binary dependency on the older TFMs. --> $(TestTargetFrameworks) - ;1591;1701 + $(NoWarn);1591;1701 Web Api surface for dotnet-monitor true @@ -19,7 +19,7 @@ - + diff --git a/src/Tests/Directory.Build.props b/src/Tests/Directory.Build.props deleted file mode 100644 index 9bc549ebd25..00000000000 --- a/src/Tests/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests.csproj index 20e2783b6d6..123c36811d1 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests.csproj @@ -1,6 +1,6 @@ - $(SchemaTargetFramework) + $(SchemaTargetFramework) Library diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.csproj index 2ad7d29c291..a232376963e 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.csproj @@ -75,9 +75,9 @@ - - - + + + diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.EgressExtensibilityApp/Microsoft.Diagnostics.Monitoring.EgressExtensibilityApp.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.EgressExtensibilityApp/Microsoft.Diagnostics.Monitoring.EgressExtensibilityApp.csproj index cfbe54aa4b9..623970dcf36 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.EgressExtensibilityApp/Microsoft.Diagnostics.Monitoring.EgressExtensibilityApp.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.EgressExtensibilityApp/Microsoft.Diagnostics.Monitoring.EgressExtensibilityApp.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests.csproj index a5d1ab48a89..12695464048 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp.csproj index 5e8a8d34e78..b42553e604e 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Microsoft.Diagnostics.Monitoring.TestCommon.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Microsoft.Diagnostics.Monitoring.TestCommon.csproj index 89fcae55c15..a8410dac814 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Microsoft.Diagnostics.Monitoring.TestCommon.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Microsoft.Diagnostics.Monitoring.TestCommon.csproj @@ -14,11 +14,11 @@ - - - - - + + + + + diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Directory.Build.props b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Directory.Build.props index e1dd85965f7..7732e7db676 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Directory.Build.props +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Directory.Build.props @@ -3,5 +3,5 @@ true - + \ No newline at end of file diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj index 7e5be8edcb2..e9e9980bc9b 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj @@ -79,9 +79,9 @@ - - - + + + diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon.csproj index 719d282a29a..4d08307876f 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests.csproj index d750ef81f7f..1e681e34fac 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Microsoft.Diagnostics.Monitoring.UnitTestApp.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Microsoft.Diagnostics.Monitoring.UnitTestApp.csproj index f0863a40f91..417ff0bf4b0 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Microsoft.Diagnostics.Monitoring.UnitTestApp.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Microsoft.Diagnostics.Monitoring.UnitTestApp.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.WebApi.UnitTests/Microsoft.Diagnostics.Monitoring.WebApi.UnitTests.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.WebApi.UnitTests/Microsoft.Diagnostics.Monitoring.WebApi.UnitTests.csproj index daa981e8694..474c64e865b 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.WebApi.UnitTests/Microsoft.Diagnostics.Monitoring.WebApi.UnitTests.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.WebApi.UnitTests/Microsoft.Diagnostics.Monitoring.WebApi.UnitTests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Tools/dotnet-monitor/dotnet-monitor.csproj b/src/Tools/dotnet-monitor/dotnet-monitor.csproj index 10dd74e044b..1aed9ef4919 100644 --- a/src/Tools/dotnet-monitor/dotnet-monitor.csproj +++ b/src/Tools/dotnet-monitor/dotnet-monitor.csproj @@ -11,16 +11,16 @@ - - - - - - + + + + + + - + diff --git a/src/archives/pkgs/Common.targets b/src/archives/pkgs/Common.targets index 2d3c58992d4..f9fc051f67b 100644 --- a/src/archives/pkgs/Common.targets +++ b/src/archives/pkgs/Common.targets @@ -1,6 +1,6 @@ - + Date: Tue, 3 Oct 2023 16:28:26 +0000 Subject: [PATCH 2/2] [main] Bump dotnet-dump in /eng/dependabot/nuget.org Bumps [dotnet-dump](https://github.com/dotnet/diagnostics) from 7.0.442301 to 7.0.447801. - [Release notes](https://github.com/dotnet/diagnostics/releases) - [Commits](https://github.com/dotnet/diagnostics/compare/v7.0.442301...v7.0.447801) --- updated-dependencies: - dependency-name: dotnet-dump dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- eng/dependabot/nuget.org/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/nuget.org/Versions.props b/eng/dependabot/nuget.org/Versions.props index 723ab246751..e0ce81d20b6 100644 --- a/eng/dependabot/nuget.org/Versions.props +++ b/eng/dependabot/nuget.org/Versions.props @@ -2,6 +2,6 @@ - 7.0.442301 + 7.0.447801