Skip to content

Merge changes from internal after 10.2 release#7205

Merged
joperezr merged 3 commits into
dotnet:release/10.2from
joperezr:Merge10.2Internal
Jan 14, 2026
Merged

Merge changes from internal after 10.2 release#7205
joperezr merged 3 commits into
dotnet:release/10.2from
joperezr:Merge10.2Internal

Merge changes from internal

fcf8723
Select commit
Loading
Failed to load commit list.
Azure Pipelines / extensions-ci succeeded Jan 14, 2026 in 54m 4s

Build #20260113.13 had test failures

Details

Tests

  • Failed: 1 (0.00%)
  • Passed: 57,059 (92.05%)
  • Other: 4,925 (7.95%)
  • Total: 61,985

Annotations

Check failure on line 9 in Build log

See this annotation in the file changed.

@azure-pipelines azure-pipelines / extensions-ci

Build log #L9

Writing comment failed

Check failure on line 1 in Microsoft.Extensions.Diagnostics.ResourceMonitoring.Windows.Test.WindowsContainerSnapshotProviderTests.SnapshotProvider_EmitsLogRecord

See this annotation in the file changed.

@azure-pipelines azure-pipelines / extensions-ci

Microsoft.Extensions.Diagnostics.ResourceMonitoring.Windows.Test.WindowsContainerSnapshotProviderTests.SnapshotProvider_EmitsLogRecord

VerifyException : Directory: D:\a\_work\1\s\test\Libraries\Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests\Windows\Verified
NotEqual:
  - Received: WindowsContainerSnapshotProviderTests.SnapshotProvider_EmitsLogRecord.Net4_6.received.txt
    Verified: WindowsContainerSnapshotProviderTests.SnapshotProvider_EmitsLogRecord.Net.verified.txt

FileContent:

NotEqual:

Received: WindowsContainerSnapshotProviderTests.SnapshotProvider_EmitsLogRecord.Net4_6.received.txt
[
  {
    Level: Information,
    Id: {
      Id: 1,
      Name: RunningInsideJobObject
    },
    State: [
      {
        {OriginalFormat}: Resource Monitoring is running inside a Job Object. For more information about Job Objects see https://aka.ms/job-objects
      }
    ],
    StructuredState: [
      {
        {OriginalFormat}: Resource Monitoring is running inside a Job Object. For more information about Job Objects see https://aka.ms/job-objects
      }
    ],
    Message: Resource Monitoring is running inside a Job Object. For more information about Job Objects see https://aka.ms/job-objects,
    Category: Microsoft.Extensions.Diagnostics.ResourceMonitoring.Windows.WindowsContainerSnapshotProvider,
    LevelEnabled: true,
    Timestamp: DateTimeOffset_1
  },
  {
    Level: Debug,
    Id: {
      Id: 6,
      Name: SystemResourcesInfo
    },
    State: [
      {
        memoryRequest: 2000
      },
      {
        memoryLimit: 2000
      },
      {
        cpuRequest: 1
      },
      {
        cpuLimit: 1
      },
      {
        {OriginalFormat}: System resources information: CpuLimit = {cpuLimit}, CpuRequest = {cpuRequest}, MemoryLimit = {memoryLimit}, MemoryRequest = {memoryRequest}.
      }
    ],
    StructuredState: [
      {
        memoryRequest: 2000
      },
      {
        memoryLimit: 2000
      },
      {
        cpuRequest: 1
      },
      {
        cpuLimit: 1
      },
      {
        {OriginalFormat}: System resources information: CpuLimit = {cpuLimit}, CpuRequest = {cpuRequest}, MemoryLimit = {memoryLimit}, MemoryRequest = {memoryRequest}.
      }
    ],
    Message: System resources information: CpuLimit = 1, CpuRequest = 1, MemoryLimit = 2000, MemoryRequest = 2000.,
    Category: Microsoft.Extensions.Diagnostics.ResourceMonitoring.Windows.WindowsContainerSnapshotProvider,
    LevelEnabled: true,
    Timestamp: DateTimeOffset_2
  }
]
Verified: WindowsContainerSnapshotProviderTests.SnapshotProvider_EmitsLogRecord.Net.verified.txt
[
  {
    Level: Information,
    Id: {
      Id: 1,
      Name: RunningInsideJobObject
    },
    State: [
      {
        {OriginalFormat}: Resource Monitoring is running inside a Job Object. For more information about Job Objects see https://aka.ms/job-objects
      }
    ],
    StructuredState: [
      {
        {OriginalFormat}: Resource Monitoring is running inside a Job Object. For more information about Job Objects see https://aka.ms/job-objects
      }
    ],
    Message: Resource Monitoring is running inside a Job Object. For more information about Job Objects see https://aka.ms/job-objects,
    Category: Microsoft.Extensions.Diagnostics.ResourceMonitoring.Windows.WindowsContainerSnapshotProvider,
    LevelEnabled: true,
    Timestamp: DateTimeOffset_1
  },
  {
    Level: Debug,
    Id: {
      Id: 6,
      Name: SystemResourcesInfo
    },
    State: [
      {
        memoryRequest: 2000
      },
      {
        memoryLimit: 2000
      },
      {
        cpuRequest: 1
      },
      {
        cpuLimit: 1
      },
      {
        {OriginalFormat}: System resources information: CpuLimit = {cpuLimit}, CpuRequest = {cpuRequest}, MemoryLimit = {memoryLimit}, MemoryRequest = {memoryRequest}.
      }
    ],
    StructuredState: [
      {
        memoryRequest: 2000
      },
      {
        memoryLimit: 2000
      },
      {
        cpuRequest: 1
      },
      {
        cpuLimit: 1
      },
      {
        {OriginalFormat}: System resources information: CpuLimit = {cpuLimit}, CpuRequest = {cpuRequest}, Mem