Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3305c0d

Browse files
lewinglewing
authored
Merge branch 'main' into darc-main-abc22c75-facf-4a55-8588-b652d484bb5b
2 parents 7176889 + d31ce26 commit 3305c0d

File tree

98 files changed

+6141
-6453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+6141
-6453
lines changed

‎eng/Version.Details.xml‎

Lines changed: 68 additions & 68 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@
109109
<!-- ILAsm dependencies -->
110110
<MicrosoftNETCoreILAsmVersion>9.0.0-alpha.1.24072.1</MicrosoftNETCoreILAsmVersion>
111111
<!-- ObjWriter dependencies -->
112-
<runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24072.3</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
113-
<runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24072.3</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
114-
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24072.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>
115-
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24072.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>
116-
<runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24072.3</runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>
117-
<runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24072.3</runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>
118-
<runtimeosxarm64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24072.3</runtimeosxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
119-
<runtimeosxx64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24072.3</runtimeosxx64MicrosoftNETCoreRuntimeObjWriterVersion>
112+
<runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24080.1</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
113+
<runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24080.1</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
114+
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24080.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>
115+
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24080.1</runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>
116+
<runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24080.1</runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>
117+
<runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24080.1</runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>
118+
<runtimeosxarm64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24080.1</runtimeosxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
119+
<runtimeosxx64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.24080.1</runtimeosxx64MicrosoftNETCoreRuntimeObjWriterVersion>
120120
<!-- Libraries dependencies -->
121121
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
122122
<MicrosoftBclHashCodeVersion>1.1.1</MicrosoftBclHashCodeVersion>
@@ -168,14 +168,14 @@
168168
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.24071.2</optimizationPGOCoreCLRVersion>
169169
<!-- Not auto-updated. -->
170170
<MicrosoftDiaSymReaderVersion>2.0.0</MicrosoftDiaSymReaderVersion>
171-
<MicrosoftDiaSymReaderNativeVersion>16.11.29-beta1.23404.4</MicrosoftDiaSymReaderNativeVersion>
171+
<MicrosoftDiaSymReaderNativeVersion>17.8.0-beta1.23475.2</MicrosoftDiaSymReaderNativeVersion>
172172
<SystemCommandLineVersion>2.0.0-beta4.23407.1</SystemCommandLineVersion>
173173
<TraceEventVersion>3.1.7</TraceEventVersion>
174174
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
175175
<NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
176176
<MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
177177
<DNNEVersion>2.0.5</DNNEVersion>
178-
<MicrosoftBuildVersion>17.3.2</MicrosoftBuildVersion>
178+
<MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
179179
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
180180
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
181181
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion>
@@ -224,39 +224,39 @@
224224
<MicrosoftNativeQuicMsQuicVersion>2.2.3</MicrosoftNativeQuicMsQuicVersion>
225225
<SystemNetMsQuicTransportVersion>9.0.0-alpha.1.24067.1</SystemNetMsQuicTransportVersion>
226226
<!-- Mono LLVM -->
227-
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24072.3</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
228-
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24072.3</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
229-
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24072.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
230-
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24072.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
231-
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24072.3</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
232-
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24072.3</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
233-
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24072.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
234-
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24072.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
235-
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24072.3</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
236-
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24072.3</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
237-
<runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24072.3</runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
238-
<runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24072.3</runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
239-
<runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24072.3</runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
240-
<runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24072.3</runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
227+
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24080.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
228+
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24080.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
229+
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24080.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
230+
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24080.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
231+
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24080.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
232+
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24080.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
233+
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24080.1</runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
234+
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24080.1</runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
235+
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24080.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
236+
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24080.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
237+
<runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24080.1</runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
238+
<runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24080.1</runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
239+
<runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.24080.1</runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
240+
<runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.24080.1</runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
241241
<!-- emscripten / Node
242242
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
243243
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport
244244
-->
245-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.2.24079.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
245+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.2.24105.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
246246
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
247-
<MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version>9.0.0-preview.2.24079.1</MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version>
247+
<MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version>9.0.0-preview.2.24105.1</MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version>
248248
<!-- workloads -->
249249
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
250250
<WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>
251251
<!-- JIT Tools -->
252-
<runtimelinuxarm64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24072.3</runtimelinuxarm64MicrosoftNETCoreRuntimeJITToolsVersion>
253-
<runtimelinuxx64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24072.3</runtimelinuxx64MicrosoftNETCoreRuntimeJITToolsVersion>
254-
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24072.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeJITToolsVersion>
255-
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24072.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeJITToolsVersion>
256-
<runtimewinarm64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24072.3</runtimewinarm64MicrosoftNETCoreRuntimeJITToolsVersion>
257-
<runtimewinx64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24072.3</runtimewinx64MicrosoftNETCoreRuntimeJITToolsVersion>
258-
<runtimeosxarm64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24072.3</runtimeosxarm64MicrosoftNETCoreRuntimeJITToolsVersion>
259-
<runtimeosxx64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24072.3</runtimeosxx64MicrosoftNETCoreRuntimeJITToolsVersion>
252+
<runtimelinuxarm64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24080.1</runtimelinuxarm64MicrosoftNETCoreRuntimeJITToolsVersion>
253+
<runtimelinuxx64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24080.1</runtimelinuxx64MicrosoftNETCoreRuntimeJITToolsVersion>
254+
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24080.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeJITToolsVersion>
255+
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24080.1</runtimelinuxmuslx64MicrosoftNETCoreRuntimeJITToolsVersion>
256+
<runtimewinarm64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24080.1</runtimewinarm64MicrosoftNETCoreRuntimeJITToolsVersion>
257+
<runtimewinx64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24080.1</runtimewinx64MicrosoftNETCoreRuntimeJITToolsVersion>
258+
<runtimeosxarm64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24080.1</runtimeosxarm64MicrosoftNETCoreRuntimeJITToolsVersion>
259+
<runtimeosxx64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.24080.1</runtimeosxx64MicrosoftNETCoreRuntimeJITToolsVersion>
260260
<!-- BrowserDebugProxy libs -->
261261
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
262262
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>

‎eng/testing/workloads-browser.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<!-- For local builds, only one of the 2 required runtime packs might be available. In that case,
4545
build the other nugets with the *same runtime* but different names.
4646
-->
47-
<Target Name="_GetRuntimePackNuGetsToBuild" Condition="'$(WasmSkipMissingRuntimePackBuild)' != 'true'" Returns="@(_NuGetsToBuild)">
47+
<Target Name="_GetRuntimePackNuGetsToBuild" Condition="'$(WasmSkipMissingRuntimePackBuild)' != 'true'" Returns="@(NuGetsToBuildForWorkloadTesting)">
4848
<Error Condition="'$(RIDForWorkload)' == ''" Text="$(RIDForWorkload) is unset" />
4949
<PropertyGroup>
5050
<_IsMTNugetMissing Condition="'$(WasmEnableThreads)' != 'true'">true</_IsMTNugetMissing>
@@ -68,9 +68,9 @@
6868
Text="Expected to find either one or two in $(LibrariesShippingPackagesDir): @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)')" />
6969

7070
<ItemGroup>
71-
<!-- We need nugets for all wasm runtime flavors. The one corresponding the current
72-
property values is already built, the others need to be added to _NuGetsToBuild -->
73-
<_NuGetsToBuild Include="$(_DefaultRuntimePackNuGetPath)"
71+
<!-- We need nugets for all wasm runtime flavors. The one corresponding the current
72+
property values is already built, the others need to be added to NuGetsToBuildForWorkloadTesting -->
73+
<NuGetsToBuildForWorkloadTesting Include="$(_DefaultRuntimePackNuGetPath)"
7474
Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj"
7575
Dependencies="$(_DefaultRuntimePackNuGetPath)"
7676
Properties="@(_DefaultPropsForNuGetBuild, ';');WasmEnableThreads=$(_IsMTNugetMissing)"

‎eng/testing/workloads-testing.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<DefaultPropertiesForNuGetBuild Include="TargetArchitecture=$(TargetArchitectureForWorkload)" />
2525
</ItemGroup>
2626

27-
<Target Name="GetNuGetsToBuildForWorkloadTesting_Mobile" Returns="@(_NuGetsToBuild)" Condition="'$(PreparePackagesForWorkloadInstall)' == 'true'">
27+
<Target Name="_GetNuGetToBuildForTargetingPack" Returns="@(NuGetsToBuildForWorkloadTesting)" Condition="'$(PreparePackagesForWorkloadInstall)' == 'true'">
2828
<ItemGroup>
29-
<_NuGetsToBuild Include="$(BuiltNuGetsDir)Microsoft.NETCore.App.Ref.$(PackageVersionForWorkloadManifests).nupkg"
29+
<NuGetsToBuildForWorkloadTesting Include="$(BuiltNuGetsDir)Microsoft.NETCore.App.Ref.$(PackageVersionForWorkloadManifests).nupkg"
3030
Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App\Microsoft.NETCore.App.Ref.sfxproj"
3131
Properties="@(DefaultPropertiesForNuGetBuild, ';')"
3232
Descriptor="Ref pack"/>

‎eng/testing/workloads-wasm.targets‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project>
2-
<Target Name="_GetNugetsForAOT" Returns="@(_NuGetsToBuild)">
2+
<Target Name="_GetNugetsForAOT" Returns="@(NuGetsToBuildForWorkloadTesting)">
33
<Error Condition="'$(RIDForWorkload)' == ''" Text="$(RIDForWorkload) is unset" />
44
<PropertyGroup>
5+
<GetNuGetsToBuildForWorkloadTestingDependsOn>_GetNuGetToBuildForTargetingPack;$(GetNuGetsToBuildForWorkloadTestingDependsOn)</GetNuGetsToBuildForWorkloadTestingDependsOn>
56
<!-- Eg. Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm.6.0.0-dev.nupkg -->
67
<_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RIDForWorkload).$(PackageVersionForWorkloadManifests).nupkg</_AOTCrossNuGetPath>
78
</PropertyGroup>
89

910
<ItemGroup>
10-
<_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Ref.$(PackageVersionForWorkloadManifests).nupkg"
11+
<NuGetsToBuildForWorkloadTesting Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Ref.$(PackageVersionForWorkloadManifests).nupkg"
1112
Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App\Microsoft.NETCore.App.Ref.sfxproj"
1213
Properties="@(_DefaultPropsForNuGetBuild, ';')"
1314
Descriptor="Ref pack"/>
@@ -19,7 +20,7 @@
1920
<_PropsForAOTCrossBuild Include="TargetCrossRid=$(RIDForWorkload)" />
2021
<_PropsForAOTCrossBuild Include="DisableSourceLink=true" />
2122

22-
<_NuGetsToBuild Include="$(_AOTCrossNuGetPath)"
23+
<NuGetsToBuildForWorkloadTesting Include="$(_AOTCrossNuGetPath)"
2324
Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App\Microsoft.NETCore.App.MonoCrossAOT.sfxproj"
2425
Properties="@(_PropsForAOTCrossBuild,';')"
2526
Descriptor="AOT Cross compiler"/>

‎src/coreclr/debug/createdump/crashreportwriter.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ CrashReportWriter::WriteValue(const char* key, const char* value)
359359
WriteSeparator(text);
360360
text.append("\"");
361361
text.append(key);
362-
text.append("\" : \"");
362+
text.append("\": \"");
363363
text.append(value);
364364
text.append("\"");
365365
m_comma = true;

‎src/coreclr/debug/daccess/daccess.cpp‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4389,20 +4389,8 @@ ClrDataAccess::TranslateExceptionRecordToNotification(
43894389

43904390
if(DACNotify::ParseJITNotification(exInfo, methodDescPtr, nativeCodeLocation))
43914391
{
4392-
// Try and find the right appdomain
43934392
MethodDesc* methodDesc = PTR_MethodDesc(methodDescPtr);
4394-
BaseDomain* baseDomain = methodDesc->GetDomain();
4395-
AppDomain* appDomain = NULL;
4396-
4397-
if (baseDomain->IsAppDomain())
4398-
{
4399-
appDomain = PTR_AppDomain(PTR_HOST_TO_TADDR(baseDomain));
4400-
}
4401-
else
4402-
{
4403-
// Find a likely domain, because it's the shared domain.
4404-
appDomain = AppDomain::GetCurrentDomain();
4405-
}
4393+
AppDomain* appDomain = AppDomain::GetCurrentDomain();
44064394

44074395
pubMethodInst =
44084396
new (nothrow) ClrDataMethodInstance(this,
@@ -4453,20 +4441,8 @@ ClrDataAccess::TranslateExceptionRecordToNotification(
44534441
TADDR methodDescPtr;
44544442
if (DACNotify::ParseExceptionCatcherEnterNotification(exInfo, methodDescPtr, catcherNativeOffset))
44554443
{
4456-
// Try and find the right appdomain
44574444
MethodDesc* methodDesc = PTR_MethodDesc(methodDescPtr);
4458-
BaseDomain* baseDomain = methodDesc->GetDomain();
4459-
AppDomain* appDomain = NULL;
4460-
4461-
if (baseDomain->IsAppDomain())
4462-
{
4463-
appDomain = PTR_AppDomain(PTR_HOST_TO_TADDR(baseDomain));
4464-
}
4465-
else
4466-
{
4467-
// Find a likely domain, because it's the shared domain.
4468-
appDomain = AppDomain::GetCurrentDomain();
4469-
}
4445+
AppDomain* appDomain = AppDomain::GetCurrentDomain();
44704446

44714447
pubMethodInst =
44724448
new (nothrow) ClrDataMethodInstance(this,
@@ -7978,7 +7954,7 @@ void DacStackReferenceWalker::GCEnumCallback(LPVOID hCallback, OBJECTREF *pObjec
79787954
{
79797955
CORDB_ADDRESS fixed_obj = 0;
79807956
HRESULT hr = dsc->pWalker->mHeap.ListNearObjects((CORDB_ADDRESS)obj, NULL, &fixed_obj, NULL);
7981-
7957+
79827958
// Interior pointers need not lie on the manage heap at all. When this happens, ListNearObjects
79837959
// will return E_FAIL. In this case, we need to be sure to not include this stack slot in our
79847960
// enumeration because ICorDebug expects every location enumerated by this API to point to a

0 commit comments

Comments
 (0)