diff --git a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs b/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs index ea3b1bfdef1a6c..6df5d8a89c1166 100644 --- a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs +++ b/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs @@ -117,7 +117,9 @@ public static IEnumerable Platform_TimeZoneNamesTestData() { TimeZoneInfo.FindSystemTimeZoneById(s_strPacific), "(UTC-08:00) Pacific Time (Los Angeles)", "Pacific Standard Time", "Pacific Daylight Time" }, { TimeZoneInfo.FindSystemTimeZoneById(s_strSydney), "(UTC+10:00) Eastern Australia Time (Sydney)", "Australian Eastern Standard Time", "Australian Eastern Daylight Time" }, { TimeZoneInfo.FindSystemTimeZoneById(s_strPerth), "(UTC+08:00) Australian Western Standard Time (Perth)", "Australian Western Standard Time", "Australian Western Daylight Time" }, - { TimeZoneInfo.FindSystemTimeZoneById(s_strIran), "(UTC+03:30) Iran Time", "Iran Standard Time", "Iran Daylight Time" }, + + // https://github.com/dotnet/runtime/issues/83901 The name is not same accross different OS updates. + // { TimeZoneInfo.FindSystemTimeZoneById(s_strIran), "(UTC+03:30) Iran Time", "Iran Standard Time", "Iran Daylight Time" }, { s_NewfoundlandTz, "(UTC-03:30) Newfoundland Time (St. John’s)", "Newfoundland Standard Time", "Newfoundland Daylight Time" }, { s_catamarcaTz, "(UTC-03:00) Argentina Standard Time (Catamarca)", "Argentina Standard Time", "Argentina Summer Time" } diff --git a/unity/CITools/BuildDriver/CoreCLR.cs b/unity/CITools/BuildDriver/CoreCLR.cs index dfc70f53c118b0..a449d42d3da215 100644 --- a/unity/CITools/BuildDriver/CoreCLR.cs +++ b/unity/CITools/BuildDriver/CoreCLR.cs @@ -22,7 +22,6 @@ public static void Build(GlobalConfig gConfig) "-subset clr+libs", $"-a {gConfig.Architecture}", $"-c {gConfig.Configuration}", - $"-v:{gConfig.DotNetVerbosity}" }; if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) @@ -108,7 +107,6 @@ private static void TestClassLibraries(GlobalConfig gConfig) "-test /p:RunSmokeTestsOnly=true", $"-a {gConfig.Architecture}", $"-c {gConfig.Configuration}", - $"-v:{gConfig.DotNetVerbosity}" }; if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) diff --git a/unity/CITools/BuildDriver/SevenZip.cs b/unity/CITools/BuildDriver/SevenZip.cs index b788e656512f51..017a26065117bd 100644 --- a/unity/CITools/BuildDriver/SevenZip.cs +++ b/unity/CITools/BuildDriver/SevenZip.cs @@ -31,7 +31,7 @@ public static void Zip(NPath zipExe, NPath artifacts, GlobalConfig gConfig) { NPath zipArtifact = new (Environment.GetEnvironmentVariable("ARTIFACT_FILENAME") ?? $"dotnet-unity-{gConfig.Architecture}.7z"); - SevenZip.Create7z(zipExe, artifacts, Paths.Artifacts.Combine(zipArtifact)); + SevenZip.Create7z(zipExe, artifacts, Paths.Artifacts.Combine("unity", zipArtifact)); } public static void Get7ZipUrl(out string url, out string filename)