diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 3182232edf9cdc..c6398d84eb1639 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.25474.118 - 5.0.0-2.25474.118 - 5.0.0-2.25474.118 - 10.0.100-rc.2.25474.118 - 10.0.100-rc.2.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 0.11.5-alpha.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 10.0.0-beta.25474.118 - 2.9.3-beta.25474.118 - 2.9.3-beta.25474.118 - 10.0.0-beta.25474.118 - 5.0.0-2.25474.118 - 10.0.0-rc.2.25474.118 - 10.0.100-rc.2.25474.118 - 10.0.0-rc.2.25474.118 - 10.0.0-rc.2.25474.118 - 7.0.0-rc.47518 - 7.0.0-rc.47518 - 7.0.0-rc.47518 - 7.0.0-rc.47518 - 10.0.0-rc.2.25474.118 - 2.0.0-rc.2.25474.118 - 10.0.0-rc.2.25474.118 - 10.0.0-rc.2.25474.118 - 10.0.0-rc.2.25474.118 + 5.0.0-2.25501.103 + 5.0.0-2.25501.103 + 5.0.0-2.25501.103 + 10.0.100-rc.2.25501.103 + 10.0.100-rc.2.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 0.11.5-alpha.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 10.0.0-beta.25501.103 + 2.9.3-beta.25501.103 + 2.9.3-beta.25501.103 + 10.0.0-beta.25501.103 + 5.0.0-2.25501.103 + 10.0.0-rc.2.25501.103 + 10.0.100-rc.2.25501.103 + 10.0.0-rc.2.25501.103 + 10.0.0-rc.2.25501.103 + 7.0.0-rc.203 + 7.0.0-rc.203 + 7.0.0-rc.203 + 7.0.0-rc.203 + 10.0.0-rc.2.25501.103 + 2.0.0-rc.2.25501.103 + 10.0.0-rc.2.25501.103 + 10.0.0-rc.2.25501.103 + 10.0.0-rc.2.25501.103 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 9b670002c61866..674d97b59dc9ac 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 - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project 2cfe42ea4a7fe364dcb197beca469af8edec0ad6 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness cbaa911ef1bce4cf92a7e4f7ffa5171eddd1a8fd - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 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 - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 - + https://github.com/dotnet/dotnet - 04104ba742ae9a61dd6cf01b2697fd21348132df + 066752e682fa11fa0b484be4d07947228fd95f43 https://github.com/dotnet/node diff --git a/global.json b/global.json index 2979010bb01b84..fc99dde936aad4 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.25474.118", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25474.118", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25474.118", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25501.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25501.103", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25501.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.2.25474.118" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.2.25501.103" } } diff --git a/src/installer/pkg/sfx/installers/host.wxs b/src/installer/pkg/sfx/installers/host.wxs index b4be1ebeb150b2..fe074135150814 100644 --- a/src/installer/pkg/sfx/installers/host.wxs +++ b/src/installer/pkg/sfx/installers/host.wxs @@ -126,6 +126,6 @@ - + \ No newline at end of file diff --git a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs index c2332f2985df06..3a11f00da2cf3b 100644 --- a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs +++ b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using System; @@ -324,9 +324,9 @@ static bool IsAnyDotNetJs(string key) static bool IsDotNetWasm(string key) { - var name = Path.GetFileName(key); - return string.Equals("dotnet.native.wasm", name, StringComparison.Ordinal) - || string.Equals("dotnet.wasm", name, StringComparison.Ordinal); + var fileName = Path.GetFileName(key); + return (fileName.StartsWith("dotnet.native", StringComparison.Ordinal) && fileName.EndsWith(".wasm", StringComparison.Ordinal)) + || string.Equals("dotnet.wasm", fileName, StringComparison.Ordinal); } } @@ -420,6 +420,16 @@ private void ProcessSymbolAssets( } } + private string GetItemSpecWithoutFingerprint(ITaskItem asset) + => FingerprintAssets ? asset.GetMetadata("OriginalItemSpec") : asset.ItemSpec; + + private static string GetNonFingerprintedAssetItemSpec(ITaskItem asset) + { + var fileName = Path.GetFileName(asset.GetMetadata("OriginalItemSpec")); + var assetToUpdateItemSpec = Path.Combine(Path.GetDirectoryName(asset.ItemSpec), fileName); + return assetToUpdateItemSpec; + } + private void ComputeUpdatedAssemblies( IDictionary<(string, string assemblyName), ITaskItem> satelliteAssemblies, List filesToRemove, @@ -440,14 +450,15 @@ private void ComputeUpdatedAssemblies( foreach (var kvp in assemblyAssets) { var asset = kvp.Value; - var fileName = Path.GetFileName(asset.ItemSpec); + var fileName = Path.GetFileName(GetItemSpecWithoutFingerprint(asset)); + var assetToUpdateItemSpec = FingerprintAssets ? GetNonFingerprintedAssetItemSpec(asset) : asset.ItemSpec; if (IsWebCilEnabled) fileName = Path.ChangeExtension(fileName, ".dll"); if (resolvedAssembliesToPublish.TryGetValue(fileName, out var existing)) { // We found the assembly, so it'll have to be updated. - assetsToUpdate.Add(asset.ItemSpec, asset); + assetsToUpdate.Add(assetToUpdateItemSpec, asset); filesToRemove.Add(existing); if (!string.Equals(asset.ItemSpec, existing.GetMetadata("FullPath"), StringComparison.Ordinal)) { @@ -465,11 +476,12 @@ private void ComputeUpdatedAssemblies( { var satelliteAssembly = kvp.Value; var relatedAsset = satelliteAssembly.GetMetadata("RelatedAsset"); + if (assetsToUpdate.ContainsKey(relatedAsset)) { assetsToUpdate.Add(satelliteAssembly.ItemSpec, satelliteAssembly); var culture = satelliteAssembly.GetMetadata("AssetTraitValue"); - var fileName = Path.GetFileName(satelliteAssembly.ItemSpec); + var fileName = Path.GetFileName(GetItemSpecWithoutFingerprint(satelliteAssembly)); if (IsWebCilEnabled) fileName = Path.ChangeExtension(fileName, ".dll"); @@ -517,7 +529,8 @@ private void ComputeUpdatedAssemblies( ApplyPublishProperties(newAsemblyAsset); newAssets.Add(newAsemblyAsset); - updatedAssetsMap.Add(asset.ItemSpec, newAsemblyAsset); + var assetToUpdateItemSpec = FingerprintAssets ? GetNonFingerprintedAssetItemSpec(asset) : asset.ItemSpec; + updatedAssetsMap.Add(assetToUpdateItemSpec, newAsemblyAsset); break; default: // Satellite assembliess and compressed assets 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 {