Mark assembly as not-a-test-proj and deal with copilation issues

hoyosjs · hoyosjs · commit 0a06f9b27f22 · 2026-03-20T15:16:01.000-07:00
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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
+    <TargetFramework>$(NetMinimum)</TargetFramework>
     <RootNamespace>Microsoft.Diagnostics.DataContractReader</RootNamespace>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
+    <TargetFramework>$(NetMinimum)</TargetFramework>
     <RootNamespace>Microsoft.Diagnostics.DataContractReader</RootNamespace>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
+    <TargetFramework>$(NetMinimum)</TargetFramework>
     <RootNamespace>Microsoft.Diagnostics.DataContractReader.Legacy</RootNamespace>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
+    <TargetFramework>$(NetMinimum)</TargetFramework>
     <RootNamespace>Microsoft.Diagnostics.DataContractReader</RootNamespace>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
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
@@ -25,8 +25,8 @@
   </ItemGroup>
 
   <ItemGroup>
-      <Compile Include="$(LibrariesProjectRoot)Common\src\System\HResults.cs" Link="Common\System\HResults.cs" />
-      <Compile Include="..\TestHelpers.cs" Link="TestHelpers.cs" />
+    <Compile Include="$(LibrariesProjectRoot)Common\src\System\HResults.cs" Link="Common\System\HResults.cs" />
+    <Compile Include="..\Microsoft.Diagnostics.DataContractReader.Tests\TestHelpers.cs" Link="TestHelpers.cs" />
   </ItemGroup>
 
   <ItemGroup>
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
@@ -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<byte> entry = NibbleMapFragment.Data.AsSpan((int)(index * sizeof(uint)), sizeof(uint));
         uint oldValue = TestPlaceholderTarget.ReadFromSpan<uint>(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<byte> entry = NibbleMapFragment.Data.AsSpan((int)(index * sizeof(uint)), sizeof(uint));
         uint oldValue = TestPlaceholderTarget.ReadFromSpan<uint>(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<uint>(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
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
+    <TargetFramework>$(NetMinimum)</TargetFramework>
     <RootNamespace>Microsoft.Diagnostics.Internal.RuntimeMemoryMocks</RootNamespace>
     <Nullable>annotations</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <IsTestProject>true</IsTestProject>
     <!-- Do not produce a public package. This ships as part of the runtime -->
     <IsShipping>false</IsShipping>
     <IsPackable>true</IsPackable>
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
@@ -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<byte> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<byte> 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
@@ -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.
 /// </remarks>
-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
@@ -18,7 +18,7 @@ namespace Microsoft.Diagnostics.Internal.RuntimeMemoryMocks;
 /// <remarks>
 /// Use MockMemorySpace.Builder to create a context with MockMemorySpace.HeapFragment data.
 /// </remarks>
-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
@@ -34,7 +34,7 @@ public TargetTestHelpers(MockTarget.Architecture arch)
 
     internal uint StringBaseSize => ObjectBaseSize + sizeof(uint) /* length */ + sizeof(char) /* nul terminator */;
 
-    internal void Write(Span<byte> dest, byte b) => dest[0] = b;
+    internal static void Write(Span<byte> dest, byte b) => dest[0] = b;
     internal void Write(Span<byte> 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<string,Target.FieldInfo> fieldInfos = new ();
+        Dictionary<string, Target.FieldInfo> 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
@@ -281,7 +281,7 @@ protected unsafe bool DefaultTryRead<T>(ulong address, out T value) where T : un
         return true;
     }
 
-    internal unsafe static T ReadFromSpan<T>(ReadOnlySpan<byte> bytes, bool isLittleEndian) where T : unmanaged, IBinaryInteger<T>, IMinMaxValue<T>
+    internal static unsafe T ReadFromSpan<T>(ReadOnlySpan<byte> bytes, bool isLittleEndian) where T : unmanaged, IBinaryInteger<T>, IMinMaxValue<T>
     {
         if (sizeof(T) != bytes.Length)
             throw new ArgumentException(nameof(bytes));
@@ -298,7 +298,7 @@ internal unsafe static T ReadFromSpan<T>(ReadOnlySpan<byte> bytes, bool isLittle
         return value;
     }
 
-    internal unsafe static void WriteToSpan<T>(T value, bool isLittleEndian, Span<byte> dest) where T : unmanaged, IBinaryInteger<T>, IMinMaxValue<T>
+    internal static unsafe void WriteToSpan<T>(T value, bool isLittleEndian, Span<byte> dest) where T : unmanaged, IBinaryInteger<T>, IMinMaxValue<T>
     {
         if (sizeof(T) != dest.Length)
             throw new ArgumentException(nameof(dest));

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,6 @@ public TargetPointer AddMethodDescVersioningState(TargetPointer nativeCodeVersio`
`117`	`117`
`118`	`118`	`public TargetPointer AddNativeCodeVersionNode()`
`119`	`119`	`{`
`120`		`- Target.TypeInfo info = Types[DataType.NativeCodeVersionNode];`
`121`	`120`	`MockMemorySpace.HeapFragment fragment = _codeVersionsAllocator.Allocate((ulong)Types[DataType.NativeCodeVersionNode].Size, "NativeCodeVersionNode");`
`122`	`121`	`Builder.AddHeapFragment(fragment);`
`123`	`122`	`return fragment.Address;`
`@@ -180,7 +179,7 @@ public TargetPointer AddILCodeVersionNode(TargetPointer prevNodeAddress, TargetN`
`180`	`179`	`Builder.TargetTestHelpers.WritePointer(fragment.Data.AsSpan().Slice(info.Fields[nameof(Data.ILCodeVersionNode.Next)].Offset), TargetPointer.Null);`
`181`	`180`
`182`	`181`	`// set the previous node next pointer to the new node`
`183`		`- if(prevNodeAddress != TargetPointer.Null)`
	`182`	`+ if (prevNodeAddress != TargetPointer.Null)`
`184`	`183`	`{`
`185`	`184`	`Span<byte> prevNode = Builder.BorrowAddressRange(prevNodeAddress, fragment.Data.Length);`
`186`	`185`	`Builder.TargetTestHelpers.WritePointer(prevNode.Slice(info.Fields[nameof(Data.ILCodeVersionNode.Next)].Offset), fragment.Address);`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class HashMap`
`23`	`23`	`DataType = DataType.HashMap,`
`24`	`24`	`Fields =`
`25`	`25`	`[`
`26`		`- new (nameof(Data.HashMap.Buckets), DataType.pointer),`
	`26`	`+ new(nameof(Data.HashMap.Buckets), DataType.pointer),`
`27`	`27`	`]`
`28`	`28`	`};`
`29`	`29`