Skip to content

Commit 98c4bb0

Browse files
authored
Merge pull request #144 from Unity-Technologies/fix-zips
Create zip at location where CI is looking for it.
2 parents cac73a1 + 8165434 commit 98c4bb0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ public static IEnumerable<object[]> Platform_TimeZoneNamesTestData()
117117
{ TimeZoneInfo.FindSystemTimeZoneById(s_strPacific), "(UTC-08:00) Pacific Time (Los Angeles)", "Pacific Standard Time", "Pacific Daylight Time" },
118118
{ TimeZoneInfo.FindSystemTimeZoneById(s_strSydney), "(UTC+10:00) Eastern Australia Time (Sydney)", "Australian Eastern Standard Time", "Australian Eastern Daylight Time" },
119119
{ TimeZoneInfo.FindSystemTimeZoneById(s_strPerth), "(UTC+08:00) Australian Western Standard Time (Perth)", "Australian Western Standard Time", "Australian Western Daylight Time" },
120-
{ TimeZoneInfo.FindSystemTimeZoneById(s_strIran), "(UTC+03:30) Iran Time", "Iran Standard Time", "Iran Daylight Time" },
120+
121+
// https://github.com/dotnet/runtime/issues/83901 The name is not same accross different OS updates.
122+
// { TimeZoneInfo.FindSystemTimeZoneById(s_strIran), "(UTC+03:30) Iran Time", "Iran Standard Time", "Iran Daylight Time" },
121123

122124
{ s_NewfoundlandTz, "(UTC-03:30) Newfoundland Time (St. John’s)", "Newfoundland Standard Time", "Newfoundland Daylight Time" },
123125
{ s_catamarcaTz, "(UTC-03:00) Argentina Standard Time (Catamarca)", "Argentina Standard Time", "Argentina Summer Time" }

unity/CITools/BuildDriver/CoreCLR.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public static void Build(GlobalConfig gConfig)
2222
"-subset clr+libs",
2323
$"-a {gConfig.Architecture}",
2424
$"-c {gConfig.Configuration}",
25-
$"-v:{gConfig.DotNetVerbosity}"
2625
};
2726

2827
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -108,7 +107,6 @@ private static void TestClassLibraries(GlobalConfig gConfig)
108107
"-test /p:RunSmokeTestsOnly=true",
109108
$"-a {gConfig.Architecture}",
110109
$"-c {gConfig.Configuration}",
111-
$"-v:{gConfig.DotNetVerbosity}"
112110
};
113111

114112
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))

unity/CITools/BuildDriver/SevenZip.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static void Zip(NPath zipExe, NPath artifacts, GlobalConfig gConfig)
3131
{
3232
NPath zipArtifact = new (Environment.GetEnvironmentVariable("ARTIFACT_FILENAME") ??
3333
$"dotnet-unity-{gConfig.Architecture}.7z");
34-
SevenZip.Create7z(zipExe, artifacts, Paths.Artifacts.Combine(zipArtifact));
34+
SevenZip.Create7z(zipExe, artifacts, Paths.Artifacts.Combine("unity", zipArtifact));
3535
}
3636

3737
public static void Get7ZipUrl(out string url, out string filename)

0 commit comments

Comments
 (0)