From aaada60102c60a852e8f159bbd481e1fb0c61212 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Tue, 15 Apr 2025 17:50:30 -0400 Subject: [PATCH 1/4] Update workflows --- .github/workflows/build-windows.yml | 1 + .github/workflows/ci.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 5ad0b72455..55e2c1dd82 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -19,6 +19,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v4.3.1 with: + global-json-file: global.json dotnet-version: 8.0.x - name: Download RavenDB Server run: ./tools/download-ravendb-server.ps1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85a18167f4..ab9b284fb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v4.3.1 with: + global-json-file: global.json dotnet-version: 8.0.x - name: Download RavenDB Server run: ./tools/download-ravendb-server.ps1 From a75e090b8df56b07b9dbafe5b696123b46852299 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Tue, 15 Apr 2025 17:45:17 -0400 Subject: [PATCH 2/4] Update global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index d31527941e..188e0c1e24 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.400", + "version": "9.0.100", "rollForward": "latestFeature" }, "msbuild-sdks": { From cd36aba73c478bed52612059ad123fea708e564c Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Tue, 15 Apr 2025 18:06:13 -0400 Subject: [PATCH 3/4] Fix new SDK warnings --- src/ServiceControl.Api/IAuditCountApi.cs | 2 +- src/ServiceControl.Api/IConfigurationApi.cs | 8 +++++--- src/ServiceControl.Api/IEndpointsApi.cs | 2 +- .../Infrastructure/When_instance_is_setup.cs | 7 ++++--- .../Infrastructure/Hosting/Options.cs | 2 +- .../Infrastructure/Settings/Settings.cs | 2 +- .../UI/ListInstances/ListInstancesViewModel.cs | 2 +- .../Validation/ValidationTemplate.cs | 2 +- src/ServiceControl.Monitoring/Hosting/Options.cs | 2 +- src/ServiceControl/Hosting/Options.cs | 2 +- .../Validation/QueueValidationTests.cs | 12 ++++++------ 11 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/ServiceControl.Api/IAuditCountApi.cs b/src/ServiceControl.Api/IAuditCountApi.cs index ddaf0b1309..ca1975f3a0 100644 --- a/src/ServiceControl.Api/IAuditCountApi.cs +++ b/src/ServiceControl.Api/IAuditCountApi.cs @@ -7,6 +7,6 @@ public interface IAuditCountApi { - public Task> GetEndpointAuditCounts(string endpoint, CancellationToken token); + Task> GetEndpointAuditCounts(string endpoint, CancellationToken token); } } diff --git a/src/ServiceControl.Api/IConfigurationApi.cs b/src/ServiceControl.Api/IConfigurationApi.cs index d0bfda5975..153380bd14 100644 --- a/src/ServiceControl.Api/IConfigurationApi.cs +++ b/src/ServiceControl.Api/IConfigurationApi.cs @@ -6,8 +6,10 @@ public interface IConfigurationApi { - public Task GetUrls(string baseUrl, CancellationToken cancellationToken); - public Task GetConfig(CancellationToken cancellationToken); - public Task GetRemoteConfigs(CancellationToken cancellationToken); + Task GetUrls(string baseUrl, CancellationToken cancellationToken); + + Task GetConfig(CancellationToken cancellationToken); + + Task GetRemoteConfigs(CancellationToken cancellationToken); } } diff --git a/src/ServiceControl.Api/IEndpointsApi.cs b/src/ServiceControl.Api/IEndpointsApi.cs index 5cebaa4900..a2345ade4e 100644 --- a/src/ServiceControl.Api/IEndpointsApi.cs +++ b/src/ServiceControl.Api/IEndpointsApi.cs @@ -7,6 +7,6 @@ public interface IEndpointsApi { - public Task> GetEndpoints(CancellationToken cancellationToken); + Task> GetEndpoints(CancellationToken cancellationToken); } } diff --git a/src/ServiceControl.Audit.UnitTests/Infrastructure/When_instance_is_setup.cs b/src/ServiceControl.Audit.UnitTests/Infrastructure/When_instance_is_setup.cs index ee4a41d70b..f01c4595ea 100644 --- a/src/ServiceControl.Audit.UnitTests/Infrastructure/When_instance_is_setup.cs +++ b/src/ServiceControl.Audit.UnitTests/Infrastructure/When_instance_is_setup.cs @@ -75,11 +75,12 @@ public void CustomizeMonitoringEndpoint(EndpointConfiguration endpointConfigurat public Task ProvisionQueues(TransportSettings transportSettings, IEnumerable additionalQueues) { - QueuesCreated = new List(additionalQueues) - { + QueuesCreated = + [ + .. additionalQueues, transportSettings.EndpointName, transportSettings.ErrorQueue - }; + ]; return Task.CompletedTask; } diff --git a/src/ServiceControl.Audit/Infrastructure/Hosting/Options.cs b/src/ServiceControl.Audit/Infrastructure/Hosting/Options.cs index 0de98e35db..a874c23af4 100644 --- a/src/ServiceControl.Audit/Infrastructure/Hosting/Options.cs +++ b/src/ServiceControl.Audit/Infrastructure/Hosting/Options.cs @@ -167,7 +167,7 @@ public IEnumerator GetEnumerator() public List ToList() { - return new List(values); + return [.. values]; } public string[] ToArray() diff --git a/src/ServiceControl.Audit/Infrastructure/Settings/Settings.cs b/src/ServiceControl.Audit/Infrastructure/Settings/Settings.cs index c6646185b1..b5488c36a1 100644 --- a/src/ServiceControl.Audit/Infrastructure/Settings/Settings.cs +++ b/src/ServiceControl.Audit/Infrastructure/Settings/Settings.cs @@ -43,7 +43,7 @@ public Settings(string transportType = null, string persisterType = null, Loggin { Hostname = SettingsReader.Read(SettingsRootNamespace, "Hostname", "localhost"); Port = SettingsReader.Read(SettingsRootNamespace, "Port", 44444); - }; + } MaximumConcurrencyLevel = SettingsReader.Read(SettingsRootNamespace, "MaximumConcurrencyLevel"); ServiceControlQueueAddress = SettingsReader.Read(SettingsRootNamespace, "ServiceControlQueueAddress"); diff --git a/src/ServiceControl.Config/UI/ListInstances/ListInstancesViewModel.cs b/src/ServiceControl.Config/UI/ListInstances/ListInstancesViewModel.cs index 13331bb400..e94a4c0eb3 100644 --- a/src/ServiceControl.Config/UI/ListInstances/ListInstancesViewModel.cs +++ b/src/ServiceControl.Config/UI/ListInstances/ListInstancesViewModel.cs @@ -28,7 +28,7 @@ public ListInstancesViewModel(Func instan AddAndRemoveInstances(); } - public BindableCollection OrderedInstances => new BindableCollection(Instances.OrderBy(x => x.Name)); + public BindableCollection OrderedInstances => [.. Instances.OrderBy(x => x.Name)]; [AlsoNotifyFor(nameof(OrderedInstances))] IList Instances { get; } diff --git a/src/ServiceControl.Config/Validation/ValidationTemplate.cs b/src/ServiceControl.Config/Validation/ValidationTemplate.cs index ff46dcb00f..d50274a938 100644 --- a/src/ServiceControl.Config/Validation/ValidationTemplate.cs +++ b/src/ServiceControl.Config/Validation/ValidationTemplate.cs @@ -29,7 +29,7 @@ public ValidationTemplate(RxPropertyChanged target) errorsChangedSubject = new Subject(); target.PropertyChanged += Validate; - properties = new HashSet(target.GetType().GetProperties().Select(p => p.Name)); + properties = [.. target.GetType().GetProperties().Select(p => p.Name)]; } public IObservable ErrorsChangedObservable => errorsChangedSubject.AsObservable(); diff --git a/src/ServiceControl.Monitoring/Hosting/Options.cs b/src/ServiceControl.Monitoring/Hosting/Options.cs index 39f3bc76db..65be67ad1e 100644 --- a/src/ServiceControl.Monitoring/Hosting/Options.cs +++ b/src/ServiceControl.Monitoring/Hosting/Options.cs @@ -167,7 +167,7 @@ public IEnumerator GetEnumerator() public List ToList() { - return new List(values); + return [.. values]; } public string[] ToArray() diff --git a/src/ServiceControl/Hosting/Options.cs b/src/ServiceControl/Hosting/Options.cs index 447a911d29..531bc097a7 100644 --- a/src/ServiceControl/Hosting/Options.cs +++ b/src/ServiceControl/Hosting/Options.cs @@ -167,7 +167,7 @@ public IEnumerator GetEnumerator() public List ToList() { - return new List(values); + return [.. values]; } public string[] ToArray() diff --git a/src/ServiceControlInstaller.Engine.UnitTests/Validation/QueueValidationTests.cs b/src/ServiceControlInstaller.Engine.UnitTests/Validation/QueueValidationTests.cs index be1ddcbc5b..578ef22468 100644 --- a/src/ServiceControlInstaller.Engine.UnitTests/Validation/QueueValidationTests.cs +++ b/src/ServiceControlInstaller.Engine.UnitTests/Validation/QueueValidationTests.cs @@ -219,13 +219,13 @@ public void CheckQueueNamesAreNotTakenByAnotherInstance_ShouldSucceed() public void CheckQueueNamesAreNotTakenByAnotherInstance_ShouldThrow() { var expectedError = "Some queue names specified are already assigned to another ServiceControl instance - Correct the values for ErrorLogQueue, ErrorQueue"; + var newInstance = ServiceControlNewInstance.CreateWithDefaultPersistence(); - { - newInstance.TransportPackage = ServiceControlCoreTransports.Find("MSMQ"); - newInstance.ErrorLogQueue = "errorlog"; - newInstance.ErrorQueue = "error"; - newInstance.ForwardErrorMessages = true; - }; + + newInstance.TransportPackage = ServiceControlCoreTransports.Find("MSMQ"); + newInstance.ErrorLogQueue = "errorlog"; + newInstance.ErrorQueue = "error"; + newInstance.ForwardErrorMessages = true; var p = new QueueNameValidator(newInstance) { From 6c79e3f59b2b126f9f373c82df387d79e2def514 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Tue, 15 Apr 2025 18:09:03 -0400 Subject: [PATCH 4/4] Use 9.0 SDK in Dockerfiles --- src/ServiceControl.Audit/Dockerfile | 2 +- src/ServiceControl.Monitoring/Dockerfile | 2 +- src/ServiceControl/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ServiceControl.Audit/Dockerfile b/src/ServiceControl.Audit/Dockerfile index 1eb013f13d..ee39885596 100644 --- a/src/ServiceControl.Audit/Dockerfile +++ b/src/ServiceControl.Audit/Dockerfile @@ -1,5 +1,5 @@ # Build image -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG TARGETARCH WORKDIR / ENV CI=true diff --git a/src/ServiceControl.Monitoring/Dockerfile b/src/ServiceControl.Monitoring/Dockerfile index a2f3d0abe5..642083886e 100644 --- a/src/ServiceControl.Monitoring/Dockerfile +++ b/src/ServiceControl.Monitoring/Dockerfile @@ -1,5 +1,5 @@ # Build image -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG TARGETARCH WORKDIR / ENV CI=true diff --git a/src/ServiceControl/Dockerfile b/src/ServiceControl/Dockerfile index 9fec575722..617c81063e 100644 --- a/src/ServiceControl/Dockerfile +++ b/src/ServiceControl/Dockerfile @@ -1,5 +1,5 @@ # Build image -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG TARGETARCH WORKDIR / ENV CI=true