diff --git a/global.json b/global.json
index 166465ad8e2c5..83e43bb2a4673 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.24212.4",
diff --git a/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj b/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj
index 8412724360601..a9e3aa2725d73 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
diff --git a/src/mono/sample/wasm/blazor-frame/blazor.csproj b/src/mono/sample/wasm/blazor-frame/blazor.csproj
index 3061f77e83ac3..362f1bc30cb43 100644
--- a/src/mono/sample/wasm/blazor-frame/blazor.csproj
+++ b/src/mono/sample/wasm/blazor-frame/blazor.csproj
@@ -11,8 +11,8 @@
-
-
+
+
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 314f3453a08e4..237c5cf2d75ac 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 cc3ac1aae891e..db0b51cd37008 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 @@
-
+
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 a4351d0fa8ef8..0000000000000
--- 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 71b030ab299f6..0000000000000
--- 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 60aa4f18a0662..f4daacec7a0e1 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;
+ }
+ }
+}