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.

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 dotnet/linker #67701

Merged
merged 18 commits into from
Apr 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8dab63d
Update dependencies from https://github.com/dotnet/linker build 20220…
dotnet-maestro[bot] Apr 7, 2022
848bfeb
Update dependencies from https://github.com/dotnet/linker build 20220…
dotnet-maestro[bot] Apr 8, 2022
53795e7
Remove unused method
vitek-karas Apr 8, 2022
1d0aedd
Update dependencies from https://github.com/dotnet/linker build 20220…
dotnet-maestro[bot] Apr 9, 2022
dcf8462
Improve test checks
marek-safar Apr 11, 2022
e39dc5c
Update dependencies from https://github.com/dotnet/linker build 20220…
dotnet-maestro[bot] Apr 12, 2022
6d6863f
Tweak the test more (instead of messing with debug builds)
marek-safar Apr 12, 2022
5b71e46
Remove explicit InitializeBinaryFormatter substitution for wasm
marek-safar Apr 13, 2022
436d24c
Update dependencies from https://github.com/dotnet/linker build 20220…
dotnet-maestro[bot] Apr 13, 2022
6f9ee2e
Update dependencies from https://github.com/dotnet/linker build 20220…
dotnet-maestro[bot] Apr 14, 2022
a015556
Update dependencies from https://github.com/dotnet/linker build 20220…
dotnet-maestro[bot] Apr 19, 2022
cfde4e2
Update dependencies from https://github.com/dotnet/linker build 20220…
dotnet-maestro[bot] Apr 20, 2022
622a565
Update error code
marek-safar Apr 20, 2022
0711c09
Merge branch 'darc-main-9714be7e-f6e4-4abc-923d-558ca47ea2b8' of gith…
marek-safar Apr 20, 2022
2675201
Get better fix
marek-safar Apr 20, 2022
349c7a5
Continue tweaking the test
marek-safar Apr 21, 2022
53bd4a8
Update dependencies from https://github.com/dotnet/linker build 20220…
dotnet-maestro[bot] Apr 21, 2022
e336258
Disable trimming of sgen
vitek-karas Apr 21, 2022
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
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22205.1">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22220.4">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>c6434f6e8a0a1bfbb77261ac9f85c98b781613e5</Sha>
<Sha>6374217e191b8cef0c5a3d862f4291583eb959f4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22206.1">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>7.0.0-preview-20220331.1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22205.1</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22220.4</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-preview.4.22178.2</MicrosoftNETCoreRuntimeICUTransportVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
<!-- this assembly doesn't need to be binplaced -->
<EnableBinPlacing>false</EnableBinPlacing>
<IsTrimmable>false</IsTrimmable>
</PropertyGroup>

<ItemGroup>
Expand Down
24 changes: 16 additions & 8 deletions src/libraries/System.Globalization/tests/IcuTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,25 @@ public class IcuTests
public static void IcuShouldBeUsedByDefault()
{
Type globalizationMode = Type.GetType("System.Globalization.GlobalizationMode");
if (globalizationMode != null)
MethodInfo methodInfo = globalizationMode?.GetProperty("UseNls", BindingFlags.NonPublic | BindingFlags.Static)?.GetMethod;

if (methodInfo != null)
{
MethodInfo methodInfo = globalizationMode.GetProperty("UseNls", BindingFlags.NonPublic | BindingFlags.Static)?.GetMethod;
if (methodInfo != null)
{
Assert.False((bool)methodInfo.Invoke(null, null));
return;
}
// When GlobalizationMode is present
Assert.False((bool)methodInfo.Invoke(null, null));
}
else
{
// When GlobalizationMode is trimmed
Type cultureDataType = Type.GetType("System.Globalization.CultureData");
Assert.NotNull(cultureDataType);

throw new XunitException("Couldn't get System.Globalization.GlobalizationMode.UseIcu property.");
methodInfo = cultureDataType.GetMethod("NlsGetCultureDataFromRegionName", BindingFlags.NonPublic | BindingFlags.Static);
Assert.Null(methodInfo);

methodInfo = cultureDataType.GetMethod("InitIcuCultureDataCore", BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance);
Assert.NotNull(methodInfo);
}
}

[ConditionalFact(nameof(IsIcuCompatiblePlatform))]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ public GeneratedTypeInfo GetProxyType(
// Unconditionally generates a new proxy type derived from 'baseType' and implements 'interfaceType'
[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2062:UnrecognizedReflectionPattern",
Justification = "interfaceType is annotated as preserve All members, so any Types returned from GetInterfaces should be preserved as well once https://github.com/mono/linker/issues/1731 is fixed.")]
[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2072:UnrecognizedReflectionPattern",
Justification = "interfaceType is annotated as preserve All members, so any Types returned from GetInterfaces should be preserved as well once https://github.com/mono/linker/issues/1731 is fixed.")]
private GeneratedTypeInfo GenerateProxyType(
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type baseType,
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type interfaceType)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,5 @@
<type fullname="System.Runtime.CompilerServices.RuntimeFeature">
<method signature="System.Boolean get_IsDynamicCodeCompiled()" body="stub" value="false" />
</type>
<type fullname="System.Resources.ResourceReader">
<method signature="System.Boolean InitializeBinaryFormatter()" body="stub" value="false" />
</type>
</assembly>
</linker>
18 changes: 0 additions & 18 deletions src/mono/System.Private.CoreLib/src/System/RuntimeType.Mono.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1609,24 +1609,6 @@ internal override FieldInfo GetField(FieldInfo fromNoninstanciated)
return att.Length != 0 ? ((DefaultMemberAttribute)att[0]).MemberName : null;
}

private RuntimeConstructorInfo? m_serializationCtor;
internal RuntimeConstructorInfo? GetSerializationCtor()
{
if (m_serializationCtor == null)
{
var s_SICtorParamTypes = new Type[] { typeof(SerializationInfo), typeof(StreamingContext) };

m_serializationCtor = GetConstructor(
BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,
null,
CallingConventions.Any,
s_SICtorParamTypes,
null) as RuntimeConstructorInfo;
}

return m_serializationCtor;
}

private object? CreateInstanceMono(bool nonPublic, bool wrapExceptions)
{
RuntimeConstructorInfo? ctor = GetDefaultConstructor();
Expand Down