Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from mono/linker #51921

Merged
merged 8 commits into from
May 3, 2021
Merged

[main] Update dependencies from mono/linker #51921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6be9f2d
Update dependencies from https://github.com/mono/linker build 20210427.1
dotnet-maestro[bot] Apr 27, 2021
2576a5f
Update dependencies from https://github.com/mono/linker build 20210428.1
dotnet-maestro[bot] Apr 28, 2021
983a453
Update dependencies from https://github.com/mono/linker build 20210428.2
dotnet-maestro[bot] Apr 29, 2021
36deba5
Update dependencies from https://github.com/mono/linker build 20210429.1
dotnet-maestro[bot] Apr 30, 2021
a6f9171
Merge remote-tracking branch 'upstream/main' into darc-main-478bc32b-…
marek-safar Apr 30, 2021
ccb25ca
Merge branch 'darc-main-478bc32b-981e-494f-b9a1-e9824a6d702a' of gith…
marek-safar Apr 30, 2021
f16479f
Merge remote-tracking branch 'origin/main' into darc-main-478bc32b-98…
marek-safar May 3, 2021
e9b33e0
Fixes necessary for the improved processing of ILLink descriptor for …
vitek-karas May 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3782e6e41cfaf76ec9ae4117722f835596026b1a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21226.1">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21229.1">
<Uri>https://github.com/mono/linker</Uri>
<Sha>1dfcf3077aca1ea77850f409d95c3192f03507b3</Sha>
<Sha>307f6b0afd2fea639fffa97e67155bafe6aa8461</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21227.1">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<MicrosoftNETILLinkTasksVersion>6.0.100-preview.2.21226.1</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkTasksVersion>6.0.100-preview.5.21229.1</MicrosoftNETILLinkTasksVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.5.21226.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- Mono LLVM -->
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
CortypeFilePath="$(_CortypeFilePath)"
RexcepFilePath="$(_RexcepFilePath)"
ILLinkTrimXmlFilePath="$(_ILLinkDescriptorsIntermediatePath)"
DefineConstants="$(DefineConstants);FOR_ILLINK"
RuntimeRootDescriptorFilePath="$(_ILLinkRuntimeRootDescriptorFilePath)" />
</Target>

Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/clr.featuredefines.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
<DefineConstants Condition="'$(FeatureTypeEquivalence)' == 'true'">$(DefineConstants);FEATURE_TYPEEQUIVALENCE</DefineConstants>
<DefineConstants Condition="'$(FeatureBasicFreeze)' == 'true'">$(DefineConstants);FEATURE_BASICFREEZE</DefineConstants>
<DefineConstants Condition="'$(FeaturePortableShuffleThunks)' == 'true'">$(DefineConstants);FEATURE_PORTABLE_SHUFFLE_THUNKS</DefineConstants>

<DefineConstants Condition="'$(FeatureICastable)' == 'true'">$(DefineConstants);FEATURE_ICASTABLE</DefineConstants>

<DefineConstants Condition="'$(ProfilingSupportedBuild)' == 'true'">$(DefineConstants);PROFILING_SUPPORTED</DefineConstants>
<DefineConstants Condition="'$(FeatureProfAttach)' == 'true'">$(DefineConstants);FEATURE_PROFAPI_ATTACH_DETACH</DefineConstants>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/corelib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@ DEFINE_FIELD_U(_requireWaitNotification, SynchronizationContextObject, _requireW
DEFINE_CLASS(SYNCHRONIZATION_CONTEXT, Threading, SynchronizationContext)
DEFINE_METHOD(SYNCHRONIZATION_CONTEXT, INVOKE_WAIT_METHOD_HELPER, InvokeWaitMethodHelper, SM_SyncCtx_ArrIntPtr_Bool_Int_RetInt)

#ifdef _DEBUG
#ifdef DEBUG
DEFINE_CLASS(STACKCRAWMARK, Threading, StackCrawlMark)
#endif

Expand Down