From f4b0dbe2b35523fe63b8c3b5fcea80e27ea1e55b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Sep 2025 02:03:00 +0000 Subject: [PATCH 1/3] Backflow from https://github.com/dotnet/dotnet / 537ecf8 build 284571 [[ commit created by automation ]] --- eng/Versions.props | 2 +- eng/intellisense.targets | 4 ++-- .../Microsoft.NETCore.App/Directory.Build.targets | 12 ++++++------ .../bundle/Microsoft.NETCore.App.Bundle.bundleproj | 12 ++++++------ .../pkg/sfx/installers/Directory.Build.targets | 2 +- src/mono/nuget/Directory.Build.targets | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d906bcb8b677e1..e16f68d34f638a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ 10.2.0 17.0.46 - 9.0.0-preview-20241010.1 + 10.0.0-preview-20250912.1 2.4.15 9.0.0-alpha.1.24167.3 diff --git a/eng/intellisense.targets b/eng/intellisense.targets index 53614511d96725..e53bf035e91367 100644 --- a/eng/intellisense.targets +++ b/eng/intellisense.targets @@ -6,10 +6,10 @@ $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles')) + $([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'net-$(NetCoreAppCurrentVersion)', '1033', '$(AssemblyName).xml')) $([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'net', '1033', '$(AssemblyName).xml')) - $([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml')) + $(IntellisensePackageXmlFilePathFromNetVersionFolder) $(IntellisensePackageXmlFilePathFromNetFolder) - $(IntellisensePackageXmlFilePathFromDotNetPlatExtFolder) $([MSBuild]::NormalizePath('$(IntermediateOutputPath)', 'intellisense-package', '$(TargetName).xml')) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets index c61db973796d3a..8230c38e50cdf4 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets @@ -6,13 +6,13 @@ - + - - - - - + + + + + diff --git a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj index 6fd5ffa2eb98dd..ca964ce663a88b 100644 --- a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj +++ b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj @@ -20,13 +20,13 @@ - + - - - - - + + + + + diff --git a/src/installer/pkg/sfx/installers/Directory.Build.targets b/src/installer/pkg/sfx/installers/Directory.Build.targets index 0395881d630122..dded62b7d746f1 100644 --- a/src/installer/pkg/sfx/installers/Directory.Build.targets +++ b/src/installer/pkg/sfx/installers/Directory.Build.targets @@ -3,7 +3,7 @@ - + diff --git a/src/mono/nuget/Directory.Build.targets b/src/mono/nuget/Directory.Build.targets index c5a434cbbf9c85..8e2f1b6a5c2e33 100644 --- a/src/mono/nuget/Directory.Build.targets +++ b/src/mono/nuget/Directory.Build.targets @@ -2,7 +2,7 @@ - $(ProductVersion) + $(ProductVersion) From b270e5a00c0bb46ca88d7389aa1359c8e30e0278 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Sep 2025 02:03:05 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/dotnet build 284571 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25468.104 -> 5.0.0-2.25473.111) Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-rc.2.25468.104 -> 10.0.100-rc.2.25473.111) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25468.104 -> 10.0.0-beta.25473.111) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25468.104 -> 0.11.5-alpha.25473.111) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25468.104 -> 2.9.3-beta.25473.111) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-rc.2.25468.104 -> 10.0.0-rc.2.25473.111) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.0.0-preview.2.46904 -> 7.0.0-preview.2.47411) System.CommandLine (Version 2.0.0-rc.2.25468.104 -> 2.0.0-rc.2.25473.111) --- eng/Version.Details.props | 78 +++++++++---------- eng/Version.Details.xml | 158 +++++++++++++++++++------------------- global.json | 8 +- 3 files changed, 122 insertions(+), 122 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 3b3e373d3000b0..8e43d87f8b402e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -40,45 +40,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25461.1 19.1.0-alpha.1.25461.1 - 5.0.0-2.25468.104 - 5.0.0-2.25468.104 - 5.0.0-2.25468.104 - 10.0.100-rc.2.25468.104 - 10.0.100-rc.2.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 0.11.5-alpha.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 2.9.3-beta.25468.104 - 2.9.3-beta.25468.104 - 10.0.0-beta.25468.104 - 5.0.0-2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.100-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 7.0.0-preview.2.46904 - 7.0.0-preview.2.46904 - 7.0.0-preview.2.46904 - 7.0.0-preview.2.46904 - 10.0.0-rc.2.25468.104 - 2.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 + 5.0.0-2.25473.111 + 5.0.0-2.25473.111 + 5.0.0-2.25473.111 + 10.0.100-rc.2.25473.111 + 10.0.100-rc.2.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 0.11.5-alpha.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 2.9.3-beta.25473.111 + 2.9.3-beta.25473.111 + 10.0.0-beta.25473.111 + 5.0.0-2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.100-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 7.0.0-preview.2.47411 + 7.0.0-preview.2.47411 + 7.0.0-preview.2.47411 + 7.0.0-preview.2.47411 + 10.0.0-rc.2.25473.111 + 2.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 10.0.0-beta.25418.1 10.0.0-beta.25418.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74f09eaed65cdc..43211bd225f3f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project 2cfe42ea4a7fe364dcb197beca469af8edec0ad6 - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project 2cfe42ea4a7fe364dcb197beca469af8edec0ad6 - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness cbaa911ef1bce4cf92a7e4f7ffa5171eddd1a8fd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 3910cd6230be3d4d283edd6a52bff27f549dd675 - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd https://github.com/dotnet/node diff --git a/global.json b/global.json index 371b7c75a57e94..42221826c39eac 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25468.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25468.104", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25468.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25473.111", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25473.111", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25473.111", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.2.25468.104" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.2.25473.111" } } From 8a7e53ea4fe085680b1649fd6d50d0c9fcf973cf Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Mon, 29 Sep 2025 16:33:25 -0700 Subject: [PATCH 3/3] Remove UnexpectedWarning attributes --- .../DataFlow/CompilerGeneratedTypes.cs | 50 ------------------- .../DataFlow/CompilerGeneratedTypesRelease.cs | 1 - 2 files changed, 51 deletions(-) diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedTypes.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedTypes.cs index ec801d05682e3e..c051625d3f767f 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedTypes.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedTypes.cs @@ -16,7 +16,6 @@ namespace Mono.Linker.Tests.Cases.DataFlow [ExpectedNoWarnings] [SkipKeptItemsValidation] - [Define("INCLUDE_UNEXPECTED_LOWERING_WARNINGS")] // https://github.com/dotnet/roslyn/issues/79333 [Define("DEBUG")] [SetupLinkerArgument("--disable-generated-code-heuristics")] public class CompilerGeneratedTypes @@ -73,9 +72,6 @@ private static void IteratorTypeMismatch() _ = Local(); [ExpectedWarning("IL2090", nameof(DynamicallyAccessedMemberTypes.PublicProperties), CompilerGeneratedCode = true)] -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2090", "T", "PublicMethods", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif static IEnumerable Local<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] T>() { foreach (var m in typeof(T).GetMethods()) @@ -93,10 +89,6 @@ private static void LocalIterator() { foreach (var m in Local()) { } -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2090", "T1", "PublicMethods", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] - [UnexpectedWarning("IL2090", "T2", "PublicProperties", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif static IEnumerable Local< [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] T1, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T2>() @@ -119,10 +111,6 @@ private static void IteratorCapture() { _ = Local2(); -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2090", "T1", "PublicMethods", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] - [UnexpectedWarning("IL2090", "T2", "PublicProperties", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif IEnumerable Local2<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T2>() { foreach (var m in typeof(T1).GetMethods()) @@ -141,17 +129,10 @@ private static void NestedIterators() { Local1(); -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2091", "T1", "PublicMethods", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif IEnumerable Local1<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] T1>() { foreach (var o in Local2()) { yield return o; } -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2090", "T1", "PublicMethods", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] - [UnexpectedWarning("IL2090", "T2", "PublicProperties", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif IEnumerable Local2<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T2>() { foreach (var m in typeof(T1).GetMethods()) @@ -170,20 +151,11 @@ private static void IteratorInsideClosure() { Outer(); -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2091", "T1", "PublicMethods", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] - [UnexpectedWarning("IL2091", "T1", "PublicMethods", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] - [UnexpectedWarning("IL2091", "T1", "PublicMethods", Tool.Trimmer, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] - [UnexpectedWarning("IL2091", "T1", "PublicMethods", Tool.Trimmer, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif IEnumerable Outer<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] T1>() { int x = 0; foreach (var o in Inner()) yield return o; -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2090", "T2", "PublicProperties", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif IEnumerable Inner<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T2>() { x++; @@ -197,12 +169,6 @@ private static void IteratorInsideClosureMismatch() { Outer(); -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2091", "T1", "PublicProperties", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] - [UnexpectedWarning("IL2091", "T1", "PublicProperties", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] - [UnexpectedWarning("IL2091", "T1", "PublicProperties", Tool.Trimmer, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] - [UnexpectedWarning("IL2091", "T1", "PublicProperties", Tool.Trimmer, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif IEnumerable Outer<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T1>() { int x = 0; @@ -223,9 +189,6 @@ private static void IteratorInsideClosureMismatch() private static void Async() { Local().Wait(); -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2090", "T", "PublicMethods", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif async Task Local<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] T>() { await Task.Delay(0); @@ -240,10 +203,6 @@ private static void AsyncCapture() { Local2().Wait(); -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2090", "T1", "PublicMethods", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] - [UnexpectedWarning("IL2090", "T2", "PublicProperties", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif async Task Local2<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T2>() { await Task.Delay(0); @@ -259,9 +218,6 @@ private static void AsyncTypeMismatch() _ = Local(); [ExpectedWarning("IL2090", "T", nameof(DynamicallyAccessedMemberTypes.PublicProperties), CompilerGeneratedCode = true)] -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2090", "T", "PublicMethods", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif static async Task Local<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] T>() { await Task.Delay(0); @@ -279,9 +235,6 @@ private static void AsyncInsideClosure() int x = 0; Inner().Wait(); -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2090", "T2", "PublicProperties", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif async Task Inner<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T2>() { await Task.Delay(0); @@ -452,9 +405,6 @@ class NestedAsyncLocalFunction { Local1(); -#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS - [UnexpectedWarning("IL2091", "T", nameof(DynamicallyAccessedMemberTypes.PublicMethods), Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)] -#endif static async Task Local1() { Local2(); diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedTypesRelease.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedTypesRelease.cs index 9f3c73d74f9708..749bb7a7b99274 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedTypesRelease.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedTypesRelease.cs @@ -11,7 +11,6 @@ namespace Mono.Linker.Tests.Cases.DataFlow [SetupCompileArgument("/optimize+")] [SetupCompileArgument("/main:Mono.Linker.Tests.Cases.DataFlow.CompilerGeneratedTypesRelease")] [SandboxDependency("CompilerGeneratedTypes.cs")] - [Define("INCLUDE_UNEXPECTED_LOWERING_WARNINGS")] // https://github.com/dotnet/roslyn/issues/79333 [SetupLinkerArgument("--disable-generated-code-heuristics")] class CompilerGeneratedTypesRelease {