From b5e6f9ae1fe395aeacef61d543d9720f3adcaafb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Fri, 12 Apr 2024 07:57:41 +0200 Subject: [PATCH 1/5] Update global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 0eb6c6070cc249..bcac2021f60e33 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "9.0.100-preview.1.24101.2", + "version": "9.0.100-preview.3.24204.13", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.100-preview.1.24101.2" + "dotnet": "9.0.100-preview.3.24204.13" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24210.4", From e9a565c3e476f78dd146d4969d183b01721f93ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Fri, 12 Apr 2024 07:59:07 +0200 Subject: [PATCH 2/5] Update blazor.csproj --- src/mono/sample/wasm/blazor-frame/blazor.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/sample/wasm/blazor-frame/blazor.csproj b/src/mono/sample/wasm/blazor-frame/blazor.csproj index 3061f77e83ac3a..362f1bc30cb431 100644 --- a/src/mono/sample/wasm/blazor-frame/blazor.csproj +++ b/src/mono/sample/wasm/blazor-frame/blazor.csproj @@ -11,8 +11,8 @@ - - + + From 173fb1e580a2ae6ccc855d3bd12fcd34f47f3aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Fri, 12 Apr 2024 09:17:01 +0200 Subject: [PATCH 3/5] Delete useless `RuntimeIdentifiers` --- src/coreclr/tools/aot/ILCompiler/repro/repro.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj b/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj index 84127243606019..a9e3aa2725d737 100644 --- a/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj +++ b/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj @@ -6,9 +6,6 @@ AnyCPU false false - linux-x64;win-x64;osx-x64 - - $(RuntimeIdentifiers);freebsd-x64;freebsd-arm64 Debug;Release;Checked true false From 723e8cdb1488514f9eb85483dcd5c93655e786ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Fri, 12 Apr 2024 09:17:11 +0200 Subject: [PATCH 4/5] Fix up illinker tests --- .../Support/FeatureGuardAttribute.cs | 17 ----------------- .../Support/FeatureSwitchDefinitionAttribute.cs | 16 ---------------- .../DataFlow/FeatureGuardAttributeDataFlow.cs | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases.Expectations/Support/FeatureGuardAttribute.cs delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases.Expectations/Support/FeatureSwitchDefinitionAttribute.cs diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases.Expectations/Support/FeatureGuardAttribute.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases.Expectations/Support/FeatureGuardAttribute.cs deleted file mode 100644 index a4351d0fa8ef88..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases.Expectations/Support/FeatureGuardAttribute.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -namespace System.Diagnostics.CodeAnalysis -{ - // Allow AttributeTargets.Method for testing invalid usages of a custom FeatureGuardAttribute - [AttributeUsage (AttributeTargets.Property | AttributeTargets.Method, Inherited = false, AllowMultiple = true)] - public sealed class FeatureGuardAttribute : Attribute - { - public Type FeatureType { get; } - - public FeatureGuardAttribute (Type featureType) - { - FeatureType = featureType; - } - } -} diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases.Expectations/Support/FeatureSwitchDefinitionAttribute.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases.Expectations/Support/FeatureSwitchDefinitionAttribute.cs deleted file mode 100644 index 71b030ab299f69..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases.Expectations/Support/FeatureSwitchDefinitionAttribute.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -namespace System.Diagnostics.CodeAnalysis -{ - [AttributeUsage(AttributeTargets.Property, Inherited = false)] - public sealed class FeatureSwitchDefinitionAttribute : Attribute - { - public string SwitchName { get; } - - public FeatureSwitchDefinitionAttribute (string switchName) - { - SwitchName = switchName; - } - } -} diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/FeatureGuardAttributeDataFlow.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/FeatureGuardAttributeDataFlow.cs index 60aa4f18a0662b..f4daacec7a0e1d 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/FeatureGuardAttributeDataFlow.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/FeatureGuardAttributeDataFlow.cs @@ -516,3 +516,18 @@ static void RequiresUnreferencedCode () { } static bool OtherCondition () => true; } } + +namespace System.Diagnostics.CodeAnalysis +{ + // Allow AttributeTargets.Method for testing invalid usages of a custom FeatureGuardAttribute + [AttributeUsage (AttributeTargets.Property | AttributeTargets.Method, Inherited = false, AllowMultiple = true)] + public sealed class FeatureGuardAttribute : Attribute + { + public Type FeatureType { get; } + + public FeatureGuardAttribute (Type featureType) + { + FeatureType = featureType; + } + } +} From a97c366bfbebde66fff54f6f4ba51c666dc2df78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 15 Apr 2024 11:00:11 +0200 Subject: [PATCH 5/5] Fix two more preview1 versions --- .../BlazorHosted.Client/BlazorHosted.Client.csproj | 4 ++-- .../BlazorHosted.Server/BlazorHosted.Server.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mono/wasm/testassets/BlazorHostedApp/BlazorHosted.Client/BlazorHosted.Client.csproj b/src/mono/wasm/testassets/BlazorHostedApp/BlazorHosted.Client/BlazorHosted.Client.csproj index 314f3453a08e49..237c5cf2d75acd 100644 --- a/src/mono/wasm/testassets/BlazorHostedApp/BlazorHosted.Client/BlazorHosted.Client.csproj +++ b/src/mono/wasm/testassets/BlazorHostedApp/BlazorHosted.Client/BlazorHosted.Client.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/mono/wasm/testassets/BlazorHostedApp/BlazorHosted.Server/BlazorHosted.Server.csproj b/src/mono/wasm/testassets/BlazorHostedApp/BlazorHosted.Server/BlazorHosted.Server.csproj index cc3ac1aae891e3..db0b51cd370081 100644 --- a/src/mono/wasm/testassets/BlazorHostedApp/BlazorHosted.Server/BlazorHosted.Server.csproj +++ b/src/mono/wasm/testassets/BlazorHostedApp/BlazorHosted.Server/BlazorHosted.Server.csproj @@ -9,7 +9,7 @@ - +