merge main; fix up some conflicts

Author: AndyAyersMS

.gitattributes

@@ -68,6 +68,9 @@
 # this only affects the repo's language statistics
 *.h linguist-language=C
 
+# don't treat files in 'build' directories as generated
+**/build/** linguist-generated=false
+
 # CLR specific
 src/coreclr/pal/tests/palsuite/paltestlist.txt text eol=lf
 src/coreclr/pal/tests/palsuite/paltestlist_to_be_reviewed.txt text eol=lf

eng/Subsets.props

@@ -59,8 +59,8 @@
     <DefaultSubsets Condition="'$(TargetsAppleMobile)' == 'true'">clr.nativeaotruntime+clr.nativeaotlibs+mono+libs+packs</DefaultSubsets>
     <DefaultSubsets Condition="'$(TargetsLinuxBionic)' == 'true' and '$(MonoSupported)' == 'true'">clr.nativeaotruntime+clr.nativeaotlibs+mono+libs+host+packs</DefaultSubsets>
     <DefaultSubsets Condition="'$(TargetsLinuxBionic)' == 'true' and '$(MonoSupported)' != 'true'">clr.nativeaotruntime+clr.nativeaotlibs+libs+packs</DefaultSubsets>
-    <!-- In source build, mono is only supported as primary runtime flavor. On Windows mono is supported for x86/x64 only. -->
-    <DefaultSubsets Condition="('$(DotNetBuildSourceOnly)' == 'true' and '$(PrimaryRuntimeFlavor)' != 'Mono') or ('$(TargetOS)' == 'windows' and '$(TargetArchitecture)' != 'x86' and '$(TargetArchitecture)' != 'x64')">clr+libs+tools+host+packs</DefaultSubsets>
+    <!-- In source build, mono is only supported as primary runtime flavor. -->
+    <DefaultSubsets Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(PrimaryRuntimeFlavor)' != 'Mono'">clr+libs+tools+host+packs</DefaultSubsets>
     <DefaultSubsets Condition="'$(DotNetBuildRuntimeNativeAOTRuntimePack)' == 'true'">clr.nativeaotlibs+clr.nativeaotruntime+libs+packs</DefaultSubsets>
     <DefaultSubsets Condition="'$(DotNetBuildMonoCrossAOT)' == 'true'">mono+packs</DefaultSubsets>
   </PropertyGroup>
@@ -96,19 +96,21 @@
 
     <DefaultNativeAotSubsets>clr.alljits+clr.tools+clr.nativeaotlibs+clr.nativeaotruntime</DefaultNativeAotSubsets>
 
+    <_MonoAotCrossSubsets Condition="'$(MonoCrossAOTTargetOS)' != ''">mono.aotcross</_MonoAotCrossSubsets>
+
     <DefaultMonoSubsets Condition="'$(MonoEnableLLVM)' == 'true' and '$(MonoLLVMDir)' == ''">mono.llvm+</DefaultMonoSubsets>
     <DefaultMonoSubsets Condition="'$(MonoAOTEnableLLVM)' == 'true' and '$(MonoLLVMDir)' == ''">mono.llvm+</DefaultMonoSubsets>
     <DefaultMonoSubsets Condition="'$(TargetOS)' == 'browser'">$(DefaultMonoSubsets)mono.wasmruntime+</DefaultMonoSubsets>
     <DefaultMonoSubsets Condition="'$(TargetOS)' == 'wasi'">$(DefaultMonoSubsets)mono.wasiruntime+</DefaultMonoSubsets>
-    <DefaultMonoSubsets Condition="'$(MonoCrossAOTTargetOS)' != ''">$(DefaultMonoSubsets)mono.aotcross+</DefaultMonoSubsets>
+    <DefaultMonoSubsets Condition="'$(_MonoAotCrossSubsets)' != ''">$(DefaultMonoSubsets)$(_MonoAotCrossSubsets)+</DefaultMonoSubsets>
     <DefaultMonoSubsets>$(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+</DefaultMonoSubsets>
     <DefaultMonoSubsets Condition="'$(TargetsMobile)' == 'true' or '$(ForceBuildMobileManifests)' == 'true'">$(DefaultMonoSubsets)mono.manifests+</DefaultMonoSubsets>
     <DefaultMonoSubsets Condition="$(_subset.Contains('+mono.wasmworkload+'))">$(DefaultMonoSubsets)mono.manifests+</DefaultMonoSubsets>
     <DefaultMonoSubsets Condition="'$(PrimaryRuntimeFlavor)' != 'Mono'">$(DefaultMonoSubsets)mono.tools+</DefaultMonoSubsets>
     <DefaultMonoSubsets Condition="'$(TargetsMobile)' != 'true'">$(DefaultMonoSubsets)host.native+</DefaultMonoSubsets>
 
     <!-- If the Mono runtime isn't supported but the AOT compiler is, just build the AOT cross compiler -->
-    <DefaultMonoSubsets Condition="'$(BuildMonoAOTCrossCompilerOnly)' == 'true' or ('$(MonoSupported)' != 'true' and '$(MonoAOTCrossCompilerSupported)' == 'true')">mono.aotcross</DefaultMonoSubsets>
+    <DefaultMonoSubsets Condition="'$(BuildMonoAOTCrossCompilerOnly)' == 'true' or ('$(MonoSupported)' != 'true' and '$(MonoAOTCrossCompilerSupported)' == 'true')">$(_MonoAotCrossSubsets)</DefaultMonoSubsets>
 
     <DefaultLibrariesSubsets Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or
                                         '$(BuildTargetFramework)' == '' or

eng/Version.Details.xml

@@ -352,21 +352,21 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
     </Dependency>
-    <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25053.1">
+    <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25067.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>0eb38b09e89e233cf7cd056fad672627ea2fa05a</Sha>
+      <Sha>93bf80f30db2e15a7d62c22ff80fecf3518519b1</Sha>
     </Dependency>
-    <Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25053.1">
+    <Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25067.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>0eb38b09e89e233cf7cd056fad672627ea2fa05a</Sha>
+      <Sha>93bf80f30db2e15a7d62c22ff80fecf3518519b1</Sha>
     </Dependency>
-    <Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25053.1">
+    <Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25067.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>0eb38b09e89e233cf7cd056fad672627ea2fa05a</Sha>
+      <Sha>93bf80f30db2e15a7d62c22ff80fecf3518519b1</Sha>
     </Dependency>
-    <Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.25053.1">
+    <Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.25067.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>0eb38b09e89e233cf7cd056fad672627ea2fa05a</Sha>
+      <Sha>93bf80f30db2e15a7d62c22ff80fecf3518519b1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="10.0.0-alpha.0.24627.1">
       <Uri>https://github.com/dotnet/hotreload-utils</Uri>
@@ -412,13 +412,13 @@
       <Sha>13330d5ded0b2b2bcd6459d6a410aa6220b11040</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25053.1">
+    <Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25067.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>0eb38b09e89e233cf7cd056fad672627ea2fa05a</Sha>
+      <Sha>93bf80f30db2e15a7d62c22ff80fecf3518519b1</Sha>
     </Dependency>
-    <Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25053.1">
+    <Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25067.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-      <Sha>0eb38b09e89e233cf7cd056fad672627ea2fa05a</Sha>
+      <Sha>93bf80f30db2e15a7d62c22ff80fecf3518519b1</Sha>
     </Dependency>
     <!-- Necessary for source-build. This allows the package to be retrieved from previously-source-built artifacts
          and flow in as dependencies of the packages produced by runtime. -->

eng/Versions.props

@@ -164,12 +164,12 @@
     <!-- hotreload-utils dependencies -->
     <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>10.0.0-alpha.0.24627.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
     <!-- dotnet-optimization dependencies -->
-    <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.25053.1</optimizationwindows_ntx64MIBCRuntimeVersion>
-    <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.25053.1</optimizationwindows_ntx86MIBCRuntimeVersion>
-    <optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.25053.1</optimizationwindows_ntarm64MIBCRuntimeVersion>
-    <optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.25053.1</optimizationlinuxx64MIBCRuntimeVersion>
-    <optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.25053.1</optimizationlinuxarm64MIBCRuntimeVersion>
-    <optimizationPGOCoreCLRVersion>1.0.0-prerelease.25053.1</optimizationPGOCoreCLRVersion>
+    <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.25067.2</optimizationwindows_ntx64MIBCRuntimeVersion>
+    <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.25067.2</optimizationwindows_ntx86MIBCRuntimeVersion>
+    <optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.25067.2</optimizationwindows_ntarm64MIBCRuntimeVersion>
+    <optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.25067.2</optimizationlinuxx64MIBCRuntimeVersion>
+    <optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.25067.2</optimizationlinuxarm64MIBCRuntimeVersion>
+    <optimizationPGOCoreCLRVersion>1.0.0-prerelease.25067.2</optimizationPGOCoreCLRVersion>
     <!-- Not auto-updated. -->
     <MicrosoftDiaSymReaderVersion>2.0.0</MicrosoftDiaSymReaderVersion>
     <MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>

eng/pipelines/libraries/deploy-networking-echo-test-servers.yml

@@ -0,0 +1,99 @@
+# This pipeline deploys the test servers we are using to run (outerloop) Functional tests for various functionality in System.Net namespace.
+# The pipeline deploys to staging slots, which are available at
+# - corefx-net-http11-staging.azurewebsites.net
+# - corefx-net-http2-staging.azurewebsites.net
+#
+# Usage instructions:
+# 1) Start pipeline at https://dev.azure.com/dnceng/internal/_build?definitionId=1419
+#    (deploy-networking-echo-test-servers), pick the correct branch and start the build.
+# 2) After pipeline succeeds, check your changes against the staging slots, two possible ways to do this are:
+#   - create a no-merge PR where you overwrite the default urls (e.g. https://github.com/dotnet/runtime/pull/111396)
+#   - test locally, either by same changes as in above PR, or by using the override environment variables
+#
+#     DOTNET_TEST_HTTPHOST=http://corefx-net-http11-staging.azurewebsites.net
+#     DOTNET_TEST_SECUREHTTPHOST=https://corefx-net-http11-staging.azurewebsites.net
+#     DOTNET_TEST_WEBSOKETHOST=http://corefx-net-http11-staging.azurewebsites.net
+#     DOTNET_TEST_SECUREWEBSOKETHOST=http://corefx-net-http11-staging.azurewebsites.net
+#
+#     DOTNET_TEST_HTTP2HOST=http://corefx-net-http2-staging.azurewebsites.net
+# 3) If there are no issues, you can swap the staging slots with production slots via the Azure portal.
+#    Only the members of the .NET Networking team have access to the Azure Subscription which hosts the
+#    servers. Look for the "Deployment slots" section at corefx-net-http11 and corefx-net-http2 Web Apps
+
+trigger: none
+
+resources:
+  repositories:
+    - repository: 1ESPipelineTemplates
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+
+variables:
+  - template: /eng/common/templates-official/variables/pool-providers.yml
+  - name: FrameworkVersion
+    value: 8.x
+  - name: TargetFramework
+    value: net8.0
+
+extends:
+  template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    customBuildTags:
+      - 1ES.PT.ViaStartRight
+    pool:
+      name: $(DncEngInternalBuildPool)
+      image: 1es-windows-2022
+      os: windows
+
+    stages:
+      - stage: stage
+        displayName: Building in a VM
+        jobs:
+          - job: job
+            displayName: Build
+            steps:
+              - checkout: self
+
+              - task: UseDotNet@2
+                inputs:
+                  packageType: "sdk"
+                  version: $(FrameworkVersion)
+
+              - script: echo {} > ./global.json
+                displayName: Bypass repository global.json
+                workingDirectory: ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer
+
+              - script: dotnet publish -c Release /p:GenevaTelemetry=true /p:_TargetFrameworkForXHarness=$(TargetFramework)
+                workingDirectory: ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer
+                displayName: Run dotnet publish
+
+              - task: zip@0
+                displayName: Zip artifacts
+                inputs:
+                  pathToZipFolder: 'artifacts\bin\NetCoreServer\Release\$(TargetFramework)\publish\'
+                  pathToZipFile: 'artifacts\bin\NetCoreServer\Release\$(TargetFramework)\publish.zip'
+
+              - task: AzureRmWebAppDeployment@4
+                displayName: Deploy to corefx-net-http11-staging
+                inputs:
+                  ConnectionType: "AzureRM"
+                  azureSubscription: .NET Libraries Network Testing
+                  appType: "webApp"
+                  WebAppName: "corefx-net-http11"
+                  deployToSlotOrASE: true
+                  ResourceGroupName: "Production-WestUS"
+                  SlotName: "staging"
+                  package: 'artifacts\bin\NetCoreServer\Release\$(TargetFramework)\publish.zip'
+
+              - task: AzureRmWebAppDeployment@4
+                displayName: Deploy to corefx-net-http2-staging
+                inputs:
+                  ConnectionType: "AzureRM"
+                  azureSubscription: .NET Libraries Network Testing
+                  appType: "webApp"
+                  WebAppName: "corefx-net-http2"
+                  deployToSlotOrASE: true
+                  ResourceGroupName: "Production-WestUS"
+                  SlotName: "staging"
+                  package: 'artifacts\bin\NetCoreServer\Release\$(TargetFramework)\publish.zip'

eng/pipelines/libraries/helix-queues-setup.yml

@@ -34,7 +34,7 @@ jobs:
 
     # Linux arm64
     - ${{ if eq(parameters.platform, 'linux_arm64') }}:
-      - (Ubuntu.2204.Arm64.Open)Ubuntu.2204.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8
+      - (Ubuntu.2410.Arm64.Open)Ubuntu.2204.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.10-helix-arm64v8
       - ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
         - (Debian.12.Arm64.Open)Ubuntu.2204.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm64v8
 

eng/pipelines/runtime-ioslike.yml

@@ -4,6 +4,24 @@
 
 trigger: none
 
+# To reduce the load on the pipeline, enable it only for PRs that affect Mono LLVM related code.
+pr:
+  branches:
+    include:
+    - main
+    - release/*.*
+
+  paths:
+    include:
+      - src/mono/mono/mini/aot-*.*
+      - src/mono/mono/mini/llvm-*.*
+      - src/mono/mono/mini/mini-llvm-*.*
+      - src/mono/mono/mini/intrinsics.c
+      - src/mono/mono/mini/simd-*.*
+      - src/mono/mono/mini/decompose.c
+      - src/mono/mono/mini/method-to-ir.c
+      - src/mono/mono/mini/mini.c
+
 variables:
   - template: /eng/pipelines/common/variables.yml
 

eng/pipelines/runtime-llvm.yml

@@ -28,6 +28,24 @@ schedules:
       - main
     always: false # run only if there were changes since the last successful scheduled run.
 
+# To reduce the load on the pipeline, enable it only for PRs that affect Mono LLVM related code.
+pr:
+  branches:
+    include:
+    - main
+    - release/*.*
+
+  paths:
+    include:
+      - src/mono/mono/mini/aot-*.*
+      - src/mono/mono/mini/llvm-*.*
+      - src/mono/mono/mini/mini-llvm-*.*
+      - src/mono/mono/mini/intrinsics.c
+      - src/mono/mono/mini/simd-*.*
+      - src/mono/mono/mini/decompose.c
+      - src/mono/mono/mini/method-to-ir.c
+      - src/mono/mono/mini/mini.c
+
 variables:
   - template: /eng/pipelines/common/variables.yml
 

src/coreclr/CMakeLists.txt

@@ -170,10 +170,7 @@ endif(CLR_CMAKE_HOST_WIN32)
 #----------------------------------
 include(clrdefinitions.cmake)
 
-if(FEATURE_STANDALONE_GC)
-  add_definitions(-DFEATURE_STANDALONE_GC)
-  add_subdirectory(gc)
-endif(FEATURE_STANDALONE_GC)
+add_subdirectory(gc)
 
 if (CLR_CMAKE_HOST_UNIX)
   include_directories("pal/inc")

src/coreclr/gc/CMakeLists.txt

@@ -1,12 +1,10 @@
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-# Local GC meta-issue: https://github.com/dotnet/runtime/issues/8061
-
-# https://github.com/dotnet/runtime/issues/8059
-remove_definitions(-DSTRESS_HEAP)
-
-# https://github.com/dotnet/runtime/issues/8062
-remove_definitions(-DWRITE_BARRIER_CHECK)
+if(FEATURE_STANDALONE_GC)
+  add_definitions(-DFEATURE_STANDALONE_GC)
+  remove_definitions(-DSTRESS_HEAP)
+  remove_definitions(-DWRITE_BARRIER_CHECK)
+endif(FEATURE_STANDALONE_GC)
 
 set(GC_SOURCES
   gceventstatus.cpp
@@ -100,37 +98,39 @@ list(APPEND GC_SOURCES ${GC_HEADERS})
 
 convert_to_absolute_path(GC_SOURCES ${GC_SOURCES})
 
-# clrgcexp is build with standalone+regions
-if (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64)
-  add_library_clr(clrgcexp SHARED ${GC_SOURCES})
-  add_dependencies(clrgcexp eventing_headers)
-  target_link_libraries(clrgcexp PRIVATE ${GC_LINK_LIBRARIES})
-  target_compile_definitions(clrgcexp PRIVATE -DUSE_REGIONS)
-  install_clr(TARGETS clrgcexp DESTINATIONS . COMPONENT runtime)
-endif (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64)
-
-# clrgc is build with standalone+segments
-add_library_clr(clrgc SHARED ${GC_SOURCES})
-add_dependencies(clrgc eventing_headers)
-target_link_libraries(clrgc PRIVATE ${GC_LINK_LIBRARIES})
-install_clr(TARGETS clrgc DESTINATIONS . COMPONENT runtime)
-
-add_definitions(-DBUILD_AS_STANDALONE)
-add_definitions(-DFEATURE_CONSERVATIVE_GC)
-
-add_definitions(-DFX_VER_INTERNALNAME_STR=clrgc.dll)
-add_definitions(-DVERIFY_HEAP)
-if(CLR_CMAKE_HOST_APPLE)
-  # The implementation of GCToOSInterface on Apple platforms makes use of non-POSIX
-  # pthreads APIs, which by default are not included in the pthreads header
-  # unless we define this macro.
-  add_definitions(-D_DARWIN_C_SOURCE)
-endif(CLR_CMAKE_HOST_APPLE)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/env)
-
-install_clr(TARGETS clrgc DESTINATIONS . sharedFramework COMPONENT runtime)
-if (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64)
-  install_clr(TARGETS clrgcexp DESTINATIONS . sharedFramework COMPONENT runtime)
-endif (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64)
+if(FEATURE_STANDALONE_GC)
+  # clrgcexp is build with standalone+regions
+  if (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64)
+    add_library_clr(clrgcexp SHARED ${GC_SOURCES})
+    add_dependencies(clrgcexp eventing_headers)
+    target_link_libraries(clrgcexp PRIVATE ${GC_LINK_LIBRARIES})
+    target_compile_definitions(clrgcexp PRIVATE -DUSE_REGIONS)
+    install_clr(TARGETS clrgcexp DESTINATIONS . COMPONENT runtime)
+  endif (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64)
+
+  # clrgc is build with standalone+segments
+  add_library_clr(clrgc SHARED ${GC_SOURCES})
+  add_dependencies(clrgc eventing_headers)
+  target_link_libraries(clrgc PRIVATE ${GC_LINK_LIBRARIES})
+  install_clr(TARGETS clrgc DESTINATIONS . COMPONENT runtime)
+
+  add_definitions(-DBUILD_AS_STANDALONE)
+  add_definitions(-DFEATURE_CONSERVATIVE_GC)
+
+  add_definitions(-DFX_VER_INTERNALNAME_STR=clrgc.dll)
+  add_definitions(-DVERIFY_HEAP)
+  if(CLR_CMAKE_HOST_APPLE)
+    # The implementation of GCToOSInterface on Apple platforms makes use of non-POSIX
+    # pthreads APIs, which by default are not included in the pthreads header
+    # unless we define this macro.
+    add_definitions(-D_DARWIN_C_SOURCE)
+  endif(CLR_CMAKE_HOST_APPLE)
+
+  include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/env)
+
+  install_clr(TARGETS clrgc DESTINATIONS . sharedFramework COMPONENT runtime)
+  if (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64)
+    install_clr(TARGETS clrgcexp DESTINATIONS . sharedFramework COMPONENT runtime)
+  endif (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64)
+endif(FEATURE_STANDALONE_GC)