Skip to content

Commit 2106327

Browse files
authored
Clean up package references (#5289)
* Remove unneeded AWSSDK.SecurityToken reference * Sort packages * Clean up packages * Clean up pinned transitive references * Remove unused testing app * Format SetupInstanceTests stuff
1 parent 9adfeef commit 2106327

7 files changed

Lines changed: 11 additions & 83 deletions

File tree

src/DatabaseMigrationsTester/DatabaseMigrationsTester.csproj

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/DatabaseMigrationsTester/Program.cs

Lines changed: 0 additions & 49 deletions
This file was deleted.

src/Directory.Packages.props

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<ItemGroup Label="Versions for direct package references">
77
<PackageVersion Include="Autofac" Version="8.4.0" />
88
<PackageVersion Include="AWSSDK.CloudWatch" Version="4.0.6.1" />
9-
<PackageVersion Include="AWSSDK.SecurityToken" Version="4.0.5.8" />
109
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
1110
<PackageVersion Include="Azure.Monitor.Query.Metrics" Version="1.0.0" />
1211
<PackageVersion Include="Azure.ResourceManager.ServiceBus" Version="1.1.0" />
@@ -26,14 +25,11 @@
2625
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
2726
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.2" />
2827
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.2" />
29-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.2" />
30-
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.2" />
3128
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
3229
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.2" />
3330
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.2.0" />
3431
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.15.0" />
3532
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.15.0" />
36-
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
3733
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
3834
<PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
3935
<PackageVersion Include="Mindscape.Raygun4Net.NetCore" Version="11.2.1" />
@@ -54,8 +50,8 @@
5450
<PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="6.0.0" />
5551
<PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="14.0.0" />
5652
<PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="4.0.0" />
57-
<PackageVersion Include="NServiceBus.Transport.SqlServer" Version="9.0.0" />
5853
<PackageVersion Include="NServiceBus.Transport.PostgreSql" Version="9.0.0" />
54+
<PackageVersion Include="NServiceBus.Transport.SqlServer" Version="9.0.0" />
5955
<PackageVersion Include="NuGet.Versioning" Version="6.14.0" />
6056
<PackageVersion Include="NUnit" Version="4.4.0" />
6157
<PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
@@ -64,8 +60,8 @@
6460
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
6561
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
6662
<PackageVersion Include="Particular.Approvals" Version="2.0.1" />
67-
<PackageVersion Include="Particular.Licensing.Sources" Version="6.1.0" />
6863
<PackageVersion Include="Particular.LicensingComponent.Report" Version="1.0.0" />
64+
<PackageVersion Include="Particular.Licensing.Sources" Version="6.1.0" />
6965
<PackageVersion Include="Particular.Obsoletes" Version="1.0.0" />
7066
<PackageVersion Include="Polly.Core" Version="8.6.5" />
7167
<PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
@@ -78,24 +74,18 @@
7874
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.2" />
7975
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="10.0.2" />
8076
<PackageVersion Include="System.DirectoryServices.AccountManagement" Version="10.0.2" />
77+
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
8178
<PackageVersion Include="System.Management" Version="10.0.2" />
8279
<PackageVersion Include="System.Management.Automation" Version="7.4.13" />
83-
<PackageVersion Include="System.Reactive.Linq" Version="6.1.0" />
80+
<PackageVersion Include="System.Reactive" Version="6.1.0" />
8481
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="10.0.2" />
8582
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="10.0.2" />
8683
<PackageVersion Include="Validar.Fody" Version="1.9.0" />
8784
<PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
8885
</ItemGroup>
8986
<ItemGroup Label="Versions to pin transitive references">
90-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.2" />
91-
<PackageVersion Include="Microsoft.Extensions.Diagnostics" Version="10.0.2" />
9287
<PackageVersion Include="Microsoft.IdentityModel.Abstractions" Version="8.15.0" />
9388
<PackageVersion Include="System.IO.Hashing" Version="10.0.2" />
94-
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
95-
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
96-
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="10.0.2" />
97-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.2" />
98-
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
9989
</ItemGroup>
10090
<ItemGroup>
10191
<GlobalPackageReference Include="Microsoft.Build.Artifacts" Version="6.1.63" />

src/ServiceControl.Persistence.RavenDB/ServiceControl.Persistence.RavenDB.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<ItemGroup>
2626
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
27-
<PackageReference Include="System.Reactive.Linq" />
27+
<PackageReference Include="System.Reactive" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

src/ServiceControl/ServiceControl.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<PackageReference Include="NServiceBus.Extensions.Hosting" />
3838
<PackageReference Include="NServiceBus.Extensions.Logging" />
3939
<PackageReference Include="ServiceControl.Contracts" />
40-
<PackageReference Include="System.Reactive.Linq" />
4140
<PackageReference Include="Yarp.ReverseProxy" />
4241
</ItemGroup>
4342

src/ServiceControlInstaller.Engine.UnitTests/Setup/SetupInstanceTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
namespace ServiceControlInstaller.Engine.UnitTests.Setup;
22

33
using System;
4-
using System.Threading;
54
using Engine.Setup;
65
using NUnit.Framework;
76

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net10.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net10.0</TargetFramework>
5+
<OutputType>Exe</OutputType>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
</PropertyGroup>
99

1010
</Project>

0 commit comments

Comments
 (0)