Merged PR 34793: [internal/release/8.0] Merge from public

Merge from public release/8.0 to internal/release/8.0 and resolve conflicts if necessary

NuGet.config

@@ -7,6 +7,11 @@
  </fallbackPackageFolders>
  <packageSources>
  <clear />
+ <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+ <!-- Begin: Package sources from dotnet-emsdk -->
+ <add key="darc-pub-dotnet-emsdk-51bf18a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-51bf18a2/nuget/v3/index.json" />
+ <!-- End: Package sources from dotnet-emsdk -->
+ <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
  <!--
  'src/test/PrepareTestAssets/PrepareTestAssets.proj' generates a NuGet.config file using this
  one as a template. The following line is a marker to insert the test restore sources.

docs/project/list-of-diagnostics.md

@@ -251,7 +251,7 @@ The diagnostic id values reserved for .NET Libraries analyzer warnings are `SYSL
 | __`SYSLIB1214`__ | Options validation generator: Can't validate constants, static fields or properties. |
 | __`SYSLIB1215`__ | Options validation generator: Validation attribute on the member is inaccessible from the validator type. |
 | __`SYSLIB1216`__ | C# language version not supported by the options validation source generator. |
-| __`SYSLIB1217`__ | *_`SYSLIB1201`-`SYSLIB1219` reserved for Microsoft.Extensions.Options.SourceGeneration.* |
+| __`SYSLIB1217`__ | The validation attribute is only applicable to properties of type string, array, or ICollection; it cannot be used with other types. |
 | __`SYSLIB1218`__ | *_`SYSLIB1201`-`SYSLIB1219` reserved for Microsoft.Extensions.Options.SourceGeneration.* |
 | __`SYSLIB1219`__ | *_`SYSLIB1201`-`SYSLIB1219` reserved for Microsoft.Extensions.Options.SourceGeneration.* |
 | __`SYSLIB1220`__ | JsonSourceGenerator encountered a [JsonConverterAttribute] with an invalid type argument. |

eng/Analyzers.targets

@@ -1,4 +1,11 @@
 <Project>
+ <PropertyGroup Condition="'$(UsingMicrosoftNoTargetsSdk)' == 'true' or
+ '$(UsingMicrosoftDotNetSharedFrameworkSdk)' == 'true' or
+ '$(MSBuildProjectExtension)' == '.pkgproj' or
+ '$(UsingMicrosoftTraversalSdk)' == 'true'">
+ <!-- Explicitly disable running analyzers to avoid trying to discover the correct ILLink tool pack for a project that has no sources. -->
+ <RunAnalyzers>false</RunAnalyzers>
+ </PropertyGroup>
  <PropertyGroup>
  <!-- Disable analyzers in sourcebuild -->
  <RunAnalyzers Condition="'$(DotNetBuildFromSource)' == 'true'">false</RunAnalyzers>

eng/Subsets.props

@@ -502,7 +502,7 @@
  <ItemGroup Condition="'$(PgoInstrument)' != 'true'">
  <SharedFrameworkProjectToBuild Condition="'$(BuildMonoAOTCrossCompilerOnly)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Ref.sfxproj" />
  </ItemGroup>
- <ItemGroup Condition="'$(BuildNativeAOTRuntimePack)' != 'true'">
+ <ItemGroup Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(PgoInstrument)' != 'true'">
  <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Host.sfxproj" />
  <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
  <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-host.proj" />
@@ -512,7 +512,7 @@
  <SharedFrameworkProjectToBuild Condition="'$(MonoCrossAOTTargetOS)' != ''" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\monocrossaot.sfxproj" Pack="true" />
  </ItemGroup>
  <ItemGroup>
- <ProjectToBuild Condition="'$(NativeAotSupported)' == 'true' and '$(RuntimeFlavor)' != 'Mono'" Include="$(InstallerProjectRoot)\pkg\projects\nativeaot-packages.proj" Category="packs" />
+ <ProjectToBuild Condition="'$(NativeAotSupported)' == 'true' and '$(RuntimeFlavor)' != 'Mono' and '$(PgoInstrument)' != 'true'" Include="$(InstallerProjectRoot)\pkg\projects\nativeaot-packages.proj" Category="packs" />
  </ItemGroup>
  <ItemGroup>
  <SharedFrameworkProjectToBuild Condition="'$(BuildMonoAOTCrossCompilerOnly)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Runtime.sfxproj" />

eng/common/sdk-task.ps1

@@ -64,7 +64,7 @@ try {
  $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
  }
  if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
- $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty
+ $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
  }
  if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
  $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

eng/common/tools.ps1

@@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
  }
 
  # Minimum VS version to require.
- $vsMinVersionReqdStr = '17.6'
+ $vsMinVersionReqdStr = '17.7'
  $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)
 
  # If the version of msbuild is going to be xcopied,
  # use this version. Version matches a package here:
- # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2
- $defaultXCopyMSBuildVersion = '17.6.0-2'
+ # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
+ $defaultXCopyMSBuildVersion = '17.8.1-2'
 
  if (!$vsRequirements) {
  if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

eng/native/ijw/IJW.cmake

@@ -51,7 +51,7 @@ if (CLR_CMAKE_HOST_WIN32)
 
  # 4365 - signed/unsigned mismatch
  # 4679 - Could not import member. This is an issue with IJW and static abstract methods in interfaces.
- add_compile_options(/wd4365 /wd4679)
+ add_compile_options(/wd4365 /wd4679 /wd5271)
 
  # IJW
  add_compile_options(/clr:netcore)

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

@@ -241,6 +241,7 @@ jobs:
  - src/mono/tools/*
  - src/mono/wasi/*
  - src/mono/wasm/debugger/*
+ - src/mono/wasm/host/*
  - src/mono/wasm/Wasm.Build.Tests/*
  - ${{ parameters._const_paths._wasm_pipelines }}
  - ${{ parameters._const_paths._always_exclude }}
@@ -258,6 +259,7 @@ jobs:
  - eng/testing/workloads-testing.targets
  - src/mono/mono/component/mini-wasm-debugger.c
  - src/mono/wasm/debugger/*
+ - src/mono/wasm/host/*
  - src/mono/wasm/Wasm.Build.Tests/*
  - src/mono/nuget/Microsoft.NET.Runtime*
  src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/*

eng/pipelines/common/xplat-setup.yml

@@ -108,7 +108,7 @@ jobs:
  - ${{ if eq(parameters.archType, 'wasm') }}:
  - name: wasmDarcDependenciesChanged
  value: $[ or(
- eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport'], true),
+ eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100'], true),
  eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_DotNet_Build_Tasks_Workloads'], true),
  eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.System_Runtime_TimeZoneData'], true),
  eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_Net_Compilers_Toolset'], true),

eng/pipelines/coreclr/perf.yml

@@ -3,7 +3,7 @@ trigger:
  branches:
  include:
  - main
- - release/8.0-rc1
+ - release/8.0
  paths:
  include:
  - '*'

eng/pipelines/runtime-llvm.yml

@@ -119,7 +119,7 @@ extends:
  testGroup: innerloop
  nameSuffix: AllSubsets_Mono_LLVMAOT
  buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
- /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+ /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
  condition: >-
  or(
  eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -138,7 +138,7 @@ extends:
  testGroup: innerloop
  nameSuffix: AllSubsets_Mono_LLVMAOT
  buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
- /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+ /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
  condition: >-
  or(
  eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),

eng/pipelines/runtime-official.yml

@@ -334,7 +334,7 @@ extends:
  runtimeFlavor: mono
  jobParameters:
  buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
- /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+ /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
  nameSuffix: AllSubsets_Mono_LLVMAOT
  runtimeVariant: LLVMAOT
  isOfficialBuild: ${{ variables.isOfficialBuild }}

eng/pipelines/runtime-wasm-perf.yml

@@ -3,6 +3,7 @@
 # UI to this, and thus avoid any scheduled triggers
 
 trigger: none
+pr: none
 
 variables:
  - template: /eng/pipelines/common/variables.yml

eng/pipelines/runtime.yml

@@ -556,6 +556,47 @@ extends:
  extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
  alwaysRun: ${{ variables.isRollingBuild }}
 
+ #
+ # Android devices
+ # Build the whole product using Mono and run libraries tests
+ #
+ - template: /eng/pipelines/common/platform-matrix.yml
+ parameters:
+ jobTemplate: /eng/pipelines/common/global-build-job.yml
+ helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+ buildConfig: Release
+ runtimeFlavor: mono
+ platforms:
+ - android_arm
+ - android_arm64
+ variables:
+ # map dependencies variables to local variables
+ - name: librariesContainsChange
+ value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
+ - name: monoContainsChange
+ value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
+ jobParameters:
+ testGroup: innerloop
+ nameSuffix: AllSubsets_Mono
+ buildArgs: -s mono+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true /p:RunSmokeTestsOnly=true /p:EnableAdditionalTimezoneChecks=true
+ timeoutInMinutes: 480
+ condition: >-
+ or(
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
+ eq(variables['isRollingBuild'], true))
+ # extra steps, run tests
+ extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+ extraStepsParameters:
+ creator: dotnet-bot
+ testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+ condition: >-
+ or(
+ eq(variables['librariesContainsChange'], true),
+ eq(variables['monoContainsChange'], true),
+ eq(variables['isRollingBuild'], true))
+
  #
  # iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
  # Build the whole product using Mono and run libraries tests
@@ -739,7 +780,7 @@ extends:
  testGroup: innerloop
  nameSuffix: AllSubsets_Mono_LLVMAOT
  buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
- /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+ /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
  condition: >-
  or(
  eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -758,7 +799,7 @@ extends:
  testGroup: innerloop
  nameSuffix: AllSubsets_Mono_LLVMAOT
  buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
- /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+ /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
  condition: >-
  or(
  eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -1277,7 +1318,7 @@ extends:
  testGroup: innerloop
  nameSuffix: AllSubsets_Mono_LLVMAot_RuntimeTests
  runtimeVariant: llvmaot
- buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+ buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release /p:MonoEnableLLVM=true /p:MonoAOTEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
  timeoutInMinutes: 180
 
  condition: >-

eng/resolveContract.targets

@@ -73,8 +73,9 @@
  That is necessary as APICompat is invoked twice, once for the ref <-> src comparision and then again
  for the package validation (which doesn't include reference assemblies). As both operations don't have
  all the inputs available, some suppressions might only apply to one or the other and hence unnecessary
- suppressions can't be determined. -->
- <PropertyGroup Condition="'$(IsPackable)' == 'true' and '$(IsRuntimeAndReferenceAssembly)' != 'true'">
+ suppressions can't be determined.
+ Disable the validation under source build as that might use an out-of-date SDK and not the ApiCompat.Task package. -->
+ <PropertyGroup Condition="('$(IsPackable)' == 'true' and '$(IsRuntimeAndReferenceAssembly)' != 'true') or '$(DotNetBuildFromSource)' == 'true'">
  <ApiCompatPreserveUnnecessarySuppressions>true</ApiCompatPreserveUnnecessarySuppressions>
  <ApiCompatPermitUnnecessarySuppressions>true</ApiCompatPermitUnnecessarySuppressions>
  </PropertyGroup>

eng/testing/performance/performance-setup.ps1

@@ -101,7 +101,7 @@ if ($iOSNativeAOT) {
 }
 
 # FIX ME: This is a workaround until we get this from the actual pipeline
-$CleanedBranchName = "main"
+$CleanedBranchName = "release/8.0"
 if($Branch.Contains("refs/heads/release"))
 {
  $CleanedBranchName = $Branch.replace('refs/heads/', '')

eng/testing/performance/performance-setup.sh

@@ -358,9 +358,7 @@ if [[ "$physicalpromotion" == "true" ]]; then
  configurations="$configurations PhysicalPromotionType=physicalpromotion"
 fi
 
-
-
-cleaned_branch_name="main"
+cleaned_branch_name="release/8.0"
 if [[ $branch == *"refs/heads/release"* ]]; then
  cleaned_branch_name=${branch/refs\/heads\//}
 fi
@@ -404,15 +402,14 @@ if [[ -n "$wasm_bundle_directory" ]]; then
  using_wasm=true
  wasm_bundle_directory_path=$payload_directory
  mv $wasm_bundle_directory/* $wasm_bundle_directory_path
- find $wasm_bundle_directory_path -type d
- wasm_args="--experimental-wasm-eh --expose_wasm"
+ wasm_args="--expose_wasm"
  if [ "$javascript_engine" == "v8" ]; then
  # for es6 module support
  wasm_args="$wasm_args --module"
  fi
 
  # Workaround: escaping the quotes around `--wasmArgs=..` so they get retained for the actual command line
- extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmEngine /home/helixbot/.jsvu/bin/$javascript_engine --wasmArgs \\\"$wasm_args\\\" --cli \$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet --wasmDataDir \$HELIX_CORRELATION_PAYLOAD/wasm-data"
+ extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmEngine /home/helixbot/.jsvu/bin/$javascript_engine \\\"--wasmArgs=$wasm_args\\\" --cli \$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet --wasmDataDir \$HELIX_CORRELATION_PAYLOAD/wasm-data"
  if [[ "$wasmaot" == "true" ]]; then
  extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --aotcompilermode wasm --buildTimeout 3600"
  fi

global.json

@@ -1,16 +1,16 @@
 {
  "sdk": {
- "version": "8.0.100-preview.7.23376.3",
+ "version": "8.0.100-rtm.23506.1",
  "allowPrerelease": true,
  "rollForward": "major"
  },
  "tools": {
- "dotnet": "8.0.100-preview.7.23376.3"
+ "dotnet": "8.0.100-rtm.23506.1"
  },
  "msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23463.1",
- "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23463.1",
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23516.4",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23516.4",
+ "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23516.4",
  "Microsoft.Build.NoTargets": "3.7.0",
  "Microsoft.Build.Traversal": "3.4.0",
  "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"

src/coreclr/debug/daccess/dacdbiimpl.cpp

@@ -7788,8 +7788,9 @@ HRESULT DacStackReferenceWalker::Next(ULONG count, DacGcReference stackRefs[], U
  stackRefs[i].i64ExtraData = 0;
 
  const SOSStackRefData &sosStackRef = mList.Get(i);
- if (sosStackRef.Flags & GC_CALL_INTERIOR)
+ if (sosStackRef.Flags & GC_CALL_INTERIOR || sosStackRef.Address == 0)
  {
+ // Direct pointer case - interior pointer, Frame ref, or enregistered var.
  stackRefs[i].pObject = CLRDATA_ADDRESS_TO_TADDR(sosStackRef.Object) | 1;
  }
  else

src/coreclr/debug/daccess/dacimpl.h

@@ -1253,17 +1253,6 @@ class ClrDataAccess
  /* [out] */ union STUB_BUF* outBuffer,
  /* [out] */ ULONG32* outFlags);
 
- DebuggerJitInfo* GetDebuggerJitInfo(MethodDesc* methodDesc,
- TADDR addr)
- {
- if (g_pDebugger)
- {
- return g_pDebugger->GetJitInfo(methodDesc, (PBYTE)addr, NULL);
- }
-
- return NULL;
- }
-
  HRESULT GetMethodExtents(MethodDesc* methodDesc,
  METH_EXTENTS** extents);
  HRESULT GetMethodVarInfo(MethodDesc* methodDesc,

src/coreclr/debug/daccess/task.cpp

@@ -5225,7 +5225,7 @@ EnumMethodInstances::Next(ClrDataAccess* dac,
  }
  }
 
- if (!m_methodIter.Current()->HasNativeCodeReJITAware())
+ if (!m_methodIter.Current()->HasNativeCodeAnyVersion())
  {
  goto NextMethod;
  }
@@ -5243,7 +5243,7 @@ EnumMethodInstances::CdStart(MethodDesc* methodDesc,
  CLRDATA_ENUM* handle)
 {
  if (!methodDesc->HasClassOrMethodInstantiation() &&
- !methodDesc->HasNativeCodeReJITAware())
+ !(methodDesc->HasNativeCodeAnyVersion()))
  {
  *handle = 0;
  return S_FALSE;

src/coreclr/debug/di/breakpoint.cpp

@@ -211,11 +211,13 @@ HRESULT CordbFunctionBreakpoint::Activate(BOOL fActivate)
  if (codeIsIL)
  {
  pEvent->BreakpointData.nativeCodeMethodDescToken = pEvent->BreakpointData.nativeCodeMethodDescToken.NullPtr();
+ pEvent->BreakpointData.codeStartAddress = 0;
  }
  else
  {
  pEvent->BreakpointData.nativeCodeMethodDescToken =
  (m_code.GetValue()->AsNativeCode())->GetVMNativeCodeMethodDescToken().ToLsPtr();
+ pEvent->BreakpointData.codeStartAddress = (m_code.GetValue()->AsNativeCode())->GetAddress();
  }
 
  // Note: we're sending a two-way event, so it blocks here

src/coreclr/debug/di/rsclass.cpp

@@ -132,6 +132,7 @@ HRESULT CordbClass::GetStaticFieldValue(mdFieldDef fieldDef,
  IMetaDataImport * pImport = NULL;
  EX_TRY
  {
+ RSLockHolder lockHolder(GetProcess()->GetProcessLock());
  pImport = GetModule()->GetMetaDataImporter(); // throws
 
  // Validate the token.
@@ -1191,4 +1192,3 @@ HRESULT CordbClass::SearchFieldInfo(
  // Well, the field doesn't even belong to this class...
  ThrowHR(E_INVALIDARG);
 }
-