diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2021-08-12 21:22:54 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2021-08-12 21:22:54 +0300 |
| commit | e1825b4928afa9455cc51e1de2b2e66c8be3018d (patch) | |
| tree | 0bd388990096f5e8495e4a3831454b1334e50cbb | |
| parent | feba00475f5cf5fd75a99f468f6ecdb3de89ee82 (diff) | |
| parent | 54b37c976b503368d28e945ff426eaf59e133c25 (diff) | |
Merge in 'release/5.0' changesv5.0.10
| -rw-r--r-- | eng/Version.Details.xml | 4 | ||||
| -rw-r--r-- | eng/Versions.props | 2 | ||||
| -rw-r--r-- | src/libraries/System.Private.CoreLib/src/System/Activator.RuntimeType.cs | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0f28056e16..4afa43443ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -182,9 +182,9 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha> </Dependency> - <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rc.1.20420.3"> + <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21364.1"> <Uri>https://github.com/mono/linker</Uri> - <Sha>e56c9e47031302a164912b0eb9f0c94c9d307290</Sha> + <Sha>dc2ca1a2089983aa027e475998aa3a335bc247b7</Sha> </Dependency> <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20411.1"> <Uri>https://github.com/dotnet/xharness</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 7db2457d316..4e81b32590c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -144,7 +144,7 @@ <!-- Docs --> <MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion> <!-- ILLink --> - <MicrosoftNETILLinkTasksVersion>5.0.0-rc.1.20420.3</MicrosoftNETILLinkTasksVersion> + <MicrosoftNETILLinkTasksVersion>5.0.0-rtm.21364.1</MicrosoftNETILLinkTasksVersion> <!-- ICU --> <MicrosoftNETCoreRuntimeICUTransportVersion>5.0.0-rc.1.20472.3</MicrosoftNETCoreRuntimeICUTransportVersion> <!-- Mono LLVM --> diff --git a/src/libraries/System.Private.CoreLib/src/System/Activator.RuntimeType.cs b/src/libraries/System.Private.CoreLib/src/System/Activator.RuntimeType.cs index 09d3bdf608c..09e50ca1464 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Activator.RuntimeType.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Activator.RuntimeType.cs @@ -103,6 +103,8 @@ namespace System Justification = "Implementation detail of Activator that linker intrinsically recognizes")] [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2072:UnrecognizedReflectionPattern", Justification = "Implementation detail of Activator that linker intrinsically recognizes")] + [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2096:UnrecognizedReflectionPattern", + Justification = "Implementation detail of Activator that linker intrinsically recognizes")] private static ObjectHandle? CreateInstanceInternal(string assemblyString, string typeName, bool ignoreCase, |