Merge branch 'main' into copilot/fix-wasmtest-on-chrome

Author: Dan Moseley

.github/skills/update-os-coverage/SKILL.md

@@ -94,7 +94,7 @@ Before making any changes, confirm the **exact target container tag** exists in
 ```bash
 TARGET_TAG="<exact-image-tag>"
 curl -sL https://github.com/dotnet/versions/raw/refs/heads/main/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json \
-  | jq -r --arg tag "$TARGET_TAG" '[.repos[].images[].platforms[].simpleTags[]] | unique | map(select(. == $tag)) | .[]'
+  | jq -e --arg tag "$TARGET_TAG" 'any(.repos[].images[].platforms[].simpleTags[]; . == $tag)'
 ```
 
 If the exact tag is **not found in `image-info`**, stop and inform the user. Treat that as authoritative even if a registry lookup appears to work. The image must be created first at [dotnet/dotnet-buildtools-prereqs-docker](https://github.com/dotnet/dotnet-buildtools-prereqs-docker). Check if an open issue or PR already exists, for example:

eng/build.ps1

@@ -135,6 +135,29 @@ function Get-Help() {
   Write-Host "For more information, check out https://github.com/dotnet/runtime/blob/main/docs/workflow/README.md"
 }
 
+function Check-LongPathSupport() {
+  $regValue = Get-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -ErrorAction SilentlyContinue
+
+  if ($regValue -and $regValue.LongPathsEnabled -eq 1) {
+    return
+  }
+
+  Write-Host ""
+  Write-Host "ERROR: Long file paths are not enabled on this system." -ForegroundColor Red
+  Write-Host "The dotnet/runtime repository requires long path support to build successfully." -ForegroundColor Red
+  Write-Host ""
+  Write-Host "Please follow the instructions at:" -ForegroundColor Yellow
+  Write-Host "  docs\workflow\requirements\windows-requirements.md#enable-long-paths" -ForegroundColor Yellow
+  Write-Host ""
+  Write-Host "Quick fix:" -ForegroundColor Yellow
+  Write-Host "  1. Enable long paths in Windows (requires admin):" -ForegroundColor White
+  Write-Host "     https://learn.microsoft.com/windows/win32/fileio/maximum-file-path-limitation" -ForegroundColor White
+  Write-Host "  2. Enable long paths in Git:" -ForegroundColor White
+  Write-Host "     git config --system core.longpaths true" -ForegroundColor White
+  Write-Host ""
+  exit 1
+}
+
 if ($help) {
   Get-Help
   exit 0
@@ -152,6 +175,8 @@ if ($subset -eq 'help') {
   exit 0
 }
 
+Check-LongPathSupport
+
 # Lower-case the passed in OS string.
 if ($os) {
   $os = $os.ToLowerInvariant()

eng/native.wasm.targets

@@ -1,7 +1,12 @@
 <Project>
   <Import Project="$(RepositoryEngineeringDir)AcquireEmscriptenSdk.targets" />
 
-  <ItemGroup>
+  <!-- These packages provide ICU and timezone data paths for the native build (CMake).
+       Skip them during app-level relink (IsBrowserWasmProject) since the runtime pack
+       already includes the pre-built native files, and the NuGet contentFiles (timezone
+       data, READMEs) would pollute the app's Content items causing VFS/StaticWebAssets
+       validation failures. -->
+  <ItemGroup Condition="'$(IsBrowserWasmProject)' != 'true'">
     <PackageReference Condition="'$(TargetsWasm)' == 'true'" Include="Microsoft.NETCore.Runtime.ICU.Transport" PrivateAssets="all" Version="$(MicrosoftNETCoreRuntimeICUTransportVersion)" GeneratePathProperty="true" />
     <PackageReference Condition="'$(TargetsWasm)' == 'true'" Include="System.Runtime.TimeZoneData" PrivateAssets="all" Version="$(SystemRuntimeTimeZoneDataVersion)" GeneratePathProperty="true" />
   </ItemGroup>

eng/pipelines/common/evaluate-default-paths.yml

@@ -66,6 +66,11 @@ parameters:
         src/native/libs/Common/JavaScript/*
         src/native/libs/System.Native.Browser/*
         src/native/libs/System.Runtime.InteropServices.JavaScript.Native/*
+        src/native/package.json
+        src/native/package-lock.json
+        src/native/tsconfig.json
+        src/native/.npmrc
+        src/native/rollup.config*
     ]
     _wasm_chrome: [
         eng/testing/bump-chrome-version.proj

eng/pipelines/diagnostics/runtime-diag-job.yml

@@ -38,6 +38,7 @@ parameters:
   disableComponentGovernance: ''
   liveRuntimeDir: ''
   useCdac: false
+  noFallback: false
   classFilter: ''
 
 jobs:
@@ -89,6 +90,7 @@ jobs:
       - _TestArgs: '-test'
       - _Cross: ''
       - _CdacArgs: ''
+      - _NoFallbackArgs: ''
       - _ClassFilterArgs: ''
 
       - _buildScript: $(Build.SourcesDirectory)$(dir)build$(scriptExt)
@@ -105,6 +107,9 @@ jobs:
       - ${{ if eq(parameters.useCdac, 'true') }}:
         - _CdacArgs: '-useCdac'
 
+      - ${{ if eq(parameters.noFallback, 'true') }}:
+        - _NoFallbackArgs: '-noFallback'
+
       - ${{ if ne(parameters.classFilter, '') }}:
         - _ClassFilterArgs: '-classfilter ${{ parameters.classFilter }}'
 
@@ -201,6 +206,7 @@ jobs:
           -architecture ${{ parameters.archType }}
           -privatebuild
           $(_CdacArgs)
+          $(_NoFallbackArgs)
           -liveRuntimeDir ${{ parameters.liveRuntimeDir }}
           $(_TestArgs)
           $(_Cross)

eng/pipelines/runtime-diagnostics.yml

@@ -144,6 +144,60 @@ extends:
               displayName: 'Publish Test Results and SOS Logs'
               continueOnError: true
               condition: failed()
+      - template: /eng/pipelines/common/platform-matrix.yml
+        parameters:
+          jobTemplate: /eng/pipelines/diagnostics/runtime-diag-job.yml
+          buildConfig: release
+          platforms:
+          - windows_x64
+          # Workaround: microsoft/azure-pipelines-tasks#21871
+          variables:
+            - name: AllowPtrToDetectTestRunRetryFiles
+              value: false
+          jobParameters:
+            name: cDAC_no_fallback
+            useCdac: true
+            noFallback: true
+            classFilter: SOS
+            isOfficialBuild: ${{ variables.isOfficialBuild }}
+            liveRuntimeDir: $(Build.SourcesDirectory)/artifacts/runtime
+            timeoutInMinutes: 360
+            dependsOn:
+            - build_windows_x64_release_AllSubsets_CoreCLR
+            preBuildSteps:
+              - template: /eng/pipelines/common/download-artifact-step.yml
+                parameters:
+                  artifactName: BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig)_coreclr
+                  artifactFileName: BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig)_coreclr$(archiveExtension)
+                  unpackFolder: $(Build.SourcesDirectory)/artifacts/runtime
+                  displayName: 'Runtime Build Artifacts'
+            postBuildSteps:
+            - task: PublishTestResults@2
+              inputs:
+                testResultsFormat: xUnit
+                testResultsFiles: '**/*.xml'
+                searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults'
+                testRunTitle: 'Tests $(_PhaseName)'
+                failTaskOnFailedTests: true
+                publishRunAttachments: true
+                mergeTestResults: true
+                buildConfiguration: $(_BuildConfig)
+              continueOnError: true
+              condition: always()
+            - task: PublishPipelineArtifact@1
+              inputs:
+                targetPath: '$(Build.SourcesDirectory)/artifacts/tmp/$(_BuildConfig)/dumps'
+                artifactName: 'Dumps_cDAC_no_fallback_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig)_Attempt$(System.JobAttempt)'
+              displayName: 'Publish Crash Dumps'
+              continueOnError: true
+              condition: failed()
+            - task: PublishPipelineArtifact@1
+              inputs:
+                targetPath: '$(Build.SourcesDirectory)/artifacts/TestResults'
+                artifactName: 'TestResults_cDAC_no_fallback_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig)_Attempt$(System.JobAttempt)'
+              displayName: 'Publish Test Results and SOS Logs'
+              continueOnError: true
+              condition: failed()
       - template: /eng/pipelines/common/platform-matrix.yml
         parameters:
           jobTemplate: /eng/pipelines/diagnostics/runtime-diag-job.yml

eng/testing/tests.mobile.targets

@@ -46,13 +46,13 @@
   </PropertyGroup>
 
   <!-- When trimming non-exe projects, root the whole intermediate assembly.
-       The SDK settings root only the entry point by default. These targets are used not only for standard
-       console apps, but also for test projects without an entry point. -->
+       The SDK no longer creates a TrimmerRootAssembly item for Library projects (see
+       Microsoft.NET.ILLink.targets), so replace any existing item and create it when
+       absent to ensure RootMode="all". -->
   <Target Name="RootEntireIntermediateAssembly" AfterTargets="PrepareForILLink" Condition="'$(OutputType)' != 'Exe'">
     <ItemGroup>
-      <TrimmerRootAssembly Condition="'%(Identity)' == '$(AssemblyName)'">
-        <RootMode>all</RootMode>
-      </TrimmerRootAssembly>
+      <TrimmerRootAssembly Remove="@(IntermediateAssembly->'%(Filename)')" />
+      <TrimmerRootAssembly Include="@(IntermediateAssembly->'%(Filename)')" RootMode="all" />
     </ItemGroup>
   </Target>
 

src/coreclr/debug/daccess/dacdbiimpl.cpp

@@ -3853,31 +3853,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetRcwCachedInterfacePointers(VMP
 #endif // FEATURE_COMINTEROP
 }
 
-HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetCachedWinRTTypesForIIDs(VMPTR_AppDomain vmAppDomain, DacDbiArrayList<GUID> * pIids, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pTypes)
-{
-    if (pIids == NULL || pTypes == NULL)
-        return E_POINTER;
-
-    HRESULT hr = S_OK;
-    EX_TRY
-    {
-        pTypes->Alloc(0);
-    }
-    EX_CATCH_HRESULT(hr);
-    return hr;
-}
-
-HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetCachedWinRTTypes(VMPTR_AppDomain vmAppDomain, OUT DacDbiArrayList<GUID> * piids, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pTypes)
-{
-    HRESULT hr = S_OK;
-    EX_TRY
-    {
-        pTypes->Alloc(0);
-    }
-    EX_CATCH_HRESULT(hr);
-    return hr;
-}
-
 //-----------------------------------------------------------------------------
 // DacDbiInterfaceImpl::FindField
 // Finds information for a particular class field

src/coreclr/debug/daccess/dacdbiimpl.h

@@ -325,15 +325,6 @@ class DacDbiInterfaceImpl :
     // in the runtime)
     HRESULT STDMETHODCALLTYPE GetRcwCachedInterfacePointers(VMPTR_Object vmObject, BOOL bIInspectableOnly, OUT DacDbiArrayList<CORDB_ADDRESS> * pDacItfPtrs);
 
-    // retrieves a list of interface types corresponding to the passed in
-    // list of IIDs. the interface types are retrieved from an app domain
-    // IID / Type cache, that is updated as new types are loaded. will
-    // have NULL entries corresponding to unknown IIDs in "iids"
-    HRESULT STDMETHODCALLTYPE GetCachedWinRTTypesForIIDs(VMPTR_AppDomain vmAppDomain, DacDbiArrayList<GUID> * pIids, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pTypes);
-
-    // retrieves the whole app domain cache of IID / Type mappings.
-    HRESULT STDMETHODCALLTYPE GetCachedWinRTTypes(VMPTR_AppDomain vmAppDomain, OUT DacDbiArrayList<GUID> * piids, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pTypes);
-
 private:
     // Helper to enumerate all possible memory ranges help by a loader allocator.
     void EnumerateMemRangesForLoaderAllocator(

src/coreclr/debug/inc/dacdbiinterface.h

@@ -1788,16 +1788,6 @@ IDacDbiInterface : public IUnknown
     // in the runtime)
     virtual HRESULT STDMETHODCALLTYPE GetRcwCachedInterfacePointers(VMPTR_Object vmObject, BOOL bIInspectableOnly, OUT DacDbiArrayList<CORDB_ADDRESS> * pDacItfPtrs) = 0;
 
-    // retrieves a list of interface types corresponding to the passed in
-    // list of IIDs. the interface types are retrieved from an app domain
-    // IID / Type cache, that is updated as new types are loaded. will
-    // have NULL entries corresponding to unknown IIDs in "iids"
-    virtual HRESULT STDMETHODCALLTYPE GetCachedWinRTTypesForIIDs(VMPTR_AppDomain vmAppDomain, DacDbiArrayList<GUID> * pIids, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pTypes) = 0;
-
-    // retrieves the whole app domain cache of IID / Type mappings.
-    virtual HRESULT STDMETHODCALLTYPE GetCachedWinRTTypes(VMPTR_AppDomain vmAppDomain, OUT DacDbiArrayList<GUID> * piids, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pTypes) = 0;
-
-
     // ----------------------------------------------------------------------------
     // functions to get information about reference/handle referents for ICDValue
     // ----------------------------------------------------------------------------