Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/linker (#73410)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/linker build 20220804.4

Microsoft.NET.ILLink.Tasks
 From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22404.4

* Update dependencies from https://github.com/dotnet/linker build 20220804.5

Microsoft.NET.ILLink.Tasks
 From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22404.5

* Update dependencies from https://github.com/dotnet/linker build 20220805.1

Microsoft.NET.ILLink.Tasks
 From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22405.1

* Update dependencies from https://github.com/dotnet/linker build 20220808.3

Microsoft.NET.ILLink.Tasks
 From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22408.3

* Update dependencies from https://github.com/dotnet/linker build 20220809.9

Microsoft.NET.ILLink.Tasks
 From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22409.9

* Added and modified suppressions

* Disable IL2121 everywhere for now

* Disable IL2121 in trimming tests

* Disable IL2121 in wam samples

* Disable IL2121 in libraries tests

* Update dependencies from https://github.com/dotnet/linker build 20220811.2

Microsoft.NET.ILLink.Tasks
 From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22411.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Ankit Jain <radical@gmail.com>
Co-authored-by: Jeremi Kurdek <jkurdek@gmail.com>
Co-authored-by: vitek-karas <10670590+vitek-karas@users.noreply.github.com>
Co-authored-by: Sven Boemer <sbomer@gmail.com>
  • Loading branch information
6 people authored Aug 12, 2022
1 parent da24b54 commit 31d5d23
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 5 deletions.
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>0c5ca95fec9b6e2cc5e757ad36d0b094f81a59a6</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22377.1">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22411.2">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>f09bacf09ef10b61cf9f19825f8782171a816dab</Sha>
<Sha>81ffbb5af38a45ff60648999df8f35a79061ae43</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22408.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 @@ -171,7 +171,7 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>7.0.0-preview-20220721.1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22377.1</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22411.2</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rc.1.22408.1</MicrosoftNETCoreRuntimeICUTransportVersion>
Expand Down
2 changes: 2 additions & 0 deletions eng/illink.targets
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@
<LinkerNoWarn>$(LinkerNoWarn);IL2062;IL2063;IL2064;IL2065;IL2066</LinkerNoWarn>
<!-- IL2067-IL2091: Unsatisfied DynamicallyAccessedMembers requirements -->
<LinkerNoWarn>$(LinkerNoWarn);IL2067;IL2068;IL2069;IL2070;IL2071;IL2072;IL2073;IL2074;IL2075;IL2076;IL2077;IL2078;IL2079;IL2080;IL2081;IL2082;IL2083;IL2084;IL2085;IL2086;IL2087;IL2088;IL2089;IL2090;IL2091</LinkerNoWarn>
<!-- IL2121: Unnecessary UnconditionalSuppressMessage attribute -->
<LinkerNoWarn>$(LinkerNoWarn);IL2121</LinkerNoWarn>
<ILLinkArgs>$(ILLinkArgs) --nowarn $(LinkerNoWarn)</ILLinkArgs>
<ILLinkArgs Condition="'$(ILLinkDisableIPConstProp)' == 'true'">$(ILLinkArgs) --disable-opt ipconstprop</ILLinkArgs>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions eng/testing/linker/SupportFiles/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
<!-- Suppress analyzer and linker warnings as these are tests -->
<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
<NoWarn>$(NoWarn);IL2121</NoWarn>
</PropertyGroup>
</Project>
2 changes: 2 additions & 0 deletions src/libraries/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
<PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsTrimmingTestProject)' == 'true'">
<!-- don't warn on usage of BinaryFormatter from test projects -->
<NoWarn>$(NoWarn);SYSLIB0011</NoWarn>
<!-- don't warn about unnecessary trim warning suppressions. can be removed with preview 6. -->
<NoWarn>$(NoWarn);IL2121</NoWarn>
<!-- allow nullable annotated files to be incorporated into tests without warning -->
<Nullable Condition="'$(Nullable)' == '' and '$(Language)' == 'C#'">annotations</Nullable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ private static class UnboxT<T>
{
internal static readonly Func<object, T?> s_unbox = Create();

[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2090:MakeGenericMethod",
Justification = "'NullableField<TElem> where TElem : struct' implies 'TElem : new()'. Nullable does not make use of new() so it is safe.")]
private static Func<object, T?> Create()
{
if (typeof(T).IsValueType && default(T) == null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public override bool CanConvert(Type typeToConvert) =>

[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode",
Justification = "The ctor is marked RequiresUnreferencedCode.")]
[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2055:MakeGenericType",
Justification = "The ctor is marked RequiresUnreferencedCode.")]
public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
{
Debug.Assert(CanConvert(typeToConvert));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ internal static JsonConverter Create(Type enumType, EnumConverterOptions convert
new object?[] { converterOptions, namingPolicy, options })!;
}

[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2055:MakeGenericType",
[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2070:UnrecognizedReflectionPattern",
Justification = "'EnumConverter<T> where T : struct' implies 'T : new()', so the trimmer is warning calling MakeGenericType here because enumType's constructors are not annotated. " +
"But EnumConverter doesn't call new T(), so this is safe.")]
[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static JsonConverter CreateValueConverter(Type valueTypeToConvert, JsonCo
culture: null)!;
}

[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2055:MakeGenericType",
[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2070:UnrecognizedReflectionPattern",
Justification = "'NullableConverter<T> where T : struct' implies 'T : new()', so the trimmer is warning calling MakeGenericType here because valueTypeToConvert's constructors are not annotated. " +
"But NullableConverter doesn't call new T(), so this is safe.")]
[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/oob.proj
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@

<PropertyGroup>
<OOBILLinkArgs>$(ILLinkArgs)</OOBILLinkArgs>
<!-- Unnecessary suppressions - disable for now since we didn't clean the runtime yet -->
<OOBILLinkArgs>$(ILLinkArgs) --nowarn IL2121</OOBILLinkArgs>
<OOBILLinkArgs Condition="'@(OOBLibrarySuppressionsXml)' != ''" >$(OOBILLinkArgs) --link-attributes &quot;@(OOBLibrarySuppressionsXml->'%(FullPath)', '&quot; --link-attributes &quot;')&quot;</OOBILLinkArgs>
</PropertyGroup>

Expand Down
2 changes: 2 additions & 0 deletions src/libraries/sfx.proj
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@

<PropertyGroup>
<SharedFrameworkILLinkArgs>$(ILLinkArgs)</SharedFrameworkILLinkArgs>
<!-- Unnecessary suppressions - disable for now since we didn't clean the runtime yet -->
<SharedFrameworkILLinkArgs>$(ILLinkArgs) --nowarn IL2121</SharedFrameworkILLinkArgs>
<!-- update debug symbols -->
<SharedFrameworkILLinkArgs>$(SharedFrameworkILLinkArgs) -b true</SharedFrameworkILLinkArgs>
<SharedFrameworkILLinkArgs Condition="'@(SharedFrameworkSuppressionsXml)' != ''" >$(SharedFrameworkILLinkArgs) --link-attributes &quot;@(SharedFrameworkSuppressionsXml->'%(FullPath)', '&quot; --link-attributes &quot;')&quot;</SharedFrameworkILLinkArgs>
Expand Down
2 changes: 2 additions & 0 deletions src/mono/sample/wasm/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<TargetOS>browser</TargetOS>
<TargetArchitecture>wasm</TargetArchitecture>
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<!-- Suppress experimental trim warnings. This can be removed when we get a preview6 SDK. -->
<NoWarn>$(NoWarn);IL2121</NoWarn>
</PropertyGroup>

<Import Project="..\Directory.Build.props"/>
Expand Down

0 comments on commit 31d5d23

Please sign in to comment.