move contracts and data to a Contracts assembly

dotnet · Sep 12, 2024 · 9aec4dd · 9aec4dd
1 parent 69f134a
commit 9aec4dd
Show file tree

Hide file tree

Showing 67 changed files with 26 additions and 3 deletions.
diff --git a/...aContractReader.Abstractions/Microsoft.Diagnostics.DataContractReader.Abstractions.csproj b/...aContractReader.Abstractions/Microsoft.Diagnostics.DataContractReader.Abstractions.csproj
@@ -11,11 +11,9 @@
     <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
   </PropertyGroup>
 
-  <ItemGroup Condition="false">
-    <Compile Include="$(LibrariesProjectRoot)Common\src\System\HResults.cs" Link="Common\System\HResults.cs" />
-  </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.Diagnostics.DataContractReader.Tests" />
+    <InternalsVisibleTo Include="Microsoft.Diagnostics.DataContractReader.Contracts" />
     <InternalsVisibleTo Include="Microsoft.Diagnostics.DataContractReader" />
     <InternalsVisibleTo Include="cdacreader" Condition="'$(TargetsWindows)' == 'true'"/>
     <InternalsVisibleTo Include="libcdacreader" Condition="'$(TargetsWindows)' != 'true'"/>

diff --git a/...agnostics.DataContractReader/Constants.cs → ...DataContractReader.Contracts/Constants.cs b/...agnostics.DataContractReader/Constants.cs → ...DataContractReader.Contracts/Constants.cs
diff --git a/...aContractReader/Contracts/CodeVersions.cs → ...eader.Contracts/Contracts/CodeVersions.cs b/...aContractReader/Contracts/CodeVersions.cs → ...eader.Contracts/Contracts/CodeVersions.cs
diff --git a/...ontractReader/Contracts/CodeVersions_1.cs → ...der.Contracts/Contracts/CodeVersions_1.cs b/...ontractReader/Contracts/CodeVersions_1.cs → ...der.Contracts/Contracts/CodeVersions_1.cs
diff --git a/...ataContractReader/Contracts/DacStreams.cs → ...tReader.Contracts/Contracts/DacStreams.cs b/...ataContractReader/Contracts/DacStreams.cs → ...tReader.Contracts/Contracts/DacStreams.cs
diff --git a/...aContractReader/Contracts/DacStreams_1.cs → ...eader.Contracts/Contracts/DacStreams_1.cs b/...aContractReader/Contracts/DacStreams_1.cs → ...eader.Contracts/Contracts/DacStreams_1.cs
diff --git a/...aContractReader/Contracts/EcmaMetadata.cs → ...eader.Contracts/Contracts/EcmaMetadata.cs b/...aContractReader/Contracts/EcmaMetadata.cs → ...eader.Contracts/Contracts/EcmaMetadata.cs
diff --git a/...ontractReader/Contracts/EcmaMetadata_1.cs → ...der.Contracts/Contracts/EcmaMetadata_1.cs b/...ontractReader/Contracts/EcmaMetadata_1.cs → ...der.Contracts/Contracts/EcmaMetadata_1.cs
diff --git a/...DataContractReader/Contracts/Exception.cs → ...ctReader.Contracts/Contracts/Exception.cs b/...DataContractReader/Contracts/Exception.cs → ...ctReader.Contracts/Contracts/Exception.cs
diff --git a/...taContractReader/Contracts/Exception_1.cs → ...Reader.Contracts/Contracts/Exception_1.cs b/...taContractReader/Contracts/Exception_1.cs → ...Reader.Contracts/Contracts/Exception_1.cs
diff --git a/...tractReader/Contracts/ExecutionManager.cs → ...r.Contracts/Contracts/ExecutionManager.cs b/...tractReader/Contracts/ExecutionManager.cs → ...r.Contracts/Contracts/ExecutionManager.cs
diff --git a/...tracts/ExecutionManager_1.EEJitManager.cs → ...tracts/ExecutionManager_1.EEJitManager.cs b/...tracts/ExecutionManager_1.EEJitManager.cs → ...tracts/ExecutionManager_1.EEJitManager.cs
diff --git a/...Contracts/ExecutionManager_1.NibbleMap.cs → ...Contracts/ExecutionManager_1.NibbleMap.cs b/...Contracts/ExecutionManager_1.NibbleMap.cs → ...Contracts/ExecutionManager_1.NibbleMap.cs
diff --git a/...actReader/Contracts/ExecutionManager_1.cs → ...Contracts/Contracts/ExecutionManager_1.cs b/...actReader/Contracts/ExecutionManager_1.cs → ...Contracts/Contracts/ExecutionManager_1.cs
diff --git a/...cs.DataContractReader/Contracts/Loader.cs → ...tractReader.Contracts/Contracts/Loader.cs b/...cs.DataContractReader/Contracts/Loader.cs → ...tractReader.Contracts/Contracts/Loader.cs
diff --git a/....DataContractReader/Contracts/Loader_1.cs → ...actReader.Contracts/Contracts/Loader_1.cs b/....DataContractReader/Contracts/Loader_1.cs → ...actReader.Contracts/Contracts/Loader_1.cs
diff --git a/...cs.DataContractReader/Contracts/Object.cs → ...tractReader.Contracts/Contracts/Object.cs b/...cs.DataContractReader/Contracts/Object.cs → ...tractReader.Contracts/Contracts/Object.cs
diff --git a/....DataContractReader/Contracts/Object_1.cs → ...actReader.Contracts/Contracts/Object_1.cs b/....DataContractReader/Contracts/Object_1.cs → ...actReader.Contracts/Contracts/Object_1.cs
diff --git a/...aContractReader/Contracts/PrecodeStubs.cs → ...eader.Contracts/Contracts/PrecodeStubs.cs b/...aContractReader/Contracts/PrecodeStubs.cs → ...eader.Contracts/Contracts/PrecodeStubs.cs
diff --git a/...ontractReader/Contracts/PrecodeStubs_1.cs → ...der.Contracts/Contracts/PrecodeStubs_1.cs b/...ontractReader/Contracts/PrecodeStubs_1.cs → ...der.Contracts/Contracts/PrecodeStubs_1.cs
diff --git a/...ics.DataContractReader/Contracts/ReJIT.cs → ...ntractReader.Contracts/Contracts/ReJIT.cs b/...ics.DataContractReader/Contracts/ReJIT.cs → ...ntractReader.Contracts/Contracts/ReJIT.cs
diff --git a/...s.DataContractReader/Contracts/ReJIT_1.cs → ...ractReader.Contracts/Contracts/ReJIT_1.cs b/...s.DataContractReader/Contracts/ReJIT_1.cs → ...ractReader.Contracts/Contracts/ReJIT_1.cs
diff --git a/...ractReader/Contracts/RuntimeTypeSystem.cs → ....Contracts/Contracts/RuntimeTypeSystem.cs b/...ractReader/Contracts/RuntimeTypeSystem.cs → ....Contracts/Contracts/RuntimeTypeSystem.cs
diff --git a/...s/RuntimeTypeSystem_1.MethodTableFlags.cs → ...s/RuntimeTypeSystem_1.MethodTableFlags.cs b/...s/RuntimeTypeSystem_1.MethodTableFlags.cs → ...s/RuntimeTypeSystem_1.MethodTableFlags.cs
diff --git a/...racts/RuntimeTypeSystem_1.NonValidated.cs → ...racts/RuntimeTypeSystem_1.NonValidated.cs b/...racts/RuntimeTypeSystem_1.NonValidated.cs → ...racts/RuntimeTypeSystem_1.NonValidated.cs
diff --git a/...ctReader/Contracts/RuntimeTypeSystem_1.cs → ...ontracts/Contracts/RuntimeTypeSystem_1.cs b/...ctReader/Contracts/RuntimeTypeSystem_1.cs → ...ontracts/Contracts/RuntimeTypeSystem_1.cs
diff --git a/.../Contracts/RuntimeTypeSystem_1_Helpers.cs → .../Contracts/RuntimeTypeSystem_1_Helpers.cs b/.../Contracts/RuntimeTypeSystem_1_Helpers.cs → .../Contracts/RuntimeTypeSystem_1_Helpers.cs
diff --git a/...cs.DataContractReader/Contracts/Thread.cs → ...tractReader.Contracts/Contracts/Thread.cs b/...cs.DataContractReader/Contracts/Thread.cs → ...tractReader.Contracts/Contracts/Thread.cs
diff --git a/...gnostics.DataContractReader/Data/Array.cs → ...ataContractReader.Contracts/Data/Array.cs b/...gnostics.DataContractReader/Data/Array.cs → ...ataContractReader.Contracts/Data/Array.cs
diff --git a/...ataContractReader/Data/DynamicMetadata.cs → ...tReader.Contracts/Data/DynamicMetadata.cs b/...ataContractReader/Data/DynamicMetadata.cs → ...tReader.Contracts/Data/DynamicMetadata.cs
diff --git a/...ostics.DataContractReader/Data/EEClass.cs → ...aContractReader.Contracts/Data/EEClass.cs b/...ostics.DataContractReader/Data/EEClass.cs → ...aContractReader.Contracts/Data/EEClass.cs
diff --git a/...tics.DataContractReader/Data/Exception.cs → ...ontractReader.Contracts/Data/Exception.cs b/...tics.DataContractReader/Data/Exception.cs → ...ontractReader.Contracts/Data/Exception.cs
diff --git a/....DataContractReader/Data/ExceptionInfo.cs → ...actReader.Contracts/Data/ExceptionInfo.cs b/....DataContractReader/Data/ExceptionInfo.cs → ...actReader.Contracts/Data/ExceptionInfo.cs
diff --git a/...taContractReader/Data/FixupPrecodeData.cs → ...Reader.Contracts/Data/FixupPrecodeData.cs b/...taContractReader/Data/FixupPrecodeData.cs → ...Reader.Contracts/Data/FixupPrecodeData.cs
diff --git a/...DataContractReader/Data/GCAllocContext.cs → ...ctReader.Contracts/Data/GCAllocContext.cs b/...DataContractReader/Data/GCAllocContext.cs → ...ctReader.Contracts/Data/GCAllocContext.cs
diff --git a/...taContractReader/Data/GenericsDictInfo.cs → ...Reader.Contracts/Data/GenericsDictInfo.cs b/...taContractReader/Data/GenericsDictInfo.cs → ...Reader.Contracts/Data/GenericsDictInfo.cs
diff --git a/...stics.DataContractReader/Data/HeapList.cs → ...ContractReader.Contracts/Data/HeapList.cs b/...stics.DataContractReader/Data/HeapList.cs → ...ContractReader.Contracts/Data/HeapList.cs
diff --git a/...tractReader/Data/ILCodeVersioningState.cs → ...r.Contracts/Data/ILCodeVersioningState.cs b/...tractReader/Data/ILCodeVersioningState.cs → ...r.Contracts/Data/ILCodeVersioningState.cs
diff --git a/...ntractReader/Data/InteropSyncBlockInfo.cs → ...er.Contracts/Data/InteropSyncBlockInfo.cs b/...ntractReader/Data/InteropSyncBlockInfo.cs → ...er.Contracts/Data/InteropSyncBlockInfo.cs
diff --git a/...ataContractReader/Data/LoaderAllocator.cs → ...tReader.Contracts/Data/LoaderAllocator.cs b/...ataContractReader/Data/LoaderAllocator.cs → ...tReader.Contracts/Data/LoaderAllocator.cs
diff --git a/...ics.DataContractReader/Data/MethodDesc.cs → ...ntractReader.Contracts/Data/MethodDesc.cs b/...ics.DataContractReader/Data/MethodDesc.cs → ...ntractReader.Contracts/Data/MethodDesc.cs
diff --git a/...ataContractReader/Data/MethodDescChunk.cs → ...tReader.Contracts/Data/MethodDescChunk.cs b/...ataContractReader/Data/MethodDescChunk.cs → ...tReader.Contracts/Data/MethodDescChunk.cs
diff --git a/...ContractReader/Data/MethodDescCodeData.cs → ...ader.Contracts/Data/MethodDescCodeData.cs b/...ContractReader/Data/MethodDescCodeData.cs → ...ader.Contracts/Data/MethodDescCodeData.cs
diff --git a/...tReader/Data/MethodDescVersioningState.cs → ...ntracts/Data/MethodDescVersioningState.cs b/...tReader/Data/MethodDescVersioningState.cs → ...ntracts/Data/MethodDescVersioningState.cs
diff --git a/...cs.DataContractReader/Data/MethodTable.cs → ...tractReader.Contracts/Data/MethodTable.cs b/...cs.DataContractReader/Data/MethodTable.cs → ...tractReader.Contracts/Data/MethodTable.cs
diff --git a/...ctReader/Data/MethodTableAuxiliaryData.cs → ...ontracts/Data/MethodTableAuxiliaryData.cs b/...ctReader/Data/MethodTableAuxiliaryData.cs → ...ontracts/Data/MethodTableAuxiliaryData.cs
diff --git a/...nostics.DataContractReader/Data/Module.cs → ...taContractReader.Contracts/Data/Module.cs b/...nostics.DataContractReader/Data/Module.cs → ...taContractReader.Contracts/Data/Module.cs
diff --git a/...ataContractReader/Data/ModuleLookupMap.cs → ...tReader.Contracts/Data/ModuleLookupMap.cs b/...ataContractReader/Data/ModuleLookupMap.cs → ...tReader.Contracts/Data/ModuleLookupMap.cs
diff --git a/...tractReader/Data/NativeCodeVersionNode.cs → ...r.Contracts/Data/NativeCodeVersionNode.cs b/...tractReader/Data/NativeCodeVersionNode.cs → ...r.Contracts/Data/NativeCodeVersionNode.cs
diff --git a/...s.DataContractReader/Data/ObjectHandle.cs → ...ractReader.Contracts/Data/ObjectHandle.cs b/...s.DataContractReader/Data/ObjectHandle.cs → ...ractReader.Contracts/Data/ObjectHandle.cs
diff --git a/...ctReader/Data/PrecodeMachineDescriptor.cs → ...ontracts/Data/PrecodeMachineDescriptor.cs b/...ctReader/Data/PrecodeMachineDescriptor.cs → ...ontracts/Data/PrecodeMachineDescriptor.cs
diff --git a/...taContractReader/Data/ProfControlBlock.cs → ...Reader.Contracts/Data/ProfControlBlock.cs b/...taContractReader/Data/ProfControlBlock.cs → ...Reader.Contracts/Data/ProfControlBlock.cs
diff --git a/...s.DataContractReader/Data/RangeSection.cs → ...ractReader.Contracts/Data/RangeSection.cs b/...s.DataContractReader/Data/RangeSection.cs → ...ractReader.Contracts/Data/RangeSection.cs
diff --git a/...ntractReader/Data/RangeSectionFragment.cs → ...er.Contracts/Data/RangeSectionFragment.cs b/...ntractReader/Data/RangeSectionFragment.cs → ...er.Contracts/Data/RangeSectionFragment.cs
diff --git a/...ataContractReader/Data/RangeSectionMap.cs → ...tReader.Contracts/Data/RangeSectionMap.cs b/...ataContractReader/Data/RangeSectionMap.cs → ...tReader.Contracts/Data/RangeSectionMap.cs
diff --git a/...DataContractReader/Data/RealCodeHeader.cs → ...ctReader.Contracts/Data/RealCodeHeader.cs b/...DataContractReader/Data/RealCodeHeader.cs → ...ctReader.Contracts/Data/RealCodeHeader.cs
diff --git a/...ontractReader/Data/RuntimeThreadLocals.cs → ...der.Contracts/Data/RuntimeThreadLocals.cs b/...ontractReader/Data/RuntimeThreadLocals.cs → ...der.Contracts/Data/RuntimeThreadLocals.cs
diff --git a/...nostics.DataContractReader/Data/String.cs → ...taContractReader.Contracts/Data/String.cs b/...nostics.DataContractReader/Data/String.cs → ...taContractReader.Contracts/Data/String.cs
diff --git a/...ataContractReader/Data/StubPrecodeData.cs → ...tReader.Contracts/Data/StubPrecodeData.cs b/...ataContractReader/Data/StubPrecodeData.cs → ...tReader.Contracts/Data/StubPrecodeData.cs
diff --git a/...tics.DataContractReader/Data/SyncBlock.cs → ...ontractReader.Contracts/Data/SyncBlock.cs b/...tics.DataContractReader/Data/SyncBlock.cs → ...ontractReader.Contracts/Data/SyncBlock.cs
diff --git a/...DataContractReader/Data/SyncTableEntry.cs → ...ctReader.Contracts/Data/SyncTableEntry.cs b/...DataContractReader/Data/SyncTableEntry.cs → ...ctReader.Contracts/Data/SyncTableEntry.cs
diff --git a/...nostics.DataContractReader/Data/Thread.cs → ...taContractReader.Contracts/Data/Thread.cs b/...nostics.DataContractReader/Data/Thread.cs → ...taContractReader.Contracts/Data/Thread.cs
diff --git a/...cs.DataContractReader/Data/ThreadStore.cs → ...tractReader.Contracts/Data/ThreadStore.cs b/...cs.DataContractReader/Data/ThreadStore.cs → ...tractReader.Contracts/Data/ThreadStore.cs
diff --git a/...stics.DataContractReader/Data/TypeDesc.cs → ...ContractReader.Contracts/Data/TypeDesc.cs b/...stics.DataContractReader/Data/TypeDesc.cs → ...ContractReader.Contracts/Data/TypeDesc.cs
diff --git a/...DataContractReader/Legacy/ICorProfiler.cs → ...ctReader.Contracts/Legacy/ICorProfiler.cs b/...DataContractReader/Legacy/ICorProfiler.cs → ...ctReader.Contracts/Legacy/ICorProfiler.cs
diff --git a/...cs.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj b/...cs.DataContractReader.Contracts/Microsoft.Diagnostics.DataContractReader.Contracts.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
+    <RootNamespace>Microsoft.Diagnostics.DataContractReader</RootNamespace>
+    <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <!-- Do not produce a public package. This ships as part of the runtime -->
+    <IsShippingPackage>false</IsShippingPackage>
+    <InvariantGlobalization>true</InvariantGlobalization>
+    <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.Diagnostics.DataContractReader.Tests" />
+    <InternalsVisibleTo Include="Microsoft.Diagnostics.DataContractReader" />
+    <InternalsVisibleTo Include="cdacreader" Condition="'$(TargetsWindows)' == 'true'"/>
+    <InternalsVisibleTo Include="libcdacreader" Condition="'$(TargetsWindows)' != 'true'"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Diagnostics.DataContractReader.Abstractions\Microsoft.Diagnostics.DataContractReader.Abstractions.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/.../Microsoft.Diagnostics.DataContractReader/Microsoft.Diagnostics.DataContractReader.csproj b/.../Microsoft.Diagnostics.DataContractReader/Microsoft.Diagnostics.DataContractReader.csproj
@@ -22,5 +22,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Diagnostics.DataContractReader.Abstractions\Microsoft.Diagnostics.DataContractReader.Abstractions.csproj" />
+    <ProjectReference Include="..\Microsoft.Diagnostics.DataContractReader.Contracts\Microsoft.Diagnostics.DataContractReader.Contracts.csproj" />
   </ItemGroup>
 </Project>