From 7a9fa066be7edb378883797f7883d4a931647682 Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Thu, 19 Sep 2024 16:42:18 -0700
Subject: [PATCH] Add runtimeconfig option for DataSet XML serialization
 (#43556)

SDK change corresponding to https://github.com/dotnet/runtime/pull/107713.
---
 .../targets/Microsoft.NET.Sdk.targets                        | 5 +++++
 .../GivenThatWeWantToPublishAProjectWithAllFeatures.cs       | 1 +
 .../TestProjects/KitchenSink/TestApp/TestApp.csproj          | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
index 190993b84684..84efbe826588 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -549,6 +549,11 @@ Copyright (c) .NET Foundation. All rights reserved.
                                     Value="$(_ComObjectDescriptorSupport)"
                                     Trim="true" />
 
+    <RuntimeHostConfigurationOption Include="System.Data.DataSet.XmlSerializationIsSupported"
+                                    Condition="'$(_DataSetXmlSerializationSupport)' != ''"
+                                    Value="$(_DataSetXmlSerializationSupport)"
+                                    Trim="true" />
+
     <RuntimeHostConfigurationOption Include="System.Diagnostics.Debugger.IsSupported"
                                     Condition="'$(DebuggerSupport)' != ''"
                                     Value="$(DebuggerSupport)"
diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs
index cfc4fbbf448b..d57703a56e6a 100644
--- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs
+++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs
@@ -61,6 +61,7 @@ public void It_publishes_the_project_correctly(string targetFramework, string[]
             ""System.ComponentModel.DefaultValueAttribute.IsSupported"": true,
             ""System.ComponentModel.Design.IDesignerHost.IsSupported"": true,
             ""System.ComponentModel.TypeConverter.EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization"": false,
+            ""System.Data.DataSet.XmlSerializationIsSupported"": true,
             ""System.ComponentModel.TypeDescriptor.IsComObjectDescriptorSupported"": false,
             ""System.Diagnostics.Debugger.IsSupported"": true,
             ""System.Diagnostics.Metrics.Meter.IsSupported"": false,
diff --git a/test/TestAssets/TestProjects/KitchenSink/TestApp/TestApp.csproj b/test/TestAssets/TestProjects/KitchenSink/TestApp/TestApp.csproj
index 52e2f61a74a9..69e33cb831b4 100644
--- a/test/TestAssets/TestProjects/KitchenSink/TestApp/TestApp.csproj
+++ b/test/TestAssets/TestProjects/KitchenSink/TestApp/TestApp.csproj
@@ -14,6 +14,7 @@
     <_DefaultValueAttributeSupport>true</_DefaultValueAttributeSupport>
     <_DesignerHostSupport>true</_DesignerHostSupport>
     <EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization>false</EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization>
+    <_DataSetXmlSerializationSupport>true</_DataSetXmlSerializationSupport>
     <_ComObjectDescriptorSupport>false</_ComObjectDescriptorSupport>
     <DebuggerSupport>true</DebuggerSupport>
     <MetricsSupport>false</MetricsSupport>