diff --git a/azure-pipelines-public.yml b/azure-pipelines-public.yml index 9da198eaa61..262a15a43b7 100644 --- a/azure-pipelines-public.yml +++ b/azure-pipelines-public.yml @@ -113,7 +113,7 @@ stages: pool: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2022preview.amd64.open + demands: ImageOverride -equals windows.vs2022.amd64.open variables: - _buildScript: $(Build.SourcesDirectory)/build.cmd -ci -NativeToolsOnMachine @@ -145,7 +145,7 @@ stages: pool: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals build.ubuntu.2004.amd64.open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open variables: - _buildScript: $(Build.SourcesDirectory)/build.sh --ci @@ -198,7 +198,7 @@ stages: pool: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals build.ubuntu.2004.amd64.open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open preSteps: - checkout: self @@ -237,7 +237,7 @@ stages: pool: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2022preview.amd64.open + demands: ImageOverride -equals windows.vs2022.amd64.open variables: - _buildScript: $(Build.SourcesDirectory)/build.cmd -ci -NativeToolsOnMachine diff --git a/global.json b/global.json index ef4ac02238a..975e00a727b 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100" + "version": "10.0.103" }, "tools": { - "dotnet": "10.0.100", + "dotnet": "10.0.103", "runtimes": { "dotnet": [ "8.0.0", diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/AcceptanceTest.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/AcceptanceTest.cs index 3c9ec1bfcbd..8c7d9acf373 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/AcceptanceTest.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/AcceptanceTest.cs @@ -246,7 +246,8 @@ public Task ResourceUtilizationTracker_And_Metrics_Report_Same_Values_With_Cgrou .AddSingleton(new FakeUserHz(100)) .AddSingleton(fileSystem) .AddSingleton(new GenericPublisher(_ => e.Set())) - .AddResourceMonitoring()) + .AddResourceMonitoring() + .Replace(ServiceDescriptor.Singleton())) .Build(); meterScope = host.Services.GetRequiredService();