From 2cc7c31d5f64238603a3afbeb42384571d291bcf Mon Sep 17 00:00:00 2001
From: pavelsavara <pavel.savara@gmail.com>
Date: Wed, 8 Jan 2025 18:09:02 +0100
Subject: [PATCH 1/2] System.TimeZoneInfo.Invariant feature

---
 .../targets/Microsoft.NET.Sdk.targets                        | 5 +++++
 .../GivenThatWeWantToPublishAProjectWithAllFeatures.cs       | 1 +
 2 files changed, 6 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 84efbe826588..2b4e9c922098 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
@@ -600,6 +600,11 @@ Copyright (c) .NET Foundation. All rights reserved.
                                     Value="$(InvariantGlobalization)"
                                     Trim="true" />
 
+    <RuntimeHostConfigurationOption Include="System.TimeZoneInfo.Invariant"
+                                    Condition="'$(InvariantTimezone)' != ''"
+                                    Value="$(InvariantTimezone)"
+                                    Trim="true" />
+
     <RuntimeHostConfigurationOption Include="System.Globalization.Hybrid"
                                     Condition="'$(HybridGlobalization)' != ''"
                                     Value="$(HybridGlobalization)"
diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs
index d57703a56e6a..d127dee8ff47 100644
--- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs
+++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs
@@ -69,6 +69,7 @@ public void It_publishes_the_project_correctly(string targetFramework, string[]
             ""System.Diagnostics.Tracing.EventSource.IsSupported"": false,
             ""System.Drawing.Design.UITypeEditor.IsSupported"": true,
             ""System.Globalization.Invariant"": true,
+            ""System.TimeZoneInfo.Invariant"": true,
             ""System.Globalization.PredefinedCulturesOnly"": true,
             ""System.GC.Concurrent"": false,
             ""System.GC.Server"": true,

From 0e29af83152b86690e80a706ae952d30c7696e74 Mon Sep 17 00:00:00 2001
From: pavelsavara <pavel.savara@gmail.com>
Date: Wed, 8 Jan 2025 22:21:12 +0100
Subject: [PATCH 2/2] fix test

---
 src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs   | 1 +
 test/TestAssets/TestProjects/KitchenSink/TestApp/TestApp.csproj | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs b/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs
index 7a6ddc08c7c4..e8cfae873a1c 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs
@@ -41,6 +41,7 @@ public static class Properties
         public static readonly string PublishTrimmed = nameof(PublishTrimmed);
         public static readonly string PublishSelfContained = nameof(PublishSelfContained);
         public static readonly string InvariantGlobalization = nameof(InvariantGlobalization);
+        public static readonly string InvariantTimezone = nameof(InvariantTimezone);
     }
 
     public static class Items
diff --git a/test/TestAssets/TestProjects/KitchenSink/TestApp/TestApp.csproj b/test/TestAssets/TestProjects/KitchenSink/TestApp/TestApp.csproj
index 69e33cb831b4..5ac9d1500d59 100644
--- a/test/TestAssets/TestProjects/KitchenSink/TestApp/TestApp.csproj
+++ b/test/TestAssets/TestProjects/KitchenSink/TestApp/TestApp.csproj
@@ -22,6 +22,7 @@
     <EventSourceSupport>false</EventSourceSupport>
     <_WinFormsUITypeEditorSupport>true</_WinFormsUITypeEditorSupport>
     <InvariantGlobalization>true</InvariantGlobalization>
+    <InvariantTimezone>true</InvariantTimezone>
     <PredefinedCulturesOnly>true</PredefinedCulturesOnly>
     <ConcurrentGarbageCollection>false</ConcurrentGarbageCollection>
     <ServerGarbageCollection>true</ServerGarbageCollection>