dotnet · jkoritzinsky · Oct 24, 2022 · Oct 24, 2022 · Oct 24, 2022 · Oct 26, 2022
diff --git a/eng/Subsets.props b/eng/Subsets.props
@@ -182,6 +182,7 @@
     <SubsetName Include="Tools.ILLinkTests" OnDemand="true" Description="Unit tests for the tools.illink subset." />
 
     <SubsetName Include="Tools.CdacReaderTests" OnDemand="true" Description="Units tests for the cDAC reader." />
+    <SubsetName Include="Tools.NativeTests" OnDemand="true" Description="Native unit tests for native tools and libraries." />
 
     <!-- Host -->
     <SubsetName Include="Host" Description="The .NET hosts, packages, hosting libraries, and tests. Equivalent to: $(DefaultHostSubsets)" />
@@ -409,6 +410,11 @@
       Test="true" Category="tools"/>
   </ItemGroup>
 
+  <ItemGroup Condition="$(_subset.Contains('+tools.nativetests+'))">
+    <ProjectToBuild Include="$(RepoRoot)src\native\dnmd\dnmd.proj"
+      Test="true" Category="tools" Condition="'$(DotNetBuildSourceOnly)' != 'true'"/>
+  </ItemGroup>
+
   <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+'))">
     <ProjectToBuild Include="$(CoreClrProjectRoot)crossgen-corelib.proj" Category="clr" />
   </ItemGroup>

diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake
@@ -60,6 +60,7 @@ if (MSVC)
   define_property(TARGET PROPERTY CLR_EH_CONTINUATION INHERITED BRIEF_DOCS "Controls the /guard:ehcont flag presence" FULL_DOCS "Set this property to ON or OFF to indicate if the /guard:ehcont compiler flag should be present")
   define_property(TARGET PROPERTY CLR_EH_OPTION INHERITED BRIEF_DOCS "Defines the value of the /EH option" FULL_DOCS "Set this property to one of the valid /EHxx options (/EHa, /EHsc, /EHa-, ...)")
   define_property(TARGET PROPERTY MSVC_WARNING_LEVEL INHERITED BRIEF_DOCS "Define the warning level for the /Wn option" FULL_DOCS "Set this property to one of the valid /Wn options (/W0, /W1, /W2, /W3, /W4)")
+  define_property(TARGET PROPERTY SET_SOURCE_CHARSET INHERITED BRIEF_DOCS "Add the /source-charset option" FULL_DOCS "Set this property to add the /source-charset:utf8 option")
 
   set_property(GLOBAL PROPERTY CLR_CONTROL_FLOW_GUARD ON)
 
@@ -881,7 +882,8 @@ if (MSVC)
 
   add_compile_options($<$<COMPILE_LANGUAGE:C,CXX,ASM_MASM>:/Zi>) # enable debugging information
   add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/ZH:SHA_256>) # use SHA256 for generating hashes of compiler processed source files.
-  add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/source-charset:utf-8>) # Force MSVC to compile source as UTF-8.
+  set_property(GLOBAL PROPERTY SET_SOURCE_CHARSET ON)
+  add_compile_options($<$<AND:$<BOOL:$<TARGET_PROPERTY:SET_SOURCE_CHARSET>>,$<COMPILE_LANGUAGE:C,CXX>>:/source-charset:utf-8>) # Force MSVC to compile source as UTF-8.
 
   if (CLR_CMAKE_HOST_ARCH_I386)
     add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/Gz>)

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
@@ -692,9 +692,19 @@ extends:
           jobParameters:
             timeoutInMinutes: 120
             nameSuffix: CLR_Tools_Tests
-            buildArgs: -s clr.aot+clr.iltools+libs.sfx+clr.toolstests+tools.cdacreadertests -c $(_BuildConfig) -test
+            buildArgs: -s clr.aot+clr.iltools+libs.sfx+clr.toolstests+tools.cdacreadertests+tools.nativetests -c $(_BuildConfig) -test
             enablePublishTestResults: true
             testResultsFormat: 'xunit'
+            postBuildSteps:
+              - task: PublishTestResults@2
+                displayName: 'Publish CTest Results'
+                inputs:
+                  testResultsFormat: 'CTest'
+                  testResultsFiles: '*.ctestxml'
+                  searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
+                  testRunTitle: 'CLR_Tools_Tests-$(_BuildConfig)-ctest'
+                continueOnError: true
+                condition: always()
             # We want to run AOT tests when illink changes because there's share code and tests from illink which are used by AOT
             condition: >-
               or(

diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
@@ -125,10 +125,17 @@ add_subdirectory(pal/prebuilt/inc)
 set(EP_GENERATED_HEADER_PATH "${GENERATED_INCLUDE_DIR}")
 include (${CLR_SRC_NATIVE_DIR}/eventpipe/configure.cmake)
 
+#--------------------------------
+# Include shared native libraries
+#--------------------------------
 add_subdirectory(${CLR_SRC_NATIVE_DIR}/containers containers)
 add_subdirectory(${CLR_SRC_NATIVE_DIR}/eventpipe eventpipe)
 add_subdirectory(${CLR_SRC_NATIVE_DIR}/minipal shared_minipal)
 
+if (NOT CLR_CROSS_COMPONENTS_BUILD)
+  include(dnmd.cmake)
+endif()
+
 if(NOT CLR_CMAKE_HOST_MACCATALYST AND NOT CLR_CMAKE_HOST_IOS AND NOT CLR_CMAKE_HOST_TVOS)
   add_subdirectory(debug/debug-pal)
 endif()

diff --git a/src/coreclr/build-runtime.cmd b/src/coreclr/build-runtime.cmd
@@ -329,6 +329,9 @@ for /f "delims=" %%a in ("-%__RequestedBuildComponents%-") do (
     if not "!string:-crosscomponents-=!"=="!string!" (
         set __CMakeTarget=!__CMakeTarget! crosscomponents
     )
+    if not "!string:-cdac-=!"=="!string!" (
+        set __CMakeTarget=!__CMakeTarget! cdac
+    )
     if not "!string:-debug-=!"=="!string!" (
         set __CMakeTarget=!__CMakeTarget! debug
     )

diff --git a/src/coreclr/components.cmake b/src/coreclr/components.cmake
@@ -27,3 +27,6 @@ add_dependencies(runtime hosts)
 
 # The cross-components build is separate, so we don't need to add a dependency on coreclr_misc
 add_component(crosscomponents)
+
+# The cdac-components build is separate
+add_component(cdac)
diff --git a/src/coreclr/dnmd.cmake b/src/coreclr/dnmd.cmake
@@ -0,0 +1,18 @@
+# Include the dnmd project into the CoreCLR build
+include(FetchContent)
+FetchContent_Declare(
+  dnmd
+  SOURCE_DIR "${CLR_SRC_NATIVE_DIR}/dnmd"
+)
+
+set(DNMD_BUILD_TESTS OFF)
+set(DNMD_INSTALL OFF)
+FetchContent_MakeAvailable(dnmd)
+
+set_property(DIRECTORY ${CLR_SRC_NATIVE_DIR}/dnmd PROPERTY CLR_CONTROL_FLOW_GUARD ON)
+
+# Install dnmd for usage by the cdac.
+install_static_library(dnmd cdac cdac)
+install_static_library(dnmd_interfaces_static cdac cdac)
+install(TARGETS dnmd_interfaces DESTINATION cdac COMPONENT cdac)
+add_dependencies(cdac dnmd_interfaces)
diff --git a/src/coreclr/inc/corhdr.h b/src/coreclr/inc/corhdr.h
@@ -1752,7 +1752,11 @@ typedef enum NativeTypeArrayFlags
 //
 // Enum used for HFA type recognition.
 // Supported across architectures, so that it can be used in altjits and cross-compilation.
+#ifdef __cplusplus
 typedef enum CorInfoHFAElemType : unsigned {
+#else
+typedef enum CorInfoHFAElemType {
+#endif
     CORINFO_HFA_ELEM_NONE,
     CORINFO_HFA_ELEM_FLOAT,
     CORINFO_HFA_ELEM_DOUBLE,

diff --git a/src/coreclr/inc/sha1.h b/src/coreclr/inc/sha1.h
diff --git a/src/coreclr/md/runtime/CMakeLists.txt b/src/coreclr/md/runtime/CMakeLists.txt
@@ -46,15 +46,19 @@ endif (CLR_CMAKE_TARGET_WIN32)
 add_library_clr(mdruntime_dac ${MDRUNTIME_SOURCES})
 set_target_properties(mdruntime_dac PROPERTIES DAC_COMPONENT TRUE)
 target_precompile_headers(mdruntime_dac PRIVATE stdafx.h)
+target_link_libraries(mdruntime_dac PUBLIC minipal)
 
 add_library_clr(mdruntime_wks OBJECT ${MDRUNTIME_SOURCES})
 target_compile_definitions(mdruntime_wks PRIVATE FEATURE_METADATA_EMIT_ALL)
 target_precompile_headers(mdruntime_wks PRIVATE stdafx.h)
+target_link_libraries(mdruntime_wks PUBLIC minipal)
 
 add_library_clr(mdruntime-dbi ${MDRUNTIME_SOURCES})
 set_target_properties(mdruntime-dbi PROPERTIES DBI_COMPONENT TRUE)
 target_precompile_headers(mdruntime-dbi PRIVATE stdafx.h)
+target_link_libraries(mdruntime-dbi PUBLIC minipal)
 
 add_library_clr(mdruntime_ppdb ${MDRUNTIME_SOURCES})
 target_compile_definitions(mdruntime_ppdb PRIVATE FEATURE_METADATA_EMIT_ALL FEATURE_METADATA_EMIT_PORTABLE_PDB)
 target_precompile_headers(mdruntime_ppdb PRIVATE stdafx.h)
+target_link_libraries(mdruntime_ppdb PUBLIC minipal)
diff --git a/src/coreclr/md/runtime/strongnameinternal.cpp b/src/coreclr/md/runtime/strongnameinternal.cpp
@@ -6,7 +6,7 @@
 
 #include "stdafx.h"
 #include "strongnameinternal.h"
-#include "sha1.h"
+#include <minipal/sha1.h>
 
 // Common keys used by libraries we ship are included here.
 
@@ -317,9 +317,6 @@ HRESULT StrongNameTokenFromPublicKey(BYTE    *pbPublicKeyBlob,        // [in] pu
     return S_OK;
 #endif
     HRESULT         hr = S_OK;
-
-    SHA1Hash        sha1;
-    BYTE            *pHash = NULL;
     DWORD           i;
     PublicKeyBlob   *pPublicKey = NULL;
     DWORD dwHashLenMinusTokenSize = 0;
@@ -338,16 +335,17 @@ HRESULT StrongNameTokenFromPublicKey(BYTE    *pbPublicKeyBlob,        // [in] pu
     }
 
     // Compute a hash over the public key.
-    sha1.AddData(pbPublicKeyBlob, cbPublicKeyBlob);
-    pHash = sha1.GetHash();
+    BYTE hash[SHA1_HASH_SIZE];
+    minipal_sha1(pbPublicKeyBlob, cbPublicKeyBlob, hash, sizeof(hash));
+
     static_assert(SHA1_HASH_SIZE >= StrongNameToken::SIZEOF_TOKEN, "StrongNameToken::SIZEOF_TOKEN must be smaller or equal to the SHA1_HASH_SIZE");
     dwHashLenMinusTokenSize = SHA1_HASH_SIZE - StrongNameToken::SIZEOF_TOKEN;
 
     // Take the last few bytes of the hash value for our token. (These are the
     // low order bytes from a network byte order point of view). Reverse the
     // order of these bytes in the output buffer to get host byte order.
     for (i = 0; i < StrongNameToken::SIZEOF_TOKEN; i++)
-        pToken->m_token[StrongNameToken::SIZEOF_TOKEN - (i + 1)] = pHash[i + dwHashLenMinusTokenSize];
+        pToken->m_token[StrongNameToken::SIZEOF_TOKEN - (i + 1)] = hash[i + dwHashLenMinusTokenSize];
 
     return hr;
 }
diff --git a/src/coreclr/utilcode/CMakeLists.txt b/src/coreclr/utilcode/CMakeLists.txt
@@ -34,7 +34,6 @@ set(UTILCODE_COMMON_SOURCES
   corimage.cpp
   format1.cpp
   prettyprintsig.cpp
-  sha1.cpp
   sigbuilder.cpp
   sigparser.cpp
   sstring.cpp

diff --git a/src/coreclr/vm/assembly.cpp b/src/coreclr/vm/assembly.cpp
@@ -22,7 +22,7 @@
 #include "reflectclasswriter.h"
 #include "comdynamic.h"
 
-#include "sha1.h"
+#include <minipal/sha1.h>
 
 #include "eeconfig.h"
 

diff --git a/src/coreclr/vm/dwbucketmanager.hpp b/src/coreclr/vm/dwbucketmanager.hpp
@@ -86,7 +86,7 @@ DWORD GetCountBucketParamsForEvent(LPCWSTR wzEventName)
 #include "dwreport.h"
 #include <msodwwrap.h>
 #include "dbginterface.h"
-#include <sha1.h>
+#include <minipal/sha1.h>
 
 //------------------------------------------------------------------------------
 // Description
@@ -1068,11 +1068,11 @@ int BaseBucketParamsManager::CopyStringToBucket(_Out_writes_(targetMaxLength) LP
     }
 
     // String didn't fit, so hash it.
-    SHA1Hash hash;
-    hash.AddData(reinterpret_cast<BYTE*>(const_cast<LPWSTR>(pSource)), (static_cast<int>(u16_strlen(pSource))) * sizeof(WCHAR));
+    BYTE hash[SHA1_HASH_SIZE];
+    minipal_sha1(reinterpret_cast<BYTE*>(const_cast<LPWSTR>(pSource)), (static_cast<int>(u16_strlen(pSource))) * sizeof(WCHAR), hash, sizeof(hash));
 
     // Encode in base32.  The hash is a fixed size; we'll accept up to maxLen characters of the encoding.
-    BytesToBase32 b32(hash.GetHash(), SHA1_HASH_SIZE);
+    BytesToBase32 b32(hash, SHA1_HASH_SIZE);
     targLen = b32.Convert(pTargetParam, targetMaxLength);
     pTargetParam[targLen] = W('\0');
 

diff --git a/src/coreclr/vm/peassembly.cpp b/src/coreclr/vm/peassembly.cpp
@@ -20,7 +20,7 @@
 #include "../binder/inc/applicationcontext.hpp"
 #include "../binder/inc/assemblybindercommon.hpp"
 
-#include "sha1.h"
+#include <minipal/sha1.h>
 
 
 #ifndef DACCESS_COMPILE

diff --git a/src/native/dnmd/.gitignore b/src/native/dnmd/.gitignore
@@ -0,0 +1,5 @@
+artifacts/
+.vs/
+.idea/
+*~
+TestResults/
diff --git a/src/native/dnmd/CMakeLists.txt b/src/native/dnmd/CMakeLists.txt
@@ -0,0 +1,37 @@
+cmake_minimum_required(VERSION 3.20)
+project(dnmd
+    LANGUAGES C)
+
+# Always include our public headers
+include_directories(src/inc)
+
+# Include the metadata API headers provided by CoreCLR
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../coreclr/inc ${CMAKE_CURRENT_SOURCE_DIR}/../../coreclr/pal/prebuilt/inc)
+
+if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+    # This is our root CMakeList.txt, so we need to set up some global settings and include the minipal here.
+    include(../../../eng/native/configurepaths.cmake)
+    include(${CLR_ENG_NATIVE_DIR}/configurecompiler.cmake)
+
+    add_subdirectory(${CLR_SRC_NATIVE_DIR}/minipal minipal)
+endif()
+
+include_directories(${CLR_SRC_NATIVE_DIR})
+
+option(DNMD_BUILD_TESTS "Build tests for dnmd" ON)
+option(DNMD_INSTALL "Install dnmd targets" ON)
+option(DNMD_BUILD_INTERFACES "Build implementations of the metadata interfaces for DNMD" ON)
+option(DNMD_BUILD_TOOLS "Build tools for dnmd" ON)
+
+if (DNMD_BUILD_INTERFACES OR DNMD_BUILD_TESTS OR DNMD_BUILD_TOOLS)
+    enable_language(CXX)
+endif()
+
+add_subdirectory(src/)
+
+
+if (DNMD_BUILD_TESTS)
+    enable_testing()
+
+    add_subdirectory(test/)
+endif()