Merge in 'release/7.0' changes

dotnet · Nov 23, 2023 · 46826e2 · 46826e2
2 parents 98fd5f3 + e1dc89d
commit 46826e2
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 94 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-rtm.23512.1">
+    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-rtm.23565.2">
       <Uri>https://github.com/dotnet/icu</Uri>
-      <Sha>17f1c7cf5247e5ff4d344591ea966334a4f99ff5</Sha>
+      <Sha>d89651b995bbb9565a3674ddf77b187cb6f9f26d</Sha>
     </Dependency>
     <Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22459.1">
       <Uri>https://github.com/dotnet/msquic</Uri>
@@ -130,57 +130,57 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>ca53a3149aaedb03e5d79ee0e259d31ac8719290</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
-    <Dependency Name="System.Data.Common.TestData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.Data.Common.TestData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
-    <Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
-    <Dependency Name="System.Net.TestData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.Net.TestData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
-    <Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
-    <Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.23558.6">
+    <Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
     <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.23115.1">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -278,13 +278,13 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
       <Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="7.0.0-alpha.0.23518.3">
+    <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="7.0.0-alpha.0.23566.1">
       <Uri>https://github.com/dotnet/hotreload-utils</Uri>
-      <Sha>35e8f5f8842cb0675d55b2c56c6a83850682d2c4</Sha>
+      <Sha>6d7ba7d63a9c246a6477bda4d19c3315fd91868f</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.23558.6">
+    <Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.23566.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>605b790fd95949be53a09ef08ea83318b67fc291</Sha>
+      <Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22559.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -118,20 +118,20 @@
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
     <runtimenativeSystemIOPortsVersion>7.0.0-rc.1.22414.6</runtimenativeSystemIOPortsVersion>
     <!-- Runtime-Assets dependencies -->
-    <SystemRuntimeNumericsTestDataVersion>7.0.0-beta.23558.6</SystemRuntimeNumericsTestDataVersion>
-    <SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.23558.6</SystemComponentModelTypeConverterTestDataVersion>
-    <SystemDataCommonTestDataVersion>7.0.0-beta.23558.6</SystemDataCommonTestDataVersion>
-    <SystemDrawingCommonTestDataVersion>7.0.0-beta.23558.6</SystemDrawingCommonTestDataVersion>
-    <SystemFormatsTarTestDataVersion>7.0.0-beta.23558.6</SystemFormatsTarTestDataVersion>
-    <SystemIOCompressionTestDataVersion>7.0.0-beta.23558.6</SystemIOCompressionTestDataVersion>
-    <SystemIOPackagingTestDataVersion>7.0.0-beta.23558.6</SystemIOPackagingTestDataVersion>
-    <SystemNetTestDataVersion>7.0.0-beta.23558.6</SystemNetTestDataVersion>
-    <SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.23558.6</SystemPrivateRuntimeUnicodeDataVersion>
-    <SystemRuntimeTimeZoneDataVersion>7.0.0-beta.23558.6</SystemRuntimeTimeZoneDataVersion>
-    <SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.23558.6</SystemSecurityCryptographyX509CertificatesTestDataVersion>
-    <SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.23558.6</SystemTextRegularExpressionsTestDataVersion>
-    <SystemWindowsExtensionsTestDataVersion>7.0.0-beta.23558.6</SystemWindowsExtensionsTestDataVersion>
-    <MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.23558.6</MicrosoftDotNetCilStripSourcesVersion>
+    <SystemRuntimeNumericsTestDataVersion>7.0.0-beta.23566.2</SystemRuntimeNumericsTestDataVersion>
+    <SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.23566.2</SystemComponentModelTypeConverterTestDataVersion>
+    <SystemDataCommonTestDataVersion>7.0.0-beta.23566.2</SystemDataCommonTestDataVersion>
+    <SystemDrawingCommonTestDataVersion>7.0.0-beta.23566.2</SystemDrawingCommonTestDataVersion>
+    <SystemFormatsTarTestDataVersion>7.0.0-beta.23566.2</SystemFormatsTarTestDataVersion>
+    <SystemIOCompressionTestDataVersion>7.0.0-beta.23566.2</SystemIOCompressionTestDataVersion>
+    <SystemIOPackagingTestDataVersion>7.0.0-beta.23566.2</SystemIOPackagingTestDataVersion>
+    <SystemNetTestDataVersion>7.0.0-beta.23566.2</SystemNetTestDataVersion>
+    <SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.23566.2</SystemPrivateRuntimeUnicodeDataVersion>
+    <SystemRuntimeTimeZoneDataVersion>7.0.0-beta.23566.2</SystemRuntimeTimeZoneDataVersion>
+    <SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.23566.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
+    <SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.23566.2</SystemTextRegularExpressionsTestDataVersion>
+    <SystemWindowsExtensionsTestDataVersion>7.0.0-beta.23566.2</SystemWindowsExtensionsTestDataVersion>
+    <MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.23566.2</MicrosoftDotNetCilStripSourcesVersion>
     <!-- dotnet-optimization dependencies -->
     <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx64MIBCRuntimeVersion>
     <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -157,7 +157,7 @@
     <MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.23455.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
     <MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.23455.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
     <MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.23455.3</MicrosoftDotNetXHarnessCLIVersion>
-    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.23518.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
+    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.23566.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
     <XUnitVersion>2.4.2</XUnitVersion>
     <XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
     <XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
@@ -177,7 +177,7 @@
     <MicrosoftNETILLinkTasksVersion>7.0.100-1.23401.1</MicrosoftNETILLinkTasksVersion>
     <MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
     <!-- ICU -->
-    <MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.23512.1</MicrosoftNETCoreRuntimeICUTransportVersion>
+    <MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.23565.2</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- MsQuic -->
     <MicrosoftNativeQuicMsQuicVersion>2.2.3</MicrosoftNativeQuicMsQuicVersion>
     <SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22459.1</SystemNetMsQuicTransportVersion>

diff --git a/eng/pipelines/libraries/outerloop.yml b/eng/pipelines/libraries/outerloop.yml
@@ -13,35 +13,10 @@ variables:
 
 jobs:
 
-  #
-  # CoreCLR Build
-  #
   - template: /eng/pipelines/common/platform-matrix.yml
     parameters:
-      jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
-      buildConfig: release
-      platforms:
-      - ${{ if eq(variables['includeWindowsOuterloop'], true) }}:
-        - windows_x64
-        - windows_x86
-      - ${{ if eq(variables['includeLinuxOuterloop'], true) }}:
-        - Linux_x64
-        - Linux_musl_x64
-        - ${{ if eq(variables['isRollingBuild'], true) }}:
-          - Linux_arm
-          - Linux_arm64
-          - Linux_musl_arm64
-      - ${{ if eq(variables['includeOsxOuterloop'], true) }}:        
-        - OSX_arm64
-        - OSX_x64
-      jobParameters:
-        testGroup: innerloop
-  #
-  # Libraries Build
-  #
-  - template: /eng/pipelines/common/platform-matrix.yml
-    parameters:
-      jobTemplate: /eng/pipelines/libraries/build-job.yml
+      jobTemplate: /eng/pipelines/common/global-build-job.yml
+      helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
       buildConfig: Release
       platforms:
       - ${{ if eq(variables['includeWindowsOuterloop'], true) }}:
@@ -58,18 +33,24 @@ jobs:
       - ${{ if and(eq(variables['includeOsxOuterloop'], true), eq(variables['isRollingBuild'], true)) }}:
         - OSX_arm64
         - OSX_x64
-      helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
       jobParameters:
-        isOfficialBuild: ${{ variables['isOfficialBuild'] }}
-        includeAllPlatforms: ${{ variables['isRollingBuild'] }}
-        runTests: true
         testScope: outerloop
-        liveRuntimeBuildConfig: release
-
+        nameSuffix: CoreCLR_Release
+        buildArgs: -s clr+host.native+libs+libs.tests -c $(_BuildConfig) -rc Release -testscope outerloop /p:ArchiveTests=true
+        timeoutInMinutes: 180
+        includeAllPlatforms: ${{ variables['isRollingBuild'] }}
+        # extra steps, run tests
+        extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+        extraStepsParameters:
+          testScope: outerloop
+          creator: dotnet-bot
+          testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
+
   - ${{ if eq(variables['isRollingBuild'], false) }}:
     - template: /eng/pipelines/common/platform-matrix.yml
       parameters:
-        jobTemplate: /eng/pipelines/libraries/build-job.yml
+        jobTemplate: /eng/pipelines/common/global-build-job.yml
+        helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
         buildConfig: Debug
         platforms:
         - ${{ if eq(variables['includeWindowsOuterloop'], true) }}:
@@ -80,27 +61,39 @@ jobs:
         - ${{ if eq(variables['includeOsxOuterloop'], true) }}:
           - OSX_arm64
           - OSX_x64
-        helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
         jobParameters:
-          isOfficialBuild: ${{ variables['isOfficialBuild'] }}
-          includeAllPlatforms: ${{ variables['isRollingBuild'] }}
-          runTests: true
           testScope: outerloop
-          liveRuntimeBuildConfig: release
+          nameSuffix: CoreCLR_Release
+          buildArgs: -s clr+host.native+libs+libs.tests -c $(_BuildConfig) -rc Release -testscope outerloop /p:ArchiveTests=true
+          timeoutInMinutes: 180
+          includeAllPlatforms: ${{ variables['isRollingBuild'] }}
+          # extra steps, run tests
+          extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+          extraStepsParameters:
+            testScope: outerloop
+            creator: dotnet-bot
+            testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
 
   - ${{ if eq(variables['includeWindowsOuterloop'], true) }}:
     - template: /eng/pipelines/common/platform-matrix.yml
       parameters:
-        jobTemplate: /eng/pipelines/libraries/build-job.yml
+        jobTemplate: /eng/pipelines/common/global-build-job.yml
+        helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
         buildConfig: Release
         platforms:
         - windows_x86
         - ${{ if eq(variables['isRollingBuild'], true) }}:
           - windows_x64
-        helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
         jobParameters:
-          isOfficialBuild: ${{ variables['isOfficialBuild'] }}
-          includeAllPlatforms: ${{ variables['isRollingBuild'] }}
           framework: net48
-          runTests: true
           testScope: outerloop
+          nameSuffix: NET48
+          buildArgs: -s libs+libs.tests -c $(_BuildConfig) -testscope outerloop /p:ArchiveTests=true -f net48
+          timeoutInMinutes: 180
+          includeAllPlatforms: ${{ variables['isRollingBuild'] }}
+          # extra steps, run tests
+          extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+          extraStepsParameters:
+            testScope: outerloop
+            creator: dotnet-bot
+            extraHelixArguments: /p:BuildTargetFramework=net48
diff --git a/src/coreclr/debug/daccess/enummem.cpp b/src/coreclr/debug/daccess/enummem.cpp
@@ -225,6 +225,34 @@ HRESULT ClrDataAccess::EnumMemCLRStatic(IN CLRDataEnumMemoryFlags flags)
 
         ReportMem(g_gcDacGlobals.GetAddr(), sizeof(GcDacVars));
 
+        PTR_WSTR entryAssemblyPath = (PTR_WSTR)g_EntryAssemblyPath;
+        entryAssemblyPath.EnumMem();
+
+        // Triage dumps must not include full paths (PII data). Replace entry assembly path with file name only.
+        if (flags == CLRDATA_ENUM_MEM_TRIAGE)
+        {
+            WCHAR* path = entryAssemblyPath;
+            if (path != NULL)
+            {
+                size_t pathLen = wcslen(path) + 1;
+
+                // Get the file name based on the last directory separator
+                const WCHAR* name = wcsrchr(path, DIRECTORY_SEPARATOR_CHAR_W);
+                if (name != NULL)
+                {
+                    name += 1;
+                    size_t len = wcslen(name) + 1;
+                    wcscpy_s(path, len, name);
+
+                    // Null out the rest of the buffer
+                    for (size_t i = len; i < pathLen; ++i)
+                        path[i] = W('\0');
+
+                    DacUpdateMemoryRegion(entryAssemblyPath.GetAddr(), pathLen, (BYTE*)path);
+                }
+            }
+        }
+
         // We need all of the dac variables referenced by the GC DAC global struct.
         // This struct contains pointers to pointers, so we first dereference the pointers
         // to obtain the location of the variable that's reported.

diff --git a/src/coreclr/inc/daccess.h b/src/coreclr/inc/daccess.h
@@ -1487,10 +1487,10 @@ class __Str16Ptr : public __DPtr<WCHAR>
     }
     void EnumMem(void) const
     {
-        char* str = DacInstantiateStringW(m_addr, maxChars, false);
+        WCHAR* str = DacInstantiateStringW(m_addr, maxChars, false);
         if (str)
         {
-            DacEnumMemoryRegion(m_addr, strlen(str) + 1);
+            DacEnumMemoryRegion(m_addr, wcslen(str) + 1);
         }
     }
 };

diff --git a/src/coreclr/inc/dacvars.h b/src/coreclr/inc/dacvars.h
@@ -244,5 +244,7 @@ DEFINE_DACVAR(SIZE_T, dac__g_clrNotificationArguments, ::g_clrNotificationArgume
 DEFINE_DACVAR(bool, dac__g_metadataUpdatesApplied, ::g_metadataUpdatesApplied)
 #endif
 
+DEFINE_DACVAR(PTR_WSTR, dac__g_EntryAssemblyPath, ::g_EntryAssemblyPath)
+
 #undef DEFINE_DACVAR
 #undef DEFINE_DACVAR_NO_DUMP
diff --git a/src/coreclr/vm/corhost.cpp b/src/coreclr/vm/corhost.cpp
@@ -332,6 +332,15 @@ HRESULT CorHost2::ExecuteAssembly(DWORD dwAppDomainId,
 
     _ASSERTE (!pThread->PreemptiveGCDisabled());
 
+    if (g_EntryAssemblyPath == NULL)
+    {
+        // Store the entry assembly path for diagnostic purposes (for example, dumps)
+        size_t len = wcslen(pwzAssemblyPath) + 1;
+        NewArrayHolder<WCHAR> path { new WCHAR[len] };
+        wcscpy_s(path, len, pwzAssemblyPath);
+        g_EntryAssemblyPath = path.Extract();
+    }
+
     Assembly *pAssembly = AssemblySpec::LoadAssembly(pwzAssemblyPath);
 
 #if defined(FEATURE_MULTICOREJIT)

diff --git a/src/coreclr/vm/vars.cpp b/src/coreclr/vm/vars.cpp
@@ -104,6 +104,8 @@ GVAL_IMPL_INIT(DWORD, g_debuggerWordTLSIndex, TLS_OUT_OF_INDEXES);
 #endif
 GVAL_IMPL_INIT(DWORD, g_TlsIndex, TLS_OUT_OF_INDEXES);
 
+GVAL_IMPL_INIT(PTR_WSTR, g_EntryAssemblyPath, NULL);
+
 #ifndef DACCESS_COMPILE
 
 // <TODO> @TODO - PROMOTE. </TODO>

diff --git a/src/coreclr/vm/vars.hpp b/src/coreclr/vm/vars.hpp
@@ -396,6 +396,9 @@ GVAL_DECL(DWORD,            g_debuggerWordTLSIndex);
 #endif
 GVAL_DECL(DWORD,            g_TlsIndex);
 
+// Full path to the managed entry assembly - stored for ease of identifying the entry asssembly for diagnostics
+GVAL_DECL(PTR_WSTR, g_EntryAssemblyPath);
+
 // Global System Information
 extern SYSTEM_INFO g_SystemInfo;