From 9caa16101f6730d06d4d091363ef2f887463c81a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Thu, 3 Aug 2023 05:21:55 +0900
Subject: [PATCH 1/4] Update TestApp.csproj

---
 src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj b/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj
index 0c4bb268304d..a5b512b0865b 100644
--- a/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj
+++ b/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj
@@ -26,6 +26,7 @@
     <CustomResourceTypesSupport>false</CustomResourceTypesSupport>
     <UseSystemResourceKeys>true</UseSystemResourceKeys>
     <DynamicCodeSupport>true</DynamicCodeSupport>
+    <XmlResolverNetworkingSupport>false</XmlResolverNetworkingSupport>
     <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
     <BuiltInComInteropSupport>false</BuiltInComInteropSupport>
     <_EnableConsumingManagedCodeFromNativeHosting>false</_EnableConsumingManagedCodeFromNativeHosting>

From effb61684a19f9eef8a2ade15db26f2fe8542e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Thu, 3 Aug 2023 05:24:16 +0900
Subject: [PATCH 2/4] Update Microsoft.NET.Sdk.targets

---
 .../targets/Microsoft.NET.Sdk.targets                        | 5 +++++
 1 file changed, 5 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 61ba663f2670..c9524e3d1670 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
@@ -626,6 +626,11 @@ Copyright (c) .NET Foundation. All rights reserved.
     <RuntimeHostConfigurationOption Include="System.Threading.ThreadPool.MaxThreads"
                                     Condition="'$(ThreadPoolMaxThreads)' != ''"
                                     Value="$(ThreadPoolMaxThreads)" />
+
+    <RuntimeHostConfigurationOption Include="System.Xml.XmlResolver.IsNetworkingEnabledByDefault"
+                                    Condition="'$(XmlResolverNetworkingSupport)' != ''"
+                                    Value="$(XmlResolverNetworkingSupport)"
+                                    Trim="true" />
   </ItemGroup>
 
   <!--

From 7225f3bea12cf027ff093f69e07595c8ebecde11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Thu, 3 Aug 2023 05:26:11 +0900
Subject: [PATCH 3/4] Update GivenThatWeWantToPublishAProjectWithAllFeatures.cs

---
 .../GivenThatWeWantToPublishAProjectWithAllFeatures.cs           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs
index b61039b38e63..92cee74d1d64 100644
--- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs
+++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs
@@ -87,6 +87,7 @@ public void It_publishes_the_project_correctly(string targetFramework, string []
             ""System.Threading.Thread.EnableAutoreleasePool"": false,
             ""System.Threading.ThreadPool.MinThreads"": 2,
             ""System.Threading.ThreadPool.MaxThreads"": 9,
+            ""System.Xml.XmlResolver.IsNetworkingEnabledByDefault"": false,
             ""extraProperty"": true
         },
         ""framework"": {

From 6d19d39b58047813c06f1916095a51d8f823acc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Fri, 11 Aug 2023 11:12:31 +0200
Subject: [PATCH 4/4] Apply suggestions from code review

---
 src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj    | 2 +-
 .../targets/Microsoft.NET.Sdk.targets                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj b/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj
index a5b512b0865b..5d8801e682fd 100644
--- a/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj
+++ b/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj
@@ -26,7 +26,7 @@
     <CustomResourceTypesSupport>false</CustomResourceTypesSupport>
     <UseSystemResourceKeys>true</UseSystemResourceKeys>
     <DynamicCodeSupport>true</DynamicCodeSupport>
-    <XmlResolverNetworkingSupport>false</XmlResolverNetworkingSupport>
+    <XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
     <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
     <BuiltInComInteropSupport>false</BuiltInComInteropSupport>
     <_EnableConsumingManagedCodeFromNativeHosting>false</_EnableConsumingManagedCodeFromNativeHosting>
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 c9524e3d1670..9e743512adfd 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
@@ -628,8 +628,8 @@ Copyright (c) .NET Foundation. All rights reserved.
                                     Value="$(ThreadPoolMaxThreads)" />
 
     <RuntimeHostConfigurationOption Include="System.Xml.XmlResolver.IsNetworkingEnabledByDefault"
-                                    Condition="'$(XmlResolverNetworkingSupport)' != ''"
-                                    Value="$(XmlResolverNetworkingSupport)"
+                                    Condition="'$(XmlResolverIsNetworkingEnabledByDefault)' != ''"
+                                    Value="$(XmlResolverIsNetworkingEnabledByDefault)"
                                     Trim="true" />
   </ItemGroup>