From cd5a79db588f3adcf185809779f5709210cba612 Mon Sep 17 00:00:00 2001 From: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com> Date: Thu, 19 Mar 2026 23:19:43 -0700 Subject: [PATCH 1/3] Split mock cdac types to a test helper assembly --- eng/Subsets.props | 9 ++++--- ...ostics.DataContractReader.Contracts.csproj | 1 + .../ExecutionManager/NibbleMapTestBuilder.cs | 6 ++--- ...iagnostics.Internal.TestDataMocking.csproj | 26 +++++++++++++++++++ .../MockDescriptors.CodeVersions.cs | 2 +- .../MockDescriptors.ExecutionManager.cs | 8 +++--- .../MockDescriptors/MockDescriptors.GC.cs | 12 ++++----- .../MockDescriptors.HashMap.cs | 2 +- .../MockDescriptors/MockDescriptors.Loader.cs | 2 +- .../MockDescriptors.MethodDescriptors.cs | 2 +- .../MockDescriptors/MockDescriptors.Object.cs | 2 +- .../MockDescriptors/MockDescriptors.ReJIT.cs | 2 +- .../MockDescriptors.RuntimeFunctions.cs | 4 +-- .../MockDescriptors.RuntimeTypeSystem.cs | 2 +- .../MockDescriptors.SyncBlock.cs | 2 +- .../MockDescriptors/MockDescriptors.Thread.cs | 2 +- .../MockDescriptors/MockDescriptors.cs | 4 +-- .../MockMemorySpace.BumpAllocator.cs | 5 ++-- .../MockMemorySpace.cs | 9 +++---- .../MockTarget.cs | 0 .../TargetTestHelpers.cs | 4 +-- .../TestPlaceholderTarget.cs | 8 +++--- src/native/managed/cdac/cdac.slnx | 1 + ...iagnostics.DataContractReader.Tests.csproj | 1 + 24 files changed, 73 insertions(+), 43 deletions(-) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/ExecutionManager/NibbleMapTestBuilder.cs (97%) create mode 100644 src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/Microsoft.Diagnostics.Internal.TestDataMocking.csproj rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.CodeVersions.cs (99%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.ExecutionManager.cs (99%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.GC.cs (98%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.HashMap.cs (99%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.Loader.cs (98%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.MethodDescriptors.cs (99%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.Object.cs (99%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.ReJIT.cs (99%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.RuntimeFunctions.cs (98%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs (99%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.SyncBlock.cs (99%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.Thread.cs (99%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockDescriptors/MockDescriptors.cs (99%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockMemorySpace.BumpAllocator.cs (96%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockMemorySpace.cs (98%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/MockTarget.cs (100%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/TargetTestHelpers.cs (98%) rename src/native/managed/cdac/{tests => Microsoft.Diagnostics.Internal.TestDataMocking}/TestPlaceholderTarget.cs (98%) diff --git a/eng/Subsets.props b/eng/Subsets.props index 21db6bbdcb8609..a8db076baae50c 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -515,9 +515,12 @@ + $(SharedNativeRoot)managed\cdac\Microsoft.Diagnostics.DataContractReader.Abstractions\Microsoft.Diagnostics.DataContractReader.Abstractions.csproj; + $(SharedNativeRoot)managed\cdac\Microsoft.Diagnostics.DataContractReader.Legacy\Microsoft.Diagnostics.DataContractReader.Legacy.csproj; + $(SharedNativeRoot)managed\cdac\Microsoft.Diagnostics.DataContractReader.Contracts\Microsoft.Diagnostics.DataContractReader.Contracts.csproj" Category="tools" Condition="'$(DotNetBuildSourceOnly)' != 'true'" /> + + + diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj index 340a1b149d2578..fa814c92773d35 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj +++ b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj @@ -14,6 +14,7 @@ + diff --git a/src/native/managed/cdac/tests/ExecutionManager/NibbleMapTestBuilder.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/ExecutionManager/NibbleMapTestBuilder.cs similarity index 97% rename from src/native/managed/cdac/tests/ExecutionManager/NibbleMapTestBuilder.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/ExecutionManager/NibbleMapTestBuilder.cs index cf023167c01896..83fb9d636ef35c 100644 --- a/src/native/managed/cdac/tests/ExecutionManager/NibbleMapTestBuilder.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/ExecutionManager/NibbleMapTestBuilder.cs @@ -6,7 +6,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests.ExecutionManager; -internal abstract class NibbleMapTestBuilderBase +public abstract class NibbleMapTestBuilderBase { // This is the base address of the memory range that the map covers. // The map works on code pointers as offsets from this address @@ -72,7 +72,7 @@ public NibbleMapTestBuilderBase(TargetPointer mapBase, ulong mapRangeSize, MockM public abstract void AllocateCodeChunk(TargetCodePointer codeStart, uint codeSize); } -internal class NibbleMapTestBuilder_1 : NibbleMapTestBuilderBase +public class NibbleMapTestBuilder_1 : NibbleMapTestBuilderBase { public NibbleMapTestBuilder_1(TargetPointer mapBase, ulong mapRangeSize, TargetPointer mapStart, MockTarget.Architecture arch) : base(mapBase, mapRangeSize, mapStart, arch) @@ -114,7 +114,7 @@ public override void AllocateCodeChunk(TargetCodePointer codeStart, uint codeSiz } } -internal class NibbleMapTestBuilder_2 : NibbleMapTestBuilderBase +public class NibbleMapTestBuilder_2 : NibbleMapTestBuilderBase { public NibbleMapTestBuilder_2(TargetPointer mapBase, ulong mapRangeSize, TargetPointer mapStart, MockTarget.Architecture arch) : base(mapBase, mapRangeSize, mapStart, arch) diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/Microsoft.Diagnostics.Internal.TestDataMocking.csproj b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/Microsoft.Diagnostics.Internal.TestDataMocking.csproj new file mode 100644 index 00000000000000..5e2b2c50daa626 --- /dev/null +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/Microsoft.Diagnostics.Internal.TestDataMocking.csproj @@ -0,0 +1,26 @@ + + + + $(NetCoreAppToolCurrent) + Microsoft.Diagnostics.DataContractReader.Tests + annotations + true + + false + true + true + false + + true + + + + + + + + + + + + diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.CodeVersions.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.CodeVersions.cs similarity index 99% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.CodeVersions.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.CodeVersions.cs index feee26fc9c24f8..660d1359f56de8 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.CodeVersions.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.CodeVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal partial class MockDescriptors +public partial class MockDescriptors { public class CodeVersions { diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.ExecutionManager.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.ExecutionManager.cs similarity index 99% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.ExecutionManager.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.ExecutionManager.cs index 524ff8e21405dc..702b06d0442ba4 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.ExecutionManager.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.ExecutionManager.cs @@ -11,9 +11,9 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal partial class MockDescriptors +public partial class MockDescriptors { - internal class ExecutionManager + public class ExecutionManager { public const ulong ExecutionManagerCodeRangeMapAddress = 0x000a_fff0; @@ -42,7 +42,7 @@ public struct AllocationRange ExecutionManagerStart = 0x0033_4000, ExecutionManagerEnd = 0x0033_5000, }; - internal class RangeSectionMapTestBuilder + public class RangeSectionMapTestBuilder { const ulong DefaultTopLevelAddress = 0x0000_1000u; // arbitrary const int EntriesPerMapLevel = 256; // for now its fixed at 256, see codeman.h RangeSectionMap::entriesPerMapLevel @@ -352,7 +352,7 @@ internal NibbleMapTestBuilderBase CreateNibbleMap(ulong codeRangeStart, uint cod return nibBuilder; } - internal readonly struct JittedCodeRange + public readonly struct JittedCodeRange { public MockMemorySpace.BumpAllocator Allocator { get; init; } public ulong RangeStart => Allocator.RangeStart; diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.GC.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.GC.cs similarity index 98% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.GC.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.GC.cs index f10f69b4378716..e2440c4e9d6290 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.GC.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.GC.cs @@ -12,7 +12,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; /// and /// . /// -internal class GCHeapBuilder +public class GCHeapBuilder { // The native GC sizes m_FillPointers as total_generation_count + ExtraSegCount. private const int DefaultGenerationCount = 4; @@ -23,14 +23,14 @@ internal class GCHeapBuilder public record struct GenerationInput { - public ulong StartSegment; - public ulong AllocationStart; - public ulong AllocContextPointer; - public ulong AllocContextLimit; + public ulong StartSegment { get; set; } + public ulong AllocationStart { get; set; } + public ulong AllocContextPointer { get; set; } + public ulong AllocContextLimit { get; set; } } } -internal static class GCHeapBuilderExtensions +public static class GCHeapBuilderExtensions { private const ulong DefaultAllocationRangeStart = 0x0010_0000; private const ulong DefaultAllocationRangeEnd = 0x0020_0000; diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.HashMap.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.HashMap.cs similarity index 99% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.HashMap.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.HashMap.cs index 84230ad874276b..04cb750586e8b7 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.HashMap.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.HashMap.cs @@ -7,7 +7,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal partial class MockDescriptors +public partial class MockDescriptors { public class HashMap { diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.Loader.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Loader.cs similarity index 98% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.Loader.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Loader.cs index 303cc468df3adc..fbca6c2b8cdf6d 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.Loader.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Loader.cs @@ -7,7 +7,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal partial class MockDescriptors +public partial class MockDescriptors { public class Loader { diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.MethodDescriptors.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.MethodDescriptors.cs similarity index 99% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.MethodDescriptors.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.MethodDescriptors.cs index 06ec85b8852758..e82bae37a91842 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.MethodDescriptors.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.MethodDescriptors.cs @@ -7,7 +7,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal partial class MockDescriptors +public partial class MockDescriptors { public class MethodDescriptors { diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.Object.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Object.cs similarity index 99% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.Object.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Object.cs index 3f99a46e8d13d2..fdf6c0bd9a7871 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.Object.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Object.cs @@ -10,7 +10,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal partial class MockDescriptors +public partial class MockDescriptors { public class Object { diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.ReJIT.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.ReJIT.cs similarity index 99% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.ReJIT.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.ReJIT.cs index f3e9085b7857ec..3f1f6f9c56e7d7 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.ReJIT.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.ReJIT.cs @@ -7,7 +7,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal partial class MockDescriptors +public partial class MockDescriptors { public class ReJIT { diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.RuntimeFunctions.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.RuntimeFunctions.cs similarity index 98% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.RuntimeFunctions.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.RuntimeFunctions.cs index c7d772f96d6308..3e555be3c6dfc6 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.RuntimeFunctions.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.RuntimeFunctions.cs @@ -7,9 +7,9 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal partial class MockDescriptors +public partial class MockDescriptors { - internal class RuntimeFunctions + public class RuntimeFunctions { private static TypeFields RuntimeFunctionFields(bool includeEndAddress) { diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs similarity index 99% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs index 2b9de8e1b31782..9abf6e675c89ad 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs @@ -7,7 +7,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal partial class MockDescriptors +public partial class MockDescriptors { public class RuntimeTypeSystem { diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.SyncBlock.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.SyncBlock.cs similarity index 99% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.SyncBlock.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.SyncBlock.cs index 139df9cbe074ba..20764b39643989 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.SyncBlock.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.SyncBlock.cs @@ -6,7 +6,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal partial class MockDescriptors +public partial class MockDescriptors { public class SyncBlock { diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.Thread.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Thread.cs similarity index 99% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.Thread.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Thread.cs index 806822df964d2e..ed7e5be5640696 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.Thread.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Thread.cs @@ -6,7 +6,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal partial class MockDescriptors +public partial class MockDescriptors { public class Thread { diff --git a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.cs similarity index 99% rename from src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.cs index 7a0b4fd7a95c18..5e489a7648c050 100644 --- a/src/native/managed/cdac/tests/MockDescriptors/MockDescriptors.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.cs @@ -5,9 +5,9 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal partial class MockDescriptors +public partial class MockDescriptors { - internal record TypeFields + public record TypeFields { public DataType DataType; public TargetTestHelpers.Field[] Fields; diff --git a/src/native/managed/cdac/tests/MockMemorySpace.BumpAllocator.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockMemorySpace.BumpAllocator.cs similarity index 96% rename from src/native/managed/cdac/tests/MockMemorySpace.BumpAllocator.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockMemorySpace.BumpAllocator.cs index 46e1130141b2cc..e6932087994ba2 100644 --- a/src/native/managed/cdac/tests/MockMemorySpace.BumpAllocator.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockMemorySpace.BumpAllocator.cs @@ -7,7 +7,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Text; -using Xunit; namespace Microsoft.Diagnostics.DataContractReader.Tests; @@ -18,9 +17,9 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; /// Use MockMemorySpace.CreateContext to create a mostly empty context for reading from the target. /// Use MockMemorySpace.ContextBuilder to create a context with additional MockMemorySpace.HeapFragment data. /// -internal unsafe static partial class MockMemorySpace +public unsafe static partial class MockMemorySpace { - internal class BumpAllocator + public class BumpAllocator { private readonly ulong _blockStart; private readonly ulong _blockEnd; // exclusive diff --git a/src/native/managed/cdac/tests/MockMemorySpace.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockMemorySpace.cs similarity index 98% rename from src/native/managed/cdac/tests/MockMemorySpace.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockMemorySpace.cs index db9b34e867600c..bf3dd04a2290ce 100644 --- a/src/native/managed/cdac/tests/MockMemorySpace.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockMemorySpace.cs @@ -7,7 +7,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Text; -using Xunit; namespace Microsoft.Diagnostics.DataContractReader.Tests; @@ -17,9 +16,9 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; /// /// Use MockMemorySpace.Builder to create a context with MockMemorySpace.HeapFragment data. /// -internal unsafe static partial class MockMemorySpace +public unsafe static partial class MockMemorySpace { - internal struct HeapFragment + public struct HeapFragment { public ulong Address; public byte[] Data; @@ -29,7 +28,7 @@ internal struct HeapFragment /// /// Helper to populate a virtual memory space for reading from a target. /// - internal class Builder + public class Builder { private readonly List _heapFragments = new(); private readonly List _allocators = new(); @@ -124,7 +123,7 @@ public BumpAllocator CreateAllocator(ulong start, ulong end, int minAlign = 16) } // Used by ReadFromTarget to return the appropriate bytes - internal class MemoryContext + public class MemoryContext { public IList HeapFragments { get; init; } diff --git a/src/native/managed/cdac/tests/MockTarget.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockTarget.cs similarity index 100% rename from src/native/managed/cdac/tests/MockTarget.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockTarget.cs diff --git a/src/native/managed/cdac/tests/TargetTestHelpers.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/TargetTestHelpers.cs similarity index 98% rename from src/native/managed/cdac/tests/TargetTestHelpers.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/TargetTestHelpers.cs index e231cca54942f8..16422699dd9f36 100644 --- a/src/native/managed/cdac/tests/TargetTestHelpers.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/TargetTestHelpers.cs @@ -7,7 +7,7 @@ using System.Text; namespace Microsoft.Diagnostics.DataContractReader.Tests; -internal unsafe class TargetTestHelpers +public unsafe class TargetTestHelpers { public MockTarget.Architecture Arch { get; init; } @@ -180,7 +180,7 @@ public readonly struct LayoutResult public readonly uint MaxAlign { get; init; } } - internal record Field(string Name, DataType Type, uint? Size = null); + public record Field(string Name, DataType Type, uint? Size = null); // Implements a simple layout algorithm that aligns fields to their size // and aligns the structure to the largest field size. diff --git a/src/native/managed/cdac/tests/TestPlaceholderTarget.cs b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/TestPlaceholderTarget.cs similarity index 98% rename from src/native/managed/cdac/tests/TestPlaceholderTarget.cs rename to src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/TestPlaceholderTarget.cs index b8e7017885cbdd..44d9eaaf1c30b9 100644 --- a/src/native/managed/cdac/tests/TestPlaceholderTarget.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/TestPlaceholderTarget.cs @@ -14,7 +14,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; /// /// A mock implementation of Target that has basic implementations of getting types/globals and reading data /// -internal class TestPlaceholderTarget : Target +public class TestPlaceholderTarget : Target { private ContractRegistry _contractRegistry; private readonly Target.IDataCache _dataCache; @@ -22,11 +22,11 @@ internal class TestPlaceholderTarget : Target private readonly (string Name, ulong Value)[] _globals; private readonly (string Name, string Value)[] _globalStrings; - internal delegate int ReadFromTargetDelegate(ulong address, Span buffer); + public delegate int ReadFromTargetDelegate(ulong address, Span buffer); private readonly ReadFromTargetDelegate _dataReader; - public TestPlaceholderTarget(MockTarget.Architecture arch, ReadFromTargetDelegate reader, Dictionary types = null, (string Name, ulong Value)[] globals = null, (string Name, string Value)[] globalStrings = null) + public TestPlaceholderTarget(MockTarget.Architecture arch, ReadFromTargetDelegate reader, Dictionary? types = null, (string Name, ulong Value)[]? globals = null, (string Name, string Value)[]? globalStrings = null) { IsLittleEndian = arch.IsLittleEndian; PointerSize = arch.Is64Bit ? 8 : 4; @@ -48,7 +48,7 @@ internal void SetContracts(ContractRegistry contracts) /// globals, and contract factories from mock descriptors, then materializes the /// target and wires contracts in . /// - internal class Builder + public class Builder { private readonly MockTarget.Architecture _arch; private readonly MockMemorySpace.Builder _memBuilder; diff --git a/src/native/managed/cdac/cdac.slnx b/src/native/managed/cdac/cdac.slnx index 7449d30624ec2d..ef70e1eea610f6 100644 --- a/src/native/managed/cdac/cdac.slnx +++ b/src/native/managed/cdac/cdac.slnx @@ -9,6 +9,7 @@ + diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests.csproj b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests.csproj index c9de2a1bac2da7..333542f8f54dc8 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests.csproj +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests.csproj @@ -14,6 +14,7 @@ + From 1872454a725629402f0b43203f5bc00eb5fc1267 Mon Sep 17 00:00:00 2001 From: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com> Date: Fri, 20 Mar 2026 04:02:08 -0700 Subject: [PATCH 2/3] Move into Microsoft.Diagnostics.Internal.RuntimeMemoryMocks project --- eng/Subsets.props | 4 ++-- ...ft.Diagnostics.DataContractReader.Contracts.csproj | 2 +- src/native/managed/cdac/README.md | 2 +- src/native/managed/cdac/cdac.slnx | 4 ++-- .../BuiltInCOMTests.cs | 1 + .../ClrDataExceptionStateTests.cs | 1 + .../ClrDataTaskTests.cs | 1 + .../CodeVersionsTests.cs | 3 ++- .../ContractDescriptor/ContractDescriptorBuilder.cs | 1 + .../ContractDescriptor/ContractDescriptorHelpers.cs | 1 + .../ContractDescriptor/ParserTests.cs | 0 .../ContractDescriptor/TargetTests.SubDescriptors.cs | 1 + .../ContractDescriptor/TargetTests.cs | 1 + .../DacStreamsTests.cs | 3 ++- .../ExecutionManager/ExecutionManagerTests.cs | 5 +++-- .../ExecutionManager/HashMapTests.cs | 1 + .../ExecutionManager/HotColdLookupTests.cs | 0 .../ExecutionManager/NibbleMapTests.cs | 2 ++ .../ExecutionManager/RangeSectionMapTests.cs | 1 + .../ExecutionManager/RuntimeFunctionTests.cs | 1 + .../GCTests.cs | 1 + .../GetRegisterNameTests.cs | 1 + .../LoaderTests.cs | 3 ++- .../MethodDescTests.cs | 1 + .../MethodTableTests.cs | 3 ++- ...rosoft.Diagnostics.DataContractReader.Tests.csproj | 11 +++-------- .../ObjectTests.cs | 3 ++- .../PlatformContextTests.cs | 0 .../PrecodeStubsTests.cs | 1 + .../PrintfStressMessageFormatterTests.cs | 0 .../ReJITTests.cs | 3 ++- .../RuntimeInfoTests.cs | 1 + .../SOSDacInterface8Tests.cs | 1 + .../SyncBlockTests.cs | 1 + .../TestHelpers.cs | 0 .../ThreadTests.cs | 1 + .../TypeDescTests.cs | 1 + .../ExecutionManager/NibbleMapTestBuilder.cs | 10 ++++++---- ...ft.Diagnostics.Internal.RuntimeMemoryMocks.csproj} | 9 ++++----- .../MockDescriptors/MockDescriptors.CodeVersions.cs | 8 ++++++-- .../MockDescriptors.ExecutionManager.cs | 10 +++++++--- .../MockDescriptors/MockDescriptors.GC.cs | 6 +++++- .../MockDescriptors/MockDescriptors.HashMap.cs | 9 +++++++-- .../MockDescriptors/MockDescriptors.Loader.cs | 8 ++++++-- .../MockDescriptors.MethodDescriptors.cs | 8 ++++++-- .../MockDescriptors/MockDescriptors.Object.cs | 8 ++++++-- .../MockDescriptors/MockDescriptors.ReJIT.cs | 8 ++++++-- .../MockDescriptors.RuntimeFunctions.cs | 8 ++++++-- .../MockDescriptors.RuntimeTypeSystem.cs | 8 ++++++-- .../MockDescriptors/MockDescriptors.SyncBlock.cs | 11 ++++++----- .../MockDescriptors/MockDescriptors.Thread.cs | 8 ++++++-- .../MockDescriptors/MockDescriptors.cs | 6 ++++-- .../MockMemorySpace.BumpAllocator.cs | 4 +++- .../MockMemorySpace.cs | 4 +++- .../MockTarget.cs | 2 +- .../TargetTestHelpers.cs | 4 +++- .../TestPlaceholderTarget.cs | 7 +++++-- 57 files changed, 147 insertions(+), 66 deletions(-) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/BuiltInCOMTests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ClrDataExceptionStateTests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ClrDataTaskTests.cs (96%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/CodeVersionsTests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ContractDescriptor/ContractDescriptorBuilder.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ContractDescriptor/ContractDescriptorHelpers.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ContractDescriptor/ParserTests.cs (100%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ContractDescriptor/TargetTests.SubDescriptors.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ContractDescriptor/TargetTests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/DacStreamsTests.cs (98%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ExecutionManager/ExecutionManagerTests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ExecutionManager/HashMapTests.cs (98%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ExecutionManager/HotColdLookupTests.cs (100%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ExecutionManager/NibbleMapTests.cs (98%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ExecutionManager/RangeSectionMapTests.cs (98%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ExecutionManager/RuntimeFunctionTests.cs (98%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/GCTests.cs (98%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/GetRegisterNameTests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/LoaderTests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/MethodDescTests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/MethodTableTests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/Microsoft.Diagnostics.DataContractReader.Tests.csproj (54%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ObjectTests.cs (98%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/PlatformContextTests.cs (100%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/PrecodeStubsTests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/PrintfStressMessageFormatterTests.cs (100%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ReJITTests.cs (97%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/RuntimeInfoTests.cs (98%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/SOSDacInterface8Tests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/SyncBlockTests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/TestHelpers.cs (100%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/ThreadTests.cs (99%) rename src/native/managed/cdac/tests/{ => Microsoft.Diagnostics.DataContractReader.Tests}/TypeDescTests.cs (99%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/ExecutionManager/NibbleMapTestBuilder.cs (95%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking/Microsoft.Diagnostics.Internal.TestDataMocking.csproj => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.csproj} (56%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.CodeVersions.cs (98%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.ExecutionManager.cs (99%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.GC.cs (99%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.HashMap.cs (96%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.Loader.cs (94%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.MethodDescriptors.cs (98%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.Object.cs (98%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.ReJIT.cs (94%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.RuntimeFunctions.cs (96%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs (98%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.SyncBlock.cs (96%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.Thread.cs (98%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockDescriptors/MockDescriptors.cs (97%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockMemorySpace.BumpAllocator.cs (96%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockMemorySpace.cs (98%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/MockTarget.cs (95%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/TargetTestHelpers.cs (98%) rename src/native/managed/cdac/{Microsoft.Diagnostics.Internal.TestDataMocking => tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks}/TestPlaceholderTarget.cs (98%) diff --git a/eng/Subsets.props b/eng/Subsets.props index a8db076baae50c..74603ddd7bb5a5 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -520,11 +520,11 @@ $(SharedNativeRoot)managed\cdac\Microsoft.Diagnostics.DataContractReader.Contracts\Microsoft.Diagnostics.DataContractReader.Contracts.csproj" Category="tools" Condition="'$(DotNetBuildSourceOnly)' != 'true'" /> - + - + diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj index fa814c92773d35..8ea1688bc04ae0 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj +++ b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/native/managed/cdac/README.md b/src/native/managed/cdac/README.md index 7dc210c56116ee..2f735081e85d34 100644 --- a/src/native/managed/cdac/README.md +++ b/src/native/managed/cdac/README.md @@ -81,7 +81,7 @@ Use the `dotnet.sh` (or `dotnet.cmd`) script in the repo root: ```bash ./dotnet.sh build /t:Test \ - src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests.csproj \ + src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/Microsoft.Diagnostics.DataContractReader.Tests.csproj \ -c Debug -p:RuntimeConfiguration=Debug -p:LibrariesConfiguration=Release ``` diff --git a/src/native/managed/cdac/cdac.slnx b/src/native/managed/cdac/cdac.slnx index ef70e1eea610f6..47c766820507a8 100644 --- a/src/native/managed/cdac/cdac.slnx +++ b/src/native/managed/cdac/cdac.slnx @@ -9,11 +9,11 @@ - - + + diff --git a/src/native/managed/cdac/tests/BuiltInCOMTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/BuiltInCOMTests.cs similarity index 99% rename from src/native/managed/cdac/tests/BuiltInCOMTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/BuiltInCOMTests.cs index ef09a50c22e3b8..0d7a48c6f043a7 100644 --- a/src/native/managed/cdac/tests/BuiltInCOMTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/BuiltInCOMTests.cs @@ -7,6 +7,7 @@ using Microsoft.Diagnostics.DataContractReader.Contracts; using Moq; using Xunit; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/tests/ClrDataExceptionStateTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ClrDataExceptionStateTests.cs similarity index 99% rename from src/native/managed/cdac/tests/ClrDataExceptionStateTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ClrDataExceptionStateTests.cs index 65b90e88637557..04f119be37ec91 100644 --- a/src/native/managed/cdac/tests/ClrDataExceptionStateTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ClrDataExceptionStateTests.cs @@ -6,6 +6,7 @@ using Xunit; using Microsoft.Diagnostics.DataContractReader.Contracts; using Microsoft.Diagnostics.DataContractReader.Legacy; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/tests/ClrDataTaskTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ClrDataTaskTests.cs similarity index 96% rename from src/native/managed/cdac/tests/ClrDataTaskTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ClrDataTaskTests.cs index 36d87438814fc2..ac154120ac654c 100644 --- a/src/native/managed/cdac/tests/ClrDataTaskTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ClrDataTaskTests.cs @@ -4,6 +4,7 @@ using System; using Microsoft.Diagnostics.DataContractReader.Legacy; using Xunit; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/tests/CodeVersionsTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/CodeVersionsTests.cs similarity index 99% rename from src/native/managed/cdac/tests/CodeVersionsTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/CodeVersionsTests.cs index 7ceaeea2433ef4..2c309649b02176 100644 --- a/src/native/managed/cdac/tests/CodeVersionsTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/CodeVersionsTests.cs @@ -12,7 +12,8 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; using static Microsoft.Diagnostics.DataContractReader.Tests.MockExtensions; -using MockCodeVersions = MockDescriptors.CodeVersions; +using MockCodeVersions = Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.MockDescriptors.CodeVersions; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; internal static class MockExtensions { diff --git a/src/native/managed/cdac/tests/ContractDescriptor/ContractDescriptorBuilder.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/ContractDescriptorBuilder.cs similarity index 99% rename from src/native/managed/cdac/tests/ContractDescriptor/ContractDescriptorBuilder.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/ContractDescriptorBuilder.cs index c7961216806527..3eb939f7aa2354 100644 --- a/src/native/managed/cdac/tests/ContractDescriptor/ContractDescriptorBuilder.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/ContractDescriptorBuilder.cs @@ -7,6 +7,7 @@ using System.Diagnostics; using System.Linq; using System.Text; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests.ContractDescriptor; diff --git a/src/native/managed/cdac/tests/ContractDescriptor/ContractDescriptorHelpers.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/ContractDescriptorHelpers.cs similarity index 99% rename from src/native/managed/cdac/tests/ContractDescriptor/ContractDescriptorHelpers.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/ContractDescriptorHelpers.cs index f9ba9241d41384..3ca3ad5281d171 100644 --- a/src/native/managed/cdac/tests/ContractDescriptor/ContractDescriptorHelpers.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/ContractDescriptorHelpers.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests.ContractDescriptor; diff --git a/src/native/managed/cdac/tests/ContractDescriptor/ParserTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/ParserTests.cs similarity index 100% rename from src/native/managed/cdac/tests/ContractDescriptor/ParserTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/ParserTests.cs diff --git a/src/native/managed/cdac/tests/ContractDescriptor/TargetTests.SubDescriptors.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/TargetTests.SubDescriptors.cs similarity index 99% rename from src/native/managed/cdac/tests/ContractDescriptor/TargetTests.SubDescriptors.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/TargetTests.SubDescriptors.cs index a84012f67a72cf..34d8b1139522c4 100644 --- a/src/native/managed/cdac/tests/ContractDescriptor/TargetTests.SubDescriptors.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/TargetTests.SubDescriptors.cs @@ -7,6 +7,7 @@ using System.Runtime.CompilerServices; using System.Text; using Xunit; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests.ContractDescriptor; diff --git a/src/native/managed/cdac/tests/ContractDescriptor/TargetTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/TargetTests.cs similarity index 99% rename from src/native/managed/cdac/tests/ContractDescriptor/TargetTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/TargetTests.cs index 0512e19b9a36ef..584cd3daf503ee 100644 --- a/src/native/managed/cdac/tests/ContractDescriptor/TargetTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ContractDescriptor/TargetTests.cs @@ -7,6 +7,7 @@ using System.Runtime.CompilerServices; using System.Text; using Xunit; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests.ContractDescriptor; diff --git a/src/native/managed/cdac/tests/DacStreamsTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/DacStreamsTests.cs similarity index 98% rename from src/native/managed/cdac/tests/DacStreamsTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/DacStreamsTests.cs index c104a33bca325b..7e1fad93a6febd 100644 --- a/src/native/managed/cdac/tests/DacStreamsTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/DacStreamsTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using System; @@ -7,6 +7,7 @@ using Microsoft.Diagnostics.DataContractReader.Contracts; using Moq; using Xunit; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/tests/ExecutionManager/ExecutionManagerTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/ExecutionManagerTests.cs similarity index 99% rename from src/native/managed/cdac/tests/ExecutionManager/ExecutionManagerTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/ExecutionManagerTests.cs index b140f2b83aeb29..c0af2d0f67d600 100644 --- a/src/native/managed/cdac/tests/ExecutionManager/ExecutionManagerTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/ExecutionManagerTests.cs @@ -1,11 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; - using System.Collections.Generic; using Microsoft.Diagnostics.DataContractReader.Contracts; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.ExecutionManager; using Moq; +using Xunit; namespace Microsoft.Diagnostics.DataContractReader.Tests.ExecutionManager; diff --git a/src/native/managed/cdac/tests/ExecutionManager/HashMapTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/HashMapTests.cs similarity index 98% rename from src/native/managed/cdac/tests/ExecutionManager/HashMapTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/HashMapTests.cs index 64818b01d7ae93..b47350044dce4b 100644 --- a/src/native/managed/cdac/tests/ExecutionManager/HashMapTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/HashMapTests.cs @@ -4,6 +4,7 @@ using Xunit; using Microsoft.Diagnostics.DataContractReader.ExecutionManagerHelpers; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests.ExecutionManager; diff --git a/src/native/managed/cdac/tests/ExecutionManager/HotColdLookupTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/HotColdLookupTests.cs similarity index 100% rename from src/native/managed/cdac/tests/ExecutionManager/HotColdLookupTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/HotColdLookupTests.cs diff --git a/src/native/managed/cdac/tests/ExecutionManager/NibbleMapTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/NibbleMapTests.cs similarity index 98% rename from src/native/managed/cdac/tests/ExecutionManager/NibbleMapTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/NibbleMapTests.cs index c244e57de378bc..35ce2eeb48c42d 100644 --- a/src/native/managed/cdac/tests/ExecutionManager/NibbleMapTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/NibbleMapTests.cs @@ -4,6 +4,8 @@ using Xunit; using Microsoft.Diagnostics.DataContractReader.ExecutionManagerHelpers; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.ExecutionManager; namespace Microsoft.Diagnostics.DataContractReader.Tests.ExecutionManager; diff --git a/src/native/managed/cdac/tests/ExecutionManager/RangeSectionMapTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/RangeSectionMapTests.cs similarity index 98% rename from src/native/managed/cdac/tests/ExecutionManager/RangeSectionMapTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/RangeSectionMapTests.cs index 5e06e1e86a9ab1..4bbd845aad3302 100644 --- a/src/native/managed/cdac/tests/ExecutionManager/RangeSectionMapTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/RangeSectionMapTests.cs @@ -5,6 +5,7 @@ using Xunit; using Microsoft.Diagnostics.DataContractReader.ExecutionManagerHelpers; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests.ExecutionManager; diff --git a/src/native/managed/cdac/tests/ExecutionManager/RuntimeFunctionTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/RuntimeFunctionTests.cs similarity index 98% rename from src/native/managed/cdac/tests/ExecutionManager/RuntimeFunctionTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/RuntimeFunctionTests.cs index 3f76967c77279b..ebc9b0abef6f68 100644 --- a/src/native/managed/cdac/tests/ExecutionManager/RuntimeFunctionTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ExecutionManager/RuntimeFunctionTests.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System; using Moq; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests.ExecutionManager; diff --git a/src/native/managed/cdac/tests/GCTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/GCTests.cs similarity index 98% rename from src/native/managed/cdac/tests/GCTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/GCTests.cs index 0ecb226db0143d..e785dd09992437 100644 --- a/src/native/managed/cdac/tests/GCTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/GCTests.cs @@ -3,6 +3,7 @@ using Microsoft.Diagnostics.DataContractReader.Contracts; using Xunit; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/tests/GetRegisterNameTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/GetRegisterNameTests.cs similarity index 99% rename from src/native/managed/cdac/tests/GetRegisterNameTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/GetRegisterNameTests.cs index 6aed07e9fc72ba..5e1035bdbc3434 100644 --- a/src/native/managed/cdac/tests/GetRegisterNameTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/GetRegisterNameTests.cs @@ -7,6 +7,7 @@ using Microsoft.Diagnostics.DataContractReader.Legacy; using Moq; using Xunit; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/tests/LoaderTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/LoaderTests.cs similarity index 99% rename from src/native/managed/cdac/tests/LoaderTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/LoaderTests.cs index 999fd6a9fb1320..5abba68b13aab3 100644 --- a/src/native/managed/cdac/tests/LoaderTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/LoaderTests.cs @@ -12,7 +12,8 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -using MockLoader = MockDescriptors.Loader; +using MockLoader = Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.MockDescriptors.Loader; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; public unsafe class LoaderTests { diff --git a/src/native/managed/cdac/tests/MethodDescTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/MethodDescTests.cs similarity index 99% rename from src/native/managed/cdac/tests/MethodDescTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/MethodDescTests.cs index c53bf985574ac1..57884f1d297e42 100644 --- a/src/native/managed/cdac/tests/MethodDescTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/MethodDescTests.cs @@ -8,6 +8,7 @@ using Microsoft.Diagnostics.DataContractReader.RuntimeTypeSystemHelpers; using Moq; using Xunit; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/tests/MethodTableTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/MethodTableTests.cs similarity index 99% rename from src/native/managed/cdac/tests/MethodTableTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/MethodTableTests.cs index 2dcb7e843c5421..cf75359ce7027d 100644 --- a/src/native/managed/cdac/tests/MethodTableTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/MethodTableTests.cs @@ -11,7 +11,8 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -using MockRTS = MockDescriptors.RuntimeTypeSystem; +using MockRTS = Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.MockDescriptors.RuntimeTypeSystem; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; public class MethodTableTests { diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests.csproj b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/Microsoft.Diagnostics.DataContractReader.Tests.csproj similarity index 54% rename from src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests.csproj rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/Microsoft.Diagnostics.DataContractReader.Tests.csproj index 333542f8f54dc8..a1826eaa4d70ce 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests.csproj +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/Microsoft.Diagnostics.DataContractReader.Tests.csproj @@ -5,16 +5,11 @@ false - - - - - - + - - + + diff --git a/src/native/managed/cdac/tests/ObjectTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ObjectTests.cs similarity index 98% rename from src/native/managed/cdac/tests/ObjectTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ObjectTests.cs index 25cc3395e279ca..de758dd7be9b59 100644 --- a/src/native/managed/cdac/tests/ObjectTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ObjectTests.cs @@ -9,7 +9,8 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -using MockObject = MockDescriptors.Object; +using MockObject = Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.MockDescriptors.Object; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; public unsafe class ObjectTests { diff --git a/src/native/managed/cdac/tests/PlatformContextTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/PlatformContextTests.cs similarity index 100% rename from src/native/managed/cdac/tests/PlatformContextTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/PlatformContextTests.cs diff --git a/src/native/managed/cdac/tests/PrecodeStubsTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/PrecodeStubsTests.cs similarity index 99% rename from src/native/managed/cdac/tests/PrecodeStubsTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/PrecodeStubsTests.cs index a5b6c9fea5e15f..116d65a059e440 100644 --- a/src/native/managed/cdac/tests/PrecodeStubsTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/PrecodeStubsTests.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System; using System.Reflection; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/tests/PrintfStressMessageFormatterTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/PrintfStressMessageFormatterTests.cs similarity index 100% rename from src/native/managed/cdac/tests/PrintfStressMessageFormatterTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/PrintfStressMessageFormatterTests.cs diff --git a/src/native/managed/cdac/tests/ReJITTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ReJITTests.cs similarity index 97% rename from src/native/managed/cdac/tests/ReJITTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ReJITTests.cs index 172f48e804f68f..01063ec563d9d9 100644 --- a/src/native/managed/cdac/tests/ReJITTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ReJITTests.cs @@ -11,7 +11,8 @@ namespace Microsoft.Diagnostics.DataContractReader.Tests; -using MockReJIT = MockDescriptors.ReJIT; +using MockReJIT = Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.MockDescriptors.ReJIT; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; public class ReJITTests { diff --git a/src/native/managed/cdac/tests/RuntimeInfoTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/RuntimeInfoTests.cs similarity index 98% rename from src/native/managed/cdac/tests/RuntimeInfoTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/RuntimeInfoTests.cs index 7e8430e4bef53e..3931e96defc279 100644 --- a/src/native/managed/cdac/tests/RuntimeInfoTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/RuntimeInfoTests.cs @@ -6,6 +6,7 @@ using Microsoft.Diagnostics.DataContractReader.Contracts; using Moq; using Xunit; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/tests/SOSDacInterface8Tests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/SOSDacInterface8Tests.cs similarity index 99% rename from src/native/managed/cdac/tests/SOSDacInterface8Tests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/SOSDacInterface8Tests.cs index 9ddd72d9ac5a9c..eff674228f7d2d 100644 --- a/src/native/managed/cdac/tests/SOSDacInterface8Tests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/SOSDacInterface8Tests.cs @@ -3,6 +3,7 @@ using Microsoft.Diagnostics.DataContractReader.Legacy; using Xunit; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/tests/SyncBlockTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/SyncBlockTests.cs similarity index 99% rename from src/native/managed/cdac/tests/SyncBlockTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/SyncBlockTests.cs index 67803ba559a421..b0607b955a2593 100644 --- a/src/native/managed/cdac/tests/SyncBlockTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/SyncBlockTests.cs @@ -5,6 +5,7 @@ using Xunit; using Microsoft.Diagnostics.DataContractReader.Contracts; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/tests/TestHelpers.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/TestHelpers.cs similarity index 100% rename from src/native/managed/cdac/tests/TestHelpers.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/TestHelpers.cs diff --git a/src/native/managed/cdac/tests/ThreadTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ThreadTests.cs similarity index 99% rename from src/native/managed/cdac/tests/ThreadTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ThreadTests.cs index 2e5c3b46e7ff98..08eed1580af08a 100644 --- a/src/native/managed/cdac/tests/ThreadTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/ThreadTests.cs @@ -6,6 +6,7 @@ using Xunit; using Microsoft.Diagnostics.DataContractReader.Contracts; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/tests/TypeDescTests.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/TypeDescTests.cs similarity index 99% rename from src/native/managed/cdac/tests/TypeDescTests.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/TypeDescTests.cs index 9a79bacdb6be78..63dea890a13bc6 100644 --- a/src/native/managed/cdac/tests/TypeDescTests.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.DataContractReader.Tests/TypeDescTests.cs @@ -7,6 +7,7 @@ using Microsoft.Diagnostics.DataContractReader.RuntimeTypeSystemHelpers; using Moq; using Xunit; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; namespace Microsoft.Diagnostics.DataContractReader.Tests; diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/ExecutionManager/NibbleMapTestBuilder.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/ExecutionManager/NibbleMapTestBuilder.cs similarity index 95% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/ExecutionManager/NibbleMapTestBuilder.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/ExecutionManager/NibbleMapTestBuilder.cs index 83fb9d636ef35c..6c9b7ed35ca640 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/ExecutionManager/NibbleMapTestBuilder.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/ExecutionManager/NibbleMapTestBuilder.cs @@ -4,7 +4,9 @@ using System; using Microsoft.Diagnostics.DataContractReader.ExecutionManagerHelpers; -namespace Microsoft.Diagnostics.DataContractReader.Tests.ExecutionManager; +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.ExecutionManager; public abstract class NibbleMapTestBuilderBase { @@ -34,17 +36,17 @@ public abstract class NibbleMapTestBuilderBase protected const uint HighestNibbleMask = NibbleMask << HighestNibbleBit; - protected ulong Addr2Pos(ulong addr) + protected static ulong Addr2Pos(ulong addr) { return addr >>> Log2BytesPerBucket; } - protected uint Addr2Offs(ulong addr) + protected static uint Addr2Offs(ulong addr) { return (uint) (((addr & MaskBytesPerBucket) >>> Log2CodeAlign) + 1); } - protected int Pos2ShiftCount (ulong addr) + protected static int Pos2ShiftCount (ulong addr) { return HighestNibbleBit - (int)((addr & NibblesPerDwordMask) << Log2NibbleSize); } diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/Microsoft.Diagnostics.Internal.TestDataMocking.csproj b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.csproj similarity index 56% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/Microsoft.Diagnostics.Internal.TestDataMocking.csproj rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.csproj index 5e2b2c50daa626..6af3d13d2dfbb9 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/Microsoft.Diagnostics.Internal.TestDataMocking.csproj +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.csproj @@ -2,16 +2,15 @@ $(NetCoreAppToolCurrent) - Microsoft.Diagnostics.DataContractReader.Tests + Microsoft.Diagnostics.Internal.RuntimeMemoryMocks annotations true + true false true true false - - true @@ -19,8 +18,8 @@ - - + + diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.CodeVersions.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.CodeVersions.cs similarity index 98% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.CodeVersions.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.CodeVersions.cs index 660d1359f56de8..d83979ce9d067e 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.CodeVersions.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.CodeVersions.cs @@ -5,9 +5,13 @@ using System.Collections.Generic; using Microsoft.Diagnostics.DataContractReader.Contracts; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -public partial class MockDescriptors +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; + +public static partial class MockDescriptors { public class CodeVersions { diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.ExecutionManager.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ExecutionManager.cs similarity index 99% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.ExecutionManager.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ExecutionManager.cs index 702b06d0442ba4..d3a0c0d3d78f4f 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.ExecutionManager.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ExecutionManager.cs @@ -5,13 +5,17 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Diagnostics.DataContractReader.ExecutionManagerHelpers; -using Microsoft.Diagnostics.DataContractReader.Tests.ExecutionManager; +using Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.ExecutionManager; using InteriorMapValue = Microsoft.Diagnostics.DataContractReader.ExecutionManagerHelpers.RangeSectionMap.InteriorMapValue; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -public partial class MockDescriptors +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; + +public static partial class MockDescriptors { public class ExecutionManager { diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.GC.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.GC.cs similarity index 99% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.GC.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.GC.cs index e2440c4e9d6290..a74105e1ca0687 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.GC.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.GC.cs @@ -5,7 +5,11 @@ using System.Collections.Generic; using Microsoft.Diagnostics.DataContractReader.Contracts; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Data = Microsoft.Diagnostics.DataContractReader.Data; + +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; /// /// Configuration object for GC heap mock data, used with diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.HashMap.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.HashMap.cs similarity index 96% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.HashMap.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.HashMap.cs index 04cb750586e8b7..ff5dc78629730b 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.HashMap.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.HashMap.cs @@ -5,9 +5,14 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -public partial class MockDescriptors +using ExecutionManagerHelpers = Microsoft.Diagnostics.DataContractReader.ExecutionManagerHelpers; +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; + +public static partial class MockDescriptors { public class HashMap { diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Loader.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.Loader.cs similarity index 94% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Loader.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.Loader.cs index fbca6c2b8cdf6d..0cd5baa2a44182 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Loader.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.Loader.cs @@ -5,9 +5,13 @@ using System.Collections.Generic; using System.Text; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -public partial class MockDescriptors +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; + +public static partial class MockDescriptors { public class Loader { diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.MethodDescriptors.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.MethodDescriptors.cs similarity index 98% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.MethodDescriptors.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.MethodDescriptors.cs index e82bae37a91842..08ae9055681bcf 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.MethodDescriptors.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.MethodDescriptors.cs @@ -5,9 +5,13 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -public partial class MockDescriptors +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; + +public static partial class MockDescriptors { public class MethodDescriptors { diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Object.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.Object.cs similarity index 98% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Object.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.Object.cs index fdf6c0bd9a7871..75b3535e861c16 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Object.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.Object.cs @@ -8,9 +8,13 @@ using System.Runtime.InteropServices; using Microsoft.Diagnostics.DataContractReader.RuntimeTypeSystemHelpers; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -public partial class MockDescriptors +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; + +public static partial class MockDescriptors { public class Object { diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.ReJIT.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ReJIT.cs similarity index 94% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.ReJIT.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ReJIT.cs index 3f1f6f9c56e7d7..978e97d7c4a78a 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.ReJIT.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ReJIT.cs @@ -5,9 +5,13 @@ using System.Collections.Generic; using Microsoft.Diagnostics.DataContractReader.Contracts; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -public partial class MockDescriptors +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; + +public static partial class MockDescriptors { public class ReJIT { diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.RuntimeFunctions.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeFunctions.cs similarity index 96% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.RuntimeFunctions.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeFunctions.cs index 3e555be3c6dfc6..7aeef7046790b4 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.RuntimeFunctions.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeFunctions.cs @@ -5,9 +5,13 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -public partial class MockDescriptors +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; + +public static partial class MockDescriptors { public class RuntimeFunctions { diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs similarity index 98% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs index 9abf6e675c89ad..6e5853c85e1692 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs @@ -5,9 +5,13 @@ using System.Collections.Generic; using Microsoft.Diagnostics.DataContractReader.Contracts; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -public partial class MockDescriptors +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; + +public static partial class MockDescriptors { public class RuntimeTypeSystem { diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.SyncBlock.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.SyncBlock.cs similarity index 96% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.SyncBlock.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.SyncBlock.cs index 20764b39643989..58799f1b6fe200 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.SyncBlock.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.SyncBlock.cs @@ -4,17 +4,18 @@ using System; using System.Collections.Generic; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -public partial class MockDescriptors +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; + +public static partial class MockDescriptors { public class SyncBlock { private const ulong DefaultAllocationRangeStart = 0x0001_0000; private const ulong DefaultAllocationRangeEnd = 0x0002_0000; - - private const ulong TestSyncBlockCacheGlobalAddress = 0x0000_0100; - private const ulong TestSyncTableEntriesGlobalAddress = 0x0000_0200; private const ulong TestSyncTableEntriesAddress = 0x0000_0300; internal Dictionary Types { get; } diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Thread.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.Thread.cs similarity index 98% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Thread.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.Thread.cs index ed7e5be5640696..ec633c0ac40820 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.Thread.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.Thread.cs @@ -4,9 +4,13 @@ using System; using System.Collections.Generic; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -public partial class MockDescriptors +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; + +public static partial class MockDescriptors { public class Thread { diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.cs similarity index 97% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.cs index 5e489a7648c050..0350bf8fd23360 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockDescriptors/MockDescriptors.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.cs @@ -2,10 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Generic; +using Microsoft.Diagnostics.DataContractReader; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; -public partial class MockDescriptors +public static partial class MockDescriptors { public record TypeFields { diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockMemorySpace.BumpAllocator.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.BumpAllocator.cs similarity index 96% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockMemorySpace.BumpAllocator.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.BumpAllocator.cs index e6932087994ba2..fdfafb0109ad2e 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockMemorySpace.BumpAllocator.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.BumpAllocator.cs @@ -8,7 +8,9 @@ using System.Linq; using System.Text; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; /// /// Helper for creating a mock memory space for testing. diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockMemorySpace.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.cs similarity index 98% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockMemorySpace.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.cs index bf3dd04a2290ce..98e5625a621d53 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockMemorySpace.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.cs @@ -8,7 +8,9 @@ using System.Linq; using System.Text; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; /// /// Helper for creating a mock memory space for testing. diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockTarget.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockTarget.cs similarity index 95% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockTarget.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockTarget.cs index 2950929cf8b08b..3318dc3c2bdc5c 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/MockTarget.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockTarget.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; public class MockTarget { diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/TargetTestHelpers.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TargetTestHelpers.cs similarity index 98% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/TargetTestHelpers.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TargetTestHelpers.cs index 16422699dd9f36..5d4c2bc3325f76 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/TargetTestHelpers.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TargetTestHelpers.cs @@ -6,7 +6,9 @@ using System.Collections.Generic; using System.Text; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; public unsafe class TargetTestHelpers { public MockTarget.Architecture Arch { get; init; } diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/TestPlaceholderTarget.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TestPlaceholderTarget.cs similarity index 98% rename from src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/TestPlaceholderTarget.cs rename to src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TestPlaceholderTarget.cs index 44d9eaaf1c30b9..6f604777e29fe5 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.Internal.TestDataMocking/TestPlaceholderTarget.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TestPlaceholderTarget.cs @@ -8,8 +8,11 @@ using System.Runtime.CompilerServices; using System.Text; using Microsoft.Diagnostics.DataContractReader.Contracts; +using Data = Microsoft.Diagnostics.DataContractReader.Data; -namespace Microsoft.Diagnostics.DataContractReader.Tests; +using Microsoft.Diagnostics.DataContractReader; + +namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; /// /// A mock implementation of Target that has basic implementations of getting types/globals and reading data @@ -26,7 +29,7 @@ public class TestPlaceholderTarget : Target private readonly ReadFromTargetDelegate _dataReader; - public TestPlaceholderTarget(MockTarget.Architecture arch, ReadFromTargetDelegate reader, Dictionary? types = null, (string Name, ulong Value)[]? globals = null, (string Name, string Value)[]? globalStrings = null) + public TestPlaceholderTarget(MockTarget.Architecture arch, ReadFromTargetDelegate reader, Dictionary types = null, (string Name, ulong Value)[] globals = null, (string Name, string Value)[] globalStrings = null) { IsLittleEndian = arch.IsLittleEndian; PointerSize = arch.Is64Bit ? 8 : 4; From 0a06f9b27f22532dcf7fa55ce1406d9c0638486e Mon Sep 17 00:00:00 2001 From: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com> Date: Fri, 20 Mar 2026 15:14:42 -0700 Subject: [PATCH 3/3] Mark assembly as not-a-test-proj and deal with copilation issues --- ....Diagnostics.DataContractReader.Abstractions.csproj | 2 +- ...oft.Diagnostics.DataContractReader.Contracts.csproj | 2 +- ...rosoft.Diagnostics.DataContractReader.Legacy.csproj | 2 +- .../Microsoft.Diagnostics.DataContractReader.csproj | 2 +- ...oft.Diagnostics.DataContractReader.DumpTests.csproj | 4 ++-- .../ExecutionManager/NibbleMapTestBuilder.cs | 8 ++++---- ...soft.Diagnostics.Internal.RuntimeMemoryMocks.csproj | 3 +-- .../MockDescriptors/MockDescriptors.CodeVersions.cs | 3 +-- .../MockDescriptors.ExecutionManager.cs | 10 +++++----- .../MockDescriptors/MockDescriptors.HashMap.cs | 2 +- .../MockDescriptors/MockDescriptors.ReJIT.cs | 4 +++- .../MockDescriptors.RuntimeFunctions.cs | 2 +- .../MockDescriptors.RuntimeTypeSystem.cs | 2 +- .../MockMemorySpace.BumpAllocator.cs | 4 ++-- .../MockMemorySpace.cs | 2 +- .../TargetTestHelpers.cs | 5 +++-- .../TestPlaceholderTarget.cs | 4 ++-- 17 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Abstractions/Microsoft.Diagnostics.DataContractReader.Abstractions.csproj b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Abstractions/Microsoft.Diagnostics.DataContractReader.Abstractions.csproj index 2827af8ec1fe21..0f303b0d9bfa47 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Abstractions/Microsoft.Diagnostics.DataContractReader.Abstractions.csproj +++ b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Abstractions/Microsoft.Diagnostics.DataContractReader.Abstractions.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppToolCurrent) + $(NetMinimum) Microsoft.Diagnostics.DataContractReader enable true diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj index 8ea1688bc04ae0..7d0c3e25885030 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj +++ b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppToolCurrent) + $(NetMinimum) Microsoft.Diagnostics.DataContractReader enable true diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Microsoft.Diagnostics.DataContractReader.Legacy.csproj b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Microsoft.Diagnostics.DataContractReader.Legacy.csproj index 4eb5f58cc529dc..2045ef12486c1d 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Microsoft.Diagnostics.DataContractReader.Legacy.csproj +++ b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Microsoft.Diagnostics.DataContractReader.Legacy.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppToolCurrent) + $(NetMinimum) Microsoft.Diagnostics.DataContractReader.Legacy enable true diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader/Microsoft.Diagnostics.DataContractReader.csproj b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader/Microsoft.Diagnostics.DataContractReader.csproj index 57a380547b7ae3..3210e4497b1364 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader/Microsoft.Diagnostics.DataContractReader.csproj +++ b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader/Microsoft.Diagnostics.DataContractReader.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppToolCurrent) + $(NetMinimum) Microsoft.Diagnostics.DataContractReader enable true diff --git a/src/native/managed/cdac/tests/DumpTests/Microsoft.Diagnostics.DataContractReader.DumpTests.csproj b/src/native/managed/cdac/tests/DumpTests/Microsoft.Diagnostics.DataContractReader.DumpTests.csproj index 073649dfd52218..f826a660034535 100644 --- a/src/native/managed/cdac/tests/DumpTests/Microsoft.Diagnostics.DataContractReader.DumpTests.csproj +++ b/src/native/managed/cdac/tests/DumpTests/Microsoft.Diagnostics.DataContractReader.DumpTests.csproj @@ -25,8 +25,8 @@ - - + + diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/ExecutionManager/NibbleMapTestBuilder.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/ExecutionManager/NibbleMapTestBuilder.cs index 6c9b7ed35ca640..a5e964b4f82239 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/ExecutionManager/NibbleMapTestBuilder.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/ExecutionManager/NibbleMapTestBuilder.cs @@ -101,7 +101,7 @@ public override void AllocateCodeChunk(TargetCodePointer codeStart, uint codeSiz uint index = (uint) (pos >>> Log2NibblesPerDword); uint mask = ~(HighestNibbleMask >>> (int)((pos & NibblesPerDwordMask) << Log2NibbleSize)); - value = value << Pos2ShiftCount(pos); + value <<= Pos2ShiftCount(pos); Span entry = NibbleMapFragment.Data.AsSpan((int)(index * sizeof(uint)), sizeof(uint)); uint oldValue = TestPlaceholderTarget.ReadFromSpan(entry, Arch.IsLittleEndian); @@ -143,7 +143,7 @@ public override void AllocateCodeChunk(TargetCodePointer codeStart, uint codeSiz uint index = (uint) (pos >>> Log2NibblesPerDword); uint mask = ~(HighestNibbleMask >>> (int)((pos & NibblesPerDwordMask) << Log2NibbleSize)); - value = value << Pos2ShiftCount(pos); + value <<= Pos2ShiftCount(pos); Span entry = NibbleMapFragment.Data.AsSpan((int)(index * sizeof(uint)), sizeof(uint)); uint oldValue = TestPlaceholderTarget.ReadFromSpan(entry, Arch.IsLittleEndian); @@ -159,11 +159,11 @@ public override void AllocateCodeChunk(TargetCodePointer codeStart, uint codeSiz ulong firstByteAfterMethod = delta + (uint)codeSize; uint encodedPointer = NibbleMapConstantLookup.EncodePointer((uint)delta); index++; - while((index + 1) * 256 <= firstByteAfterMethod) + while ((index + 1) * 256 <= firstByteAfterMethod) { entry = NibbleMapFragment.Data.AsSpan((int)(index * sizeof(uint)), sizeof(uint)); oldValue = TestPlaceholderTarget.ReadFromSpan(entry, Arch.IsLittleEndian); - if(oldValue != 0) + if (oldValue != 0) { throw new InvalidOperationException("Overwriting existing offset"); } diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.csproj b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.csproj index 6af3d13d2dfbb9..e57a3917c46d10 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.csproj +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks.csproj @@ -1,11 +1,10 @@ - $(NetCoreAppToolCurrent) + $(NetMinimum) Microsoft.Diagnostics.Internal.RuntimeMemoryMocks annotations true - true false true diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.CodeVersions.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.CodeVersions.cs index d83979ce9d067e..22fed8aeb83870 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.CodeVersions.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.CodeVersions.cs @@ -117,7 +117,6 @@ public TargetPointer AddMethodDescVersioningState(TargetPointer nativeCodeVersio public TargetPointer AddNativeCodeVersionNode() { - Target.TypeInfo info = Types[DataType.NativeCodeVersionNode]; MockMemorySpace.HeapFragment fragment = _codeVersionsAllocator.Allocate((ulong)Types[DataType.NativeCodeVersionNode].Size, "NativeCodeVersionNode"); Builder.AddHeapFragment(fragment); return fragment.Address; @@ -180,7 +179,7 @@ public TargetPointer AddILCodeVersionNode(TargetPointer prevNodeAddress, TargetN Builder.TargetTestHelpers.WritePointer(fragment.Data.AsSpan().Slice(info.Fields[nameof(Data.ILCodeVersionNode.Next)].Offset), TargetPointer.Null); // set the previous node next pointer to the new node - if(prevNodeAddress != TargetPointer.Null) + if (prevNodeAddress != TargetPointer.Null) { Span prevNode = Builder.BorrowAddressRange(prevNodeAddress, fragment.Data.Length); Builder.TargetTestHelpers.WritePointer(prevNode.Slice(info.Fields[nameof(Data.ILCodeVersionNode.Next)].Offset), fragment.Address); diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ExecutionManager.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ExecutionManager.cs index d3a0c0d3d78f4f..ba19877dbdfc32 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ExecutionManager.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ExecutionManager.cs @@ -21,7 +21,7 @@ public class ExecutionManager { public const ulong ExecutionManagerCodeRangeMapAddress = 0x000a_fff0; - const int RealCodeHeaderSize = 0x30; // must be big enough for the offsets of RealCodeHeader size in ExecutionManagerTestTarget, below + private const int RealCodeHeaderSize = 0x30; // must be big enough for the offsets of RealCodeHeader size in ExecutionManagerTestTarget, below public struct AllocationRange { @@ -48,9 +48,9 @@ public struct AllocationRange }; public class RangeSectionMapTestBuilder { - const ulong DefaultTopLevelAddress = 0x0000_1000u; // arbitrary - const int EntriesPerMapLevel = 256; // for now its fixed at 256, see codeman.h RangeSectionMap::entriesPerMapLevel - const int BitsPerLevel = 8; + private const ulong DefaultTopLevelAddress = 0x0000_1000u; // arbitrary + private const int EntriesPerMapLevel = 256; // for now its fixed at 256, see codeman.h RangeSectionMap::entriesPerMapLevel + private const int BitsPerLevel = 8; private readonly TargetPointer _topLevelAddress; private readonly MockMemorySpace.Builder _builder; @@ -148,7 +148,7 @@ private RangeSectionMap.Cursor GetOrAddLevelSlot(TargetCodePointer address, Rang // ensures that the maps for all the levels for the given address are allocated. // returns the address of the slot in the last level that corresponds to the given address - RangeSectionMap.Cursor EnsureLevelsForAddress(TargetCodePointer address, bool collectible = false) + private RangeSectionMap.Cursor EnsureLevelsForAddress(TargetCodePointer address, bool collectible = false) { int topIndex = EffectiveBitsForLevel(address, _levels); RangeSectionMap.Cursor cursor = new RangeSectionMap.Cursor(TopLevel, _levels, topIndex); diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.HashMap.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.HashMap.cs index ff5dc78629730b..c76dab9c740e37 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.HashMap.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.HashMap.cs @@ -23,7 +23,7 @@ public class HashMap DataType = DataType.HashMap, Fields = [ - new (nameof(Data.HashMap.Buckets), DataType.pointer), + new(nameof(Data.HashMap.Buckets), DataType.pointer), ] }; diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ReJIT.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ReJIT.cs index 978e97d7c4a78a..fd4f793f6ef378 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ReJIT.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.ReJIT.cs @@ -82,10 +82,12 @@ public ILCodeVersionHandle AddExplicitILCodeVersion(TargetNUInt rejitId, RejitFl [ ProfControlBlockFields ]); - foreach(var (dataType, typeInfo) in cvTypes) + + foreach (var (dataType, typeInfo) in cvTypes) { types.Add(dataType, typeInfo); } + return types; } diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeFunctions.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeFunctions.cs index 7aeef7046790b4..e10a52bbc3c111 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeFunctions.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeFunctions.cs @@ -98,7 +98,7 @@ public TargetPointer AddRuntimeFunctions(uint[] runtimeFunctions) } else { - // First 18 bits of the header are function length / (pointer size / 2) + // First 18 bits of the header are function length / (pointer size / 2) uint headerBits = (uint)(functionLength / (helpers.PointerSize / 2)); if (headerBits > 1 << 18 - 1) throw new InvalidOperationException("Function length is too long "); diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs index 6e5853c85e1692..0f8486e7d9d116 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockDescriptors/MockDescriptors.RuntimeTypeSystem.cs @@ -236,7 +236,7 @@ internal TargetPointer AddFunctionPointerTypeDesc(uint callConv, TargetPointer[] helpers.Write(dest.Slice(typeInfo.Fields[nameof(Data.FnPtrTypeDesc.NumArgs)].Offset), retAndArgTypes.Length - 1); helpers.Write(dest.Slice(typeInfo.Fields[nameof(Data.FnPtrTypeDesc.CallConv)].Offset), callConv); helpers.WritePointer(dest.Slice(typeInfo.Fields[nameof(Data.FnPtrTypeDesc.LoaderModule)].Offset), loaderModule); - for (int i = 0; i < retAndArgTypes.Length; i ++) + for (int i = 0; i < retAndArgTypes.Length; i++) { Span span = fragment.Data.AsSpan().Slice(typeInfo.Fields[nameof(Data.FnPtrTypeDesc.RetAndArgTypes)].Offset + i * helpers.PointerSize, helpers.PointerSize); helpers.WritePointer(span, retAndArgTypes[i]); diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.BumpAllocator.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.BumpAllocator.cs index fdfafb0109ad2e..0ab264bb5fee7d 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.BumpAllocator.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.BumpAllocator.cs @@ -19,13 +19,13 @@ namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; /// Use MockMemorySpace.CreateContext to create a mostly empty context for reading from the target. /// Use MockMemorySpace.ContextBuilder to create a context with additional MockMemorySpace.HeapFragment data. /// -public unsafe static partial class MockMemorySpace +public static unsafe partial class MockMemorySpace { public class BumpAllocator { private readonly ulong _blockStart; private readonly ulong _blockEnd; // exclusive - ulong _current; + private ulong _current; public int MinAlign { get; init; } = 16; // by default align to 16 bytes public BumpAllocator(ulong blockStart, ulong blockEnd) diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.cs index 98e5625a621d53..4134fa19e5a58d 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/MockMemorySpace.cs @@ -18,7 +18,7 @@ namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks; /// /// Use MockMemorySpace.Builder to create a context with MockMemorySpace.HeapFragment data. /// -public unsafe static partial class MockMemorySpace +public static unsafe partial class MockMemorySpace { public struct HeapFragment { diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TargetTestHelpers.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TargetTestHelpers.cs index 5d4c2bc3325f76..f206142f62b582 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TargetTestHelpers.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TargetTestHelpers.cs @@ -34,7 +34,7 @@ public TargetTestHelpers(MockTarget.Architecture arch) internal uint StringBaseSize => ObjectBaseSize + sizeof(uint) /* length */ + sizeof(char) /* nul terminator */; - internal void Write(Span dest, byte b) => dest[0] = b; + internal static void Write(Span dest, byte b) => dest[0] = b; internal void Write(Span dest, ushort u) { if (Arch.IsLittleEndian) @@ -199,7 +199,8 @@ public LayoutResult LayoutFields(FieldLayout style, Field[] fields) private LayoutResult LayoutFieldsWorker(FieldLayout style, Field[] fields, ref int offset, ref int maxAlign) { - Dictionary fieldInfos = new (); + Dictionary fieldInfos = new(); + for (int i = 0; i < fields.Length; i++) { var (name, type, sizeMaybe) = fields[i]; diff --git a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TestPlaceholderTarget.cs b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TestPlaceholderTarget.cs index 6f604777e29fe5..210221b8d9dcad 100644 --- a/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TestPlaceholderTarget.cs +++ b/src/native/managed/cdac/tests/Microsoft.Diagnostics.Internal.RuntimeMemoryMocks/TestPlaceholderTarget.cs @@ -281,7 +281,7 @@ protected unsafe bool DefaultTryRead(ulong address, out T value) where T : un return true; } - internal unsafe static T ReadFromSpan(ReadOnlySpan bytes, bool isLittleEndian) where T : unmanaged, IBinaryInteger, IMinMaxValue + internal static unsafe T ReadFromSpan(ReadOnlySpan bytes, bool isLittleEndian) where T : unmanaged, IBinaryInteger, IMinMaxValue { if (sizeof(T) != bytes.Length) throw new ArgumentException(nameof(bytes)); @@ -298,7 +298,7 @@ internal unsafe static T ReadFromSpan(ReadOnlySpan bytes, bool isLittle return value; } - internal unsafe static void WriteToSpan(T value, bool isLittleEndian, Span dest) where T : unmanaged, IBinaryInteger, IMinMaxValue + internal static unsafe void WriteToSpan(T value, bool isLittleEndian, Span dest) where T : unmanaged, IBinaryInteger, IMinMaxValue { if (sizeof(T) != dest.Length) throw new ArgumentException(nameof(dest));