Update to Preview7 SDK (#106333)

* Update to Preview7 SDK * Enable use of DefaultValueAttribute in trimming test * Fix the _DefaultValueAttributeSupport in generated trimming tests * Make DefaultValueAttributeCtorTest trimming test enable _DefaultValueAttributeSupport * Condition some DefaultValueAttributeTests on DefaultValueAttribute.IsSupported switch * Fix AmbientValueAttribute when IDesignerHost.IsSupported is false Throw only when type constructor is used. Fix tests to condition on this. * Condition some XmlSerializer tests These tests serialize types that use DefaultValueAttribute which is disabled. * Update to final Preview7 versions * Fix ToolboxItemAttributeTests when IDesignerHost.IsSupported is false
dotnet · Aug 14, 2024 · 605ff6f · 605ff6f
1 parent 7963a49
commit 605ff6f
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 18 deletions.
diff --git a/global.json b/global.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "version": "9.0.100-preview.6.24328.19",
+    "version": "9.0.100-preview.7.24407.12",
     "allowPrerelease": true,
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "9.0.100-preview.6.24328.19"
+    "dotnet": "9.0.100-preview.7.24407.12"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.2",

diff --git a/...es/System.ComponentModel.TypeConverter/src/System/ComponentModel/AmbientValueAttribute.cs b/...es/System.ComponentModel.TypeConverter/src/System/ComponentModel/AmbientValueAttribute.cs
@@ -18,6 +18,7 @@ public sealed class AmbientValueAttribute : Attribute
         /// This is the default value.
         /// </summary>
         private object? _value;
+        private static readonly object? s_throwSentinel = IDesignerHost.IsSupported ? null : new();
 
         /// <summary>
         /// Initializes a new instance of the <see cref='System.ComponentModel.AmbientValueAttribute'/> class, converting the
@@ -32,6 +33,7 @@ public AmbientValueAttribute([DynamicallyAccessedMembers(DynamicallyAccessedMemb
             Debug.Assert(IDesignerHost.IsSupported, "Runtime instantiation of this attribute is not allowed with trimming.");
             if (!IDesignerHost.IsSupported)
             {
+                _value = s_throwSentinel;
                 return;
             }
 
@@ -142,7 +144,7 @@ public AmbientValueAttribute(object? value)
         public object? Value {
             get
             {
-                if (!IDesignerHost.IsSupported)
+                if (!IDesignerHost.IsSupported  && ReferenceEquals(_value, s_throwSentinel))
                 {
                     throw new ArgumentException(SR.RuntimeInstanceNotAllowed);
                 }

diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/AmbientValueAttributeTests.cs b/src/libraries/System.ComponentModel.TypeConverter/tests/AmbientValueAttributeTests.cs
@@ -8,7 +8,9 @@ namespace System.ComponentModel.Tests
 {
     public class AmbientValueAttributeTests
     {
-        [Theory]
+        public static bool IDesignerHostIsSupported => AppContext.TryGetSwitch("System.ComponentModel.Design.IDesignerHost.IsSupported", out bool isSupported) ? isSupported : true;
+
+        [ConditionalTheory(nameof(IDesignerHostIsSupported))]
         [InlineData(null, null, null)]
         [InlineData(typeof(int*), "1", null)]
         [InlineData(typeof(string), "1", "1")]

diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/ToolboxItemAttributeTests.cs b/src/libraries/System.ComponentModel.TypeConverter/tests/ToolboxItemAttributeTests.cs
@@ -8,11 +8,19 @@ namespace System.ComponentModel
 {
     public class ToolboxItemAttributeTests
     {
+        internal static bool IDesignerHostIsSupported => AppContext.TryGetSwitch("System.ComponentModel.Design.IDesignerHost.IsSupported", out bool isSupported) ? isSupported : true;
+
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
         public void Ctor_Bool(bool defaultType)
         {
+            if (!IDesignerHostIsSupported && defaultType)
+            {
+                AssertExtensions.Throws<NotSupportedException>(() => new ToolboxItemAttribute(defaultType));
+                return;
+            }
+
             var attribute = new ToolboxItemAttribute(defaultType);
             if (defaultType)
             {

diff --git a/src/libraries/System.ObjectModel/tests/TrimmingTests/System.ObjectModel.TrimmingTests.proj b/src/libraries/System.ObjectModel/tests/TrimmingTests/System.ObjectModel.TrimmingTests.proj
@@ -1,5 +1,15 @@
 <Project DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 
+  <ItemGroup>
+    <TestConsoleAppSourceFiles Include="TypeConverterAttributeStringArgCtorTest.cs">
+      <EnabledProperties>_DefaultValueAttributeSupport</EnabledProperties>
+    </TestConsoleAppSourceFiles>
+    <TestConsoleAppSourceFiles Include="TypeConverterAttributeTypeArgCtorTest.cs">
+      <EnabledProperties>_DefaultValueAttributeSupport</EnabledProperties>
+    </TestConsoleAppSourceFiles>
+    <TestConsoleAppSourceFiles Include="TypeDescriptionProviderAttributeCtorTest.cs" />
+  </ItemGroup>
+
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
 </Project>
diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs b/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs
@@ -43,6 +43,8 @@ static XmlSerializerTests()
     }
 #endif
 
+    public static bool DefaultValueAttributeIsSupported => AppContext.TryGetSwitch("System.ComponentModel.DefaultValueAttribute.IsSupported", out bool isEnabled) ? isEnabled : true;
+
     [Fact]
     public static void Xml_TypeWithDateTimePropertyAsXmlTime()
     {
@@ -823,7 +825,7 @@ public static void Xml_TypeWithTimeSpanProperty()
         Assert.StrictEqual(obj.TimeSpanProperty, deserializedObj.TimeSpanProperty);
     }
 
-    [Fact]
+    [ConditionalFact(nameof(DefaultValueAttributeIsSupported))]
     public static void Xml_TypeWithDefaultTimeSpanProperty()
     {
         var obj = new TypeWithDefaultTimeSpanProperty { TimeSpanProperty2 = new TimeSpan(0, 1, 0) };
@@ -868,7 +870,7 @@ public static void Xml_DeserializeEmptyTimeSpanType()
         }
     }
 
-    [Fact]
+    [ConditionalFact(nameof(DefaultValueAttributeIsSupported))]
     public static void Xml_TypeWithDateTimeOffsetProperty()
     {
         var now = new DateTimeOffset(DateTime.Now);
@@ -893,7 +895,7 @@ public static void Xml_TypeWithDateTimeOffsetProperty()
         Assert.True(deserializedObj.NullableDTOWithDefault == null);
     }
 
-    [Fact]
+    [ConditionalFact(nameof(DefaultValueAttributeIsSupported))]
     public static void Xml_DeserializeTypeWithEmptyDateTimeOffsetProperties()
     {
         //var def = DateTimeOffset.Parse("3/17/1977 5:00:01 PM -05:00");  //  "1977-03-17T17:00:01-05:00"

diff --git a/...em.Runtime/tests/System.Runtime.Tests/System/ComponentModel/DefaultValueAttributeTests.cs b/...em.Runtime/tests/System.Runtime.Tests/System/ComponentModel/DefaultValueAttributeTests.cs
@@ -12,8 +12,10 @@ namespace System.ComponentModel.Tests
 {
     public class DefaultValueAttributeTests
     {
+        public static bool DefaultValueAttributeIsSupported => AppContext.TryGetSwitch("System.ComponentModel.DefaultValueAttribute.IsSupported", out bool isEnabled) ? isEnabled : true;
+
         [Fact]
-        public static void Ctor()
+        public static void Ctor_value()
         {
             Assert.Equal((object)true, new DefaultValueAttribute(true).Value);
             Assert.Equal((object)false, new DefaultValueAttribute(false).Value);
@@ -37,7 +39,11 @@ public static void Ctor()
             Assert.Equal("test", new DefaultValueAttribute("test").Value);
 
             Assert.Equal("test", new DefaultValueAttribute((object)"test").Value);
+        }
 
+        [ConditionalFact(nameof(DefaultValueAttributeIsSupported))]
+        public static void Ctor_type_string()
+        {
             Assert.Equal(DayOfWeek.Monday, new DefaultValueAttribute(typeof(DayOfWeek), "Monday").Value);
             Assert.Equal(TimeSpan.FromHours(1), new DefaultValueAttribute(typeof(TimeSpan), "1:00:00").Value);
 
@@ -63,7 +69,7 @@ public class CustomType2
             public int Value { get; set; }
         }
 
-        [Fact]
+        [ConditionalFact(nameof(DefaultValueAttributeIsSupported))]
         public static void Ctor_CustomTypeConverter()
         {
             TypeDescriptor.AddAttributes(typeof(CustomType), new TypeConverterAttribute(typeof(CustomConverter)));
@@ -99,7 +105,7 @@ public void Ctor_TypeDescriptorNotFound_ExceptionFallback(Type type, bool return
             }, type.ToString(), returnNull.ToString(), stringToConvert, expectedValue.ToString()).Dispose();
         }
 
-        [Theory]
+        [ConditionalTheory(nameof(DefaultValueAttributeIsSupported))]
         [InlineData(typeof(CustomType2))]
         [InlineData(typeof(DefaultValueAttribute))]
         public static void Ctor_DefaultTypeConverter_Null(Type type)

diff --git a/...System.Runtime/tests/System.Runtime.Tests/TrimmingTests/System.Runtime.TrimmingTests.proj b/...System.Runtime/tests/System.Runtime.Tests/TrimmingTests/System.Runtime.TrimmingTests.proj
@@ -24,7 +24,9 @@
     <TestConsoleAppSourceFiles Include="DebuggerVisualizerAttributeTests.cs" >
       <EnabledProperties>DebuggerSupport</EnabledProperties>
     </TestConsoleAppSourceFiles>
-    <TestConsoleAppSourceFiles Include="DefaultValueAttributeCtorTest.cs" />
+    <TestConsoleAppSourceFiles Include="DefaultValueAttributeCtorTest.cs">
+      <EnabledProperties>_DefaultValueAttributeSupport</EnabledProperties>
+    </TestConsoleAppSourceFiles>
     <TestConsoleAppSourceFiles Include="GenericArraySortHelperTest.cs" />
     <TestConsoleAppSourceFiles Include="InheritedAttributeTests.cs" />
     <TestConsoleAppSourceFiles Include="InterfacesOnArrays.cs" />

diff --git a/src/mono/sample/wasm/blazor-frame/blazor.csproj b/src/mono/sample/wasm/blazor-frame/blazor.csproj
@@ -11,8 +11,8 @@
 
   <ItemGroup>
     <!-- TODO un-pin this when it's possible -->
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.6.24328.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-preview.6.24328.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.7.24406.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-preview.7.24406.2" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0-preview.6.24328.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0-preview.7.24406.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj
@@ -12,8 +12,8 @@
 
   <!-- versions are pinned but when run from WBT level, it's taking in-tree runtime -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.6.24328.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-preview.6.24328.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.7.24406.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-preview.7.24406.2" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj
@@ -10,7 +10,7 @@
 
   <!-- versions are pinned but when run from WBT level, it's taking in-tree runtime -->
   <ItemGroup>
-    <PackageReference Include="System.Net.Http.Json" Version="9.0.0-preview.6.24327.7" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0-preview.6.24328.4" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.0-preview.7.24405.7" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0-preview.7.24406.2" />
   </ItemGroup>
 </Project>