[browser] build more subsets + runtime interp test

eng/Subsets.props

@@ -53,7 +53,7 @@
 
     <!-- Determine if we support running the .NET SDK on the target platform -->
     <_SdkToolsSupportedOS Condition="'$(TargetsMobile)' != 'true' and '$(TargetsLinuxBionic)' != 'true'">true</_SdkToolsSupportedOS>
-    <_SdkToolsSupportedArch Condition="'$(TargetArchitecture)' != 'armel'">true</_SdkToolsSupportedArch>
+    <_SdkToolsSupportedArch Condition="'$(TargetArchitecture)' != 'armel' and '$(TargetsWasm)' != 'true'">true</_SdkToolsSupportedArch>
     <SdkToolsSupported Condition="'$(_SdkToolsSupportedOS)' == 'true' and '$(_SdkToolsSupportedArch)' == 'true'">true</SdkToolsSupported>
 
     <_UseNativeAotForComponentsCrossOS Condition="'$(CrossBuild)' == 'true' and '$(_hostArchitecture)' == '$(_targetArchitecture)' and '$(_hostOS)' != 'windows'">true</_UseNativeAotForComponentsCrossOS>
@@ -108,7 +108,8 @@
     <DefaultCoreClrSubsets>clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools+host.native</DefaultCoreClrSubsets>
     <DefaultCoreClrSubsets Condition="'$(TargetRid)' == 'linux-armel'">clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools</DefaultCoreClrSubsets>
     <DefaultCoreClrSubsets Condition="'$(TargetsAndroid)' == 'true'">clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools</DefaultCoreClrSubsets>
-    <DefaultCoreClrSubsets Condition="'$(TargetsBrowser)' == 'true'">clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.crossarchtools+host.native</DefaultCoreClrSubsets>
+    <!-- WASM-TODO: host.native -->
+    <DefaultCoreClrSubsets Condition="'$(TargetsBrowser)' == 'true'">mono.emsdk+clr.native+clr.corelib+clr.tools+clr.packages+clr.crossarchtools</DefaultCoreClrSubsets>
     <!-- Even on platforms that do not support the CoreCLR runtime, we still want to build ilasm/ildasm. -->
     <DefaultCoreClrSubsets Condition="'$(RuntimeFlavor)' != 'CoreCLR'">clr.iltools+clr.packages</DefaultCoreClrSubsets>
 
@@ -363,7 +364,7 @@
     The cross tools are used as part of the build process with the downloaded build tools, so we need to build them for the host architecture and build them as unsanitized binaries.
     -->
   <PropertyGroup>
-    <_BuildAnyCrossArch Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != '') and '$(TargetArchitecture)' != 'wasm'">true</_BuildAnyCrossArch>
+    <_BuildAnyCrossArch Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != '') and '$(TargetsWasm)' != 'true'">true</_BuildAnyCrossArch>
     <_BuildCrossComponents Condition="$(_subset.Contains('+clr.crossarchtools+'))">true</_BuildCrossComponents>
     <_BuildCrossComponents Condition="'$(ClrRuntimeBuildSubsets)' != '' and ('$(PrimaryRuntimeFlavor)' == 'CoreCLR' or '$(TargetsMobile)' == 'true')">true</_BuildCrossComponents>
     <_CrossBitwidthBuild Condition="'$(BuildArchitecture)' == 'x64' and ('$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'arm')">true</_CrossBitwidthBuild>

eng/liveBuilds.targets

@@ -215,27 +215,31 @@
         $(LibrariesNativeArtifactsPath)*.dex;
         $(LibrariesNativeArtifactsPath)*.jar;"
         IsNative="true" />
-      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser'"
+      <!-- WASM-TODO build this also as part of coreCLR host.native -->
+      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'"
                              Include="
+        $(LibrariesNativeArtifactsPath)dotnet.d.ts;
         $(LibrariesNativeArtifactsPath)dotnet.js;
         $(LibrariesNativeArtifactsPath)dotnet.js.map;
-        $(LibrariesNativeArtifactsPath)dotnet.native.js;
         $(LibrariesNativeArtifactsPath)dotnet.runtime.js;
         $(LibrariesNativeArtifactsPath)dotnet.runtime.js.map;
+        $(LibrariesNativeArtifactsPath)*.dat;"
+        IsNative="true" />
+      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'"
+                             Include="
         $(LibrariesNativeArtifactsPath)dotnet.diagnostics.js;
-        $(LibrariesNativeArtifactsPath)dotnet.diagnostics.js.map;
-        $(LibrariesNativeArtifactsPath)dotnet.d.ts;
-        $(LibrariesNativeArtifactsPath)package.json;
+        $(LibrariesNativeArtifactsPath)dotnet.native.js;
         $(LibrariesNativeArtifactsPath)dotnet.native.wasm;
-        $(LibrariesNativeArtifactsPath)dotnet.native.js.symbols;
-        $(LibrariesNativeArtifactsPath)*.dat;"
+        $(LibrariesNativeArtifactsPath)package.json;
+        $(LibrariesNativeArtifactsPath)dotnet.diagnostics.js.map;
+        $(LibrariesNativeArtifactsPath)dotnet.native.js.symbols;"
         IsNative="true" />
       <!-- for threaded wasm -->
-      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and Exists('$(LibrariesNativeArtifactsPath)dotnet.native.worker.mjs')"
+      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono' and Exists('$(LibrariesNativeArtifactsPath)dotnet.native.worker.mjs')"
                              Include="
         $(LibrariesNativeArtifactsPath)dotnet.native.worker.mjs"
         IsNative="true" />
-      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser'"
+      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'"
                              Include="
         $(LibrariesNativeArtifactsPath)src\*.c;
         $(LibrariesNativeArtifactsPath)src\*.js;
@@ -244,12 +248,12 @@
         $(LibrariesNativeArtifactsPath)src\wasm-props.json;"
         NativeSubDirectory="src"
         IsNative="true" />
-      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser'"
+      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'"
                              Include="$(LibrariesNativeArtifactsPath)src\es6\*.js"
                              NativeSubDirectory="src\es6"
                              IsNative="true" />
 
-      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser'"
+      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'"
                              Include="
         $(LibrariesNativeArtifactsPath)include\wasm\*.h;"
         NativeSubDirectory="include\wasm"

eng/pipelines/common/global-build-job.yml

@@ -136,6 +136,14 @@ jobs:
       # Set no native sanitizers by default
       - name: _nativeSanitizersArg
         value: ''
+      - name: priorityArg
+        value: ''
+      - name: runtimeFlavorArgs
+        value: ''
+      - name: runtimeVariantArg
+        value: ''
+      - name: librariesConfigurationArg
+        value: ''
 
       - ${{ each variableTemplate in parameters.extraVariablesTemplates }}:
         - template: ${{ variableTemplate.template }}

eng/pipelines/runtime.yml

@@ -105,14 +105,18 @@ extends:
       - template: /eng/pipelines/common/platform-matrix.yml
         parameters:
           jobTemplate: /eng/pipelines/common/global-build-job.yml
-          buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
+          buildConfig: Release
           platforms:
           - browser_wasm
           - browser_wasm_win
           jobParameters:
             nameSuffix: AllSubsets_CoreCLR
-            buildArgs: -s clr.runtime+libs -rc Release -c Release -lc $(_BuildConfig)
+            buildArgs: -s clr+libs -rc Release -c Release -lc Release
             timeoutInMinutes: 120
+            postBuildSteps:
+              - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests.yml
+                parameters:
+                  testBuildArgs: test JIT/interpreter/Interpreter.csproj /p:LibrariesConfiguration=Release
             condition: >-
               or(
                 eq(variables['wasmDarcDependenciesChanged'], true),

src/coreclr/tools/aot/ILCompiler/ILCompiler.props

@@ -67,6 +67,7 @@
       CopyToOutputDirectory="PreserveNewest"
       CopyToPublishDirectory="PreserveNewest"
       Link="%(FileName)%(Extension)"
+      Condition="'$(TargetsWasm)' != 'true'"
       />
 
     <Content Include="$(CoreCLRArtifactsPath)/$(_LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(_LibSuffix)"

src/coreclr/tools/aot/crossgen2/crossgen2.props

@@ -55,6 +55,7 @@
       CopyToPublishDirectory="PreserveNewest"
       ExcludeFromSingleFile="$(PublishSingleFile)"
       Link="%(FileName)%(Extension)"
+      Condition="'$(TargetsWasm)' != 'true'"
       />
 
     <Content Include="$(CoreCLRArtifactsPath)/$(CrossHostArch)/$(_LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(_LibSuffix)"

src/mono/llvm/llvm-init.proj

@@ -13,7 +13,7 @@
     <MonoLLVMToolsVersion Condition="'$(MonoLLVMHostOS)' == 'linux-musl'">$(runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion)</MonoLLVMToolsVersion>
     <MonoLLVMToolsVersion Condition="'$(MonoLLVMHostOS)' == 'win'">$(runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion)</MonoLLVMToolsVersion>
     <MonoLLVMToolsVersion Condition="'$(MonoLLVMHostOS)' == 'osx'">$(runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion)</MonoLLVMToolsVersion>
-    <MonoLLVMSDKDebugSuffix Condition="'$(MonoLLVMHostOS)' == 'win' and '$(Configuration)' == 'Debug' and '$(ContinuousIntegrationBuild)' == 'true'" >.Debug</MonoLLVMSDKDebugSuffix>
+    <MonoLLVMSDKDebugSuffix Condition="'$(MonoLLVMHostOS)' == 'win' and '$(Configuration)' == 'Debug'" >.Debug</MonoLLVMSDKDebugSuffix>
   </PropertyGroup>
 
   <ItemGroup>
@@ -74,9 +74,9 @@
                                    Version="$(MonoLLVMToolsVersion)"
                                    PackageArch="$(BuildArchitecture)"/>
   </ItemGroup>
-  <ItemGroup Condition="@(_PackageReferenceDeduplicated->AnyHaveMetadataValue('Identity', 'runtime.$(MonoLLVMHostOS)-wasm.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk'))">
-    <_PackageReferenceDeduplicated Remove="runtime.$(MonoLLVMHostOS)-wasm.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" />
-    <_PackageReferenceDeduplicated Include="runtime.$(MonoLLVMHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Mono.LLVM.Sdk"
+  <ItemGroup Condition="@(_PackageReferenceDeduplicated->AnyHaveMetadataValue('Identity', 'runtime.$(MonoLLVMHostOS)-wasm.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk$(MonoLLVMSDKDebugSuffix)'))">
+    <_PackageReferenceDeduplicated Remove="runtime.$(MonoLLVMHostOS)-wasm.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk$(MonoLLVMSDKDebugSuffix)" />
+    <_PackageReferenceDeduplicated Include="runtime.$(MonoLLVMHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Mono.LLVM.Sdk$(MonoLLVMSDKDebugSuffix)"
                                    Version="$(MonoLLVMSDKVersion)"
                                    PackageArch="$(BuildArchitecture)"/>
    </ItemGroup>

src/native/libs/build-native.proj

@@ -20,6 +20,7 @@
     <_CMakeArgs Condition="'$(WasmEnableThreads)' == 'true'">$(_CMakeArgs) -cmakeargs "-DCMAKE_USE_PTHREADS=1"</_CMakeArgs>
     <_CMakeArgs Condition="'$(_IcuDir)' != ''">$(_CMakeArgs) -cmakeargs "-DCMAKE_ICU_DIR=$(_IcuDir)"</_CMakeArgs>
     <_CMakeArgs Condition="'$(_TzdDir)' != ''">$(_CMakeArgs) -cmakeargs "-DCMAKE_TZD_DIR=$(_TzdDir)"</_CMakeArgs>
+    <_CMakeArgs Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$(_CMakeArgs) -cmakeargs "-DBUILD_LIBS_NATIVE_BROWSER=1"</_CMakeArgs>
 
     <_BuildNativeArgs>$(_BuildNativeArgs)$(_CMakeArgs)</_BuildNativeArgs>
   </PropertyGroup>

src/tests/CMakeLists.txt

@@ -41,26 +41,41 @@ if (CLR_CMAKE_HOST_WIN32)
     set_property(DIRECTORY PROPERTY CLR_EH_OPTION /EHa) # enable C++ EH (w/ SEH exceptions)
 endif()
 
-MACRO(SUBDIRLIST result curdir)
-  FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
-  SET(dirlist "")
-  FOREACH(child ${children})
-    IF(IS_DIRECTORY ${curdir}/${child})
-        LIST(APPEND dirlist ${child})
-    ENDIF()
-  ENDFOREACH()
-  SET(${result} ${dirlist})
-ENDMACRO()
-
-MACRO(ADDSUBDIR_REC  curdir)
-    SUBDIRLIST(SUB_DIRS ${curdir})
-    FOREACH(subdir ${SUB_DIRS})
-        if(EXISTS "${curdir}/${subdir}/CMakeLists.txt")
-           ADD_SUBDIRECTORY(${curdir}/${subdir})
-        else()
-           ADDSUBDIR_REC(${curdir}/${subdir})
-        endif(EXISTS "${curdir}/${subdir}/CMakeLists.txt")
+if(NOT CLR_CMAKE_TARGET_ARCH_WASM)
+    set(TEST_LIB_TYPE SHARED)
+    MACRO(SUBDIRLIST result curdir)
+    FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
+    SET(dirlist "")
+    FOREACH(child ${children})
+        IF(IS_DIRECTORY ${curdir}/${child})
+            LIST(APPEND dirlist ${child})
+        ENDIF()
     ENDFOREACH()
-ENDMACRO()
+    SET(${result} ${dirlist})
+    ENDMACRO()
+
+    MACRO(ADDSUBDIR_REC  curdir)
+        SUBDIRLIST(SUB_DIRS ${curdir})
+        FOREACH(subdir ${SUB_DIRS})
+            if(EXISTS "${curdir}/${subdir}/CMakeLists.txt")
+            ADD_SUBDIRECTORY(${curdir}/${subdir})
+            else()
+            ADDSUBDIR_REC(${curdir}/${subdir})
+            endif(EXISTS "${curdir}/${subdir}/CMakeLists.txt")
+        ENDFOREACH()
+    ENDMACRO()
+    ADDSUBDIR_REC("${CMAKE_CURRENT_SOURCE_DIR}")
+else()
+    set(TEST_LIB_TYPE STATIC)
 
-ADDSUBDIR_REC("${CMAKE_CURRENT_SOURCE_DIR}")
+    add_compile_options(
+      -fwasm-exceptions 
+      -msimd128)
+    add_link_options(
+      -fwasm-exceptions 
+      -msimd128
+      )
+
+    # opt in into tests that make sense for WASM
+    add_subdirectory(JIT/interpreter)
+endif()

src/tests/Common/hostpolicymock/CMakeLists.txt

@@ -3,6 +3,6 @@ project (hostpolicy)
 include_directories(${INC_PLATFORM_DIR})
 
 set(SOURCES HostpolicyMock.cpp )
-add_library(hostpolicy SHARED ${SOURCES})
+add_library(hostpolicy ${TEST_LIB_TYPE} ${SOURCES})
 
 install(TARGETS hostpolicy DESTINATION bin)

src/tests/Exceptions/ForeignThread/CMakeLists.txt

@@ -9,7 +9,7 @@ if(NOT CLR_CMAKE_HOST_WIN32)
 endif()
 
 # add the executable
-add_library (ForeignThreadExceptionsNative SHARED ${SOURCES})
+add_library (ForeignThreadExceptionsNative ${TEST_LIB_TYPE} ${SOURCES})
 
 # add the install targets
 install (TARGETS ForeignThreadExceptionsNative DESTINATION bin)

src/tests/Interop/ArrayMarshalling/BoolArray/CMakeLists.txt

@@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
 set(SOURCES MarshalBoolArrayNative.cpp)
 
 # add the executable
-add_library (MarshalBoolArrayNative SHARED ${SOURCES})
+add_library (MarshalBoolArrayNative ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(MarshalBoolArrayNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # add the install targets

src/tests/Interop/ArrayMarshalling/SafeArray/CMakeLists.txt

@@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
 set(SOURCES SafeArrayNative.cpp RecordNative.cpp)
 
 # add the executable
-add_library (SafeArrayNative SHARED ${SOURCES})
+add_library (SafeArrayNative ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(SafeArrayNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # add the install targets

src/tests/Interop/BestFitMapping/CMakeLists.txt

@@ -3,7 +3,7 @@ set(SOURCES BestFitMappingNative.cpp )
 include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
 
 # add the executable
-add_library (BestFitMappingNative SHARED ${SOURCES})
+add_library (BestFitMappingNative ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(BestFitMappingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # add the install targets

src/tests/Interop/COM/ComWrappers/MockReferenceTrackerRuntime/CMakeLists.txt

@@ -3,7 +3,7 @@ include_directories( ${INC_PLATFORM_DIR} )
 set(SOURCES ReferenceTrackerRuntime.cpp)
 
 # add the shared library
-add_library (MockReferenceTrackerRuntime SHARED ${SOURCES})
+add_library (MockReferenceTrackerRuntime ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(MockReferenceTrackerRuntime PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # add the install targets

src/tests/Interop/COM/ComWrappers/WeakReference/CMakeLists.txt

@@ -3,7 +3,7 @@ include_directories( ${INC_PLATFORM_DIR} )
 set(SOURCES WeakReferenceNative.cpp)
 
 # add the shared library
-add_library (WeakReferenceNative SHARED ${SOURCES})
+add_library (WeakReferenceNative ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(WeakReferenceNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # add the install targets

src/tests/Interop/COM/Dynamic/Server/CMakeLists.txt

@@ -33,7 +33,7 @@ if (CLR_CMAKE_HOST_WIN32)
 endif()
 
 # add the shared library
-add_library (${PROJECT_NAME} SHARED ${SOURCES})
+add_library (${PROJECT_NAME} ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(${PROJECT_NAME} PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # Copy manifest file to project output

src/tests/Interop/COM/NativeServer/CMakeLists.txt

@@ -9,7 +9,7 @@ if (CLR_CMAKE_HOST_WIN32)
 endif()
 
 # add the shared library
-add_library (COMNativeServer SHARED ${SOURCES})
+add_library (COMNativeServer ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(COMNativeServer PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # Copy manifest file to project output

src/tests/Interop/DisabledRuntimeMarshalling/CMakeLists.txt

@@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR})
 set(SOURCES DisabledRuntimeMarshallingNative.cpp )
 
 # add the executable
-add_library (DisabledRuntimeMarshallingNative SHARED ${SOURCES})
+add_library (DisabledRuntimeMarshallingNative ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(DisabledRuntimeMarshallingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # add the install targets

src/tests/Interop/DllImportAttribute/DllImportPath/CMakeLists.txt

@@ -6,10 +6,10 @@ set(SOURCES
 
 # Additional files to reference:
 # add the executable
-add_library (DllImportPath_Local SHARED ${SOURCES})
-add_library (DllImportPath.Local SHARED ${SOURCES})
-add_library (DllImportPath_PathEnv SHARED ${SOURCES})
-add_library (DllImportPath_Relative SHARED ${SOURCES})
+add_library (DllImportPath_Local ${TEST_LIB_TYPE} ${SOURCES})
+add_library (DllImportPath.Local ${TEST_LIB_TYPE} ${SOURCES})
+add_library (DllImportPath_PathEnv ${TEST_LIB_TYPE} ${SOURCES})
+add_library (DllImportPath_Relative ${TEST_LIB_TYPE} ${SOURCES})
 add_executable(DllImportPath_ExeFile ${SOURCES})
 target_link_libraries(DllImportPath_Local PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 target_link_libraries(DllImportPath.Local PRIVATE ${LINK_LIBRARIES_ADDITIONAL})

src/tests/Interop/DllImportAttribute/ExactSpelling/CMakeLists.txt

@@ -4,7 +4,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
 set(SOURCES ExactSpellingNative.cpp)
 
 # add the executable
-add_library (ExactSpellingNative SHARED ${SOURCES})
+add_library (ExactSpellingNative ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(ExactSpellingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # add the install targets

src/tests/Interop/DllImportSearchPaths/NativeLibraryWithDependency/CMakeLists.txt

@@ -6,8 +6,8 @@ if (CLR_CMAKE_TARGET_WIN32)
     string(REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
 endif ()
 
-add_library(Dependency SHARED Dependency.cpp)
+add_library(Dependency ${TEST_LIB_TYPE} Dependency.cpp)
 target_link_libraries(Dependency PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
-add_library(NativeLibraryWithDependency SHARED NativeLibraryWithDependency.cpp)
+add_library(NativeLibraryWithDependency ${TEST_LIB_TYPE} NativeLibraryWithDependency.cpp)
 target_link_libraries(NativeLibraryWithDependency PRIVATE Dependency ${LINK_LIBRARIES_ADDITIONAL})

src/tests/Interop/ExecInDefAppDom/CMakeLists.txt

@@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
 set(SOURCES ExecInDefAppDomDll.cpp )
 
 # add the executable
-add_library (ExecInDefAppDomDll SHARED ${SOURCES})
+add_library (ExecInDefAppDomDll ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(ExecInDefAppDomDll PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # add the install targets

src/tests/Interop/FuncPtrAsDelegateParam/CMakeLists.txt

@@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
 set(SOURCES FuncPtrAsDelegateParamNative.cpp )
 
 # add the executable
-add_library (FuncPtrAsDelegateParamNative SHARED ${SOURCES})
+add_library (FuncPtrAsDelegateParamNative ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(FuncPtrAsDelegateParamNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # add the install targets

src/tests/Interop/GCBridge/CMakeLists.txt

@@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
 set(SOURCES GCBridgeNative.cpp )
 
 # add the executable
-add_library (GCBridgeNative SHARED ${SOURCES})
+add_library (GCBridgeNative ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(GCBridgeNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # add the install targets

src/tests/Interop/ICustomMarshaler/ConflictingNames/CMakeLists.txt

@@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR})
 set(SOURCES CustomMarshalerNative.cpp )
 
 # add the executable
-add_library (CustomMarshalerNative SHARED ${SOURCES})
+add_library (CustomMarshalerNative ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(CustomMarshalerNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # add the install targets

src/tests/Interop/ICustomMarshaler/Primitives/CMakeLists.txt

@@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR})
 set(SOURCES ICustomMarshalerNative.cpp )
 
 # add the executable
-add_library (CustomMarshalersPrimitives SHARED ${SOURCES})
+add_library (CustomMarshalersPrimitives ${TEST_LIB_TYPE} ${SOURCES})
 target_link_libraries(CustomMarshalersPrimitives PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
 
 # add the install targets