Skip to content

Commit 83c8532

Browse files
zdickinsonfugrozacdickinsonAndrewKahrdavidmfinol
authored
Removed all instances of interpolated strings from editor scripts so we don't get compiler errors on old versions of .NET in Unity 2018 (#633)
Co-authored-by: Zac <[email protected]> Co-authored-by: Andrew Kahr <[email protected]> Co-authored-by: David Finol <[email protected]>
1 parent b11b6a6 commit 83c8532

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

dist/default-build-script/Assets/Editor/UnityBuilderAction/Builder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static void BuildProject()
7474
}
7575
catch (Exception e)
7676
{
77-
Debug.LogError($"Failed to run default addressables build:\n{e}");
77+
Debug.LogError("Failed to run default addressables build:\n" + e);
7878
}
7979
}
8080

dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/AndroidSettings.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ public static void Apply(Dictionary<string, string> options)
5656
case "androidStudioProject":
5757
EditorUserBuildSettings.exportAsGoogleAndroidProject = true;
5858
if (buildAppBundle != null)
59-
buildAppBundle.SetValue(null, false);
59+
buildAppBundle.SetValue(null, false, null);
6060
break;
6161
case "androidAppBundle":
6262
EditorUserBuildSettings.exportAsGoogleAndroidProject = false;
6363
if (buildAppBundle != null)
64-
buildAppBundle.SetValue(null, true);
64+
buildAppBundle.SetValue(null, true, null);
6565
break;
6666
case "androidPackage":
6767
EditorUserBuildSettings.exportAsGoogleAndroidProject = false;
6868
if (buildAppBundle != null)
69-
buildAppBundle.SetValue(null, false);
69+
buildAppBundle.SetValue(null, false, null);
7070
break;
7171
}
7272
}

dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/ArgumentsParser.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static Dictionary<string, string> GetValidatedOptions()
2828
}
2929

3030
if (!Enum.IsDefined(typeof(BuildTarget), buildTarget)) {
31-
Console.WriteLine($"{buildTarget} is not a defined {nameof(BuildTarget)}");
31+
Console.WriteLine(buildTarget + " is not a defined " + typeof(BuildTarget).Name);
3232
EditorApplication.Exit(121);
3333
}
3434

@@ -41,10 +41,10 @@ public static Dictionary<string, string> GetValidatedOptions()
4141
const string defaultCustomBuildName = "TestBuild";
4242
string customBuildName;
4343
if (!validatedOptions.TryGetValue("customBuildName", out customBuildName)) {
44-
Console.WriteLine($"Missing argument -customBuildName, defaulting to {defaultCustomBuildName}.");
44+
Console.WriteLine("Missing argument -customBuildName, defaulting to" + defaultCustomBuildName);
4545
validatedOptions.Add("customBuildName", defaultCustomBuildName);
4646
} else if (customBuildName == "") {
47-
Console.WriteLine($"Invalid argument -customBuildName, defaulting to {defaultCustomBuildName}.");
47+
Console.WriteLine("Invalid argument -customBuildName, defaulting to" + defaultCustomBuildName);
4848
validatedOptions.Add("customBuildName", defaultCustomBuildName);
4949
}
5050

@@ -57,11 +57,11 @@ static void ParseCommandLineArguments(out Dictionary<string, string> providedArg
5757
string[] args = Environment.GetCommandLineArgs();
5858

5959
Console.WriteLine(
60-
$"{EOL}" +
61-
$"###########################{EOL}" +
62-
$"# Parsing settings #{EOL}" +
63-
$"###########################{EOL}" +
64-
$"{EOL}"
60+
EOL +
61+
"###########################" + EOL +
62+
"# Parsing settings #" + EOL +
63+
"###########################" + EOL +
64+
EOL
6565
);
6666

6767
// Extract flags with optional values
@@ -78,7 +78,7 @@ static void ParseCommandLineArguments(out Dictionary<string, string> providedArg
7878
string displayValue = secret ? "*HIDDEN*" : "\"" + value + "\"";
7979

8080
// Assign
81-
Console.WriteLine($"Found flag \"{flag}\" with value {displayValue}.");
81+
Console.WriteLine("Found flag \"" + flag + "\" with value " + displayValue);
8282
providedArguments.Add(flag, value);
8383
}
8484
}

dist/default-build-script/Assets/Editor/UnityBuilderAction/Reporting/CompileListener.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private static void Application_logMessageReceived(string condition, string stac
3030
prefix = "error";
3131
break;
3232
}
33-
Console.WriteLine($"{Environment.NewLine}::{prefix} ::{condition}{Environment.NewLine}{stackTrace}");
33+
Console.WriteLine(Environment.NewLine + "::" + prefix + "::" + condition + Environment.NewLine + stackTrace);
3434
}
3535
}
3636
}

dist/default-build-script/Assets/Editor/UnityBuilderAction/Reporting/StdOutReporter.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ public class StdOutReporter
1111
public static void ReportSummary(BuildSummary summary)
1212
{
1313
Console.WriteLine(
14-
$"{EOL}" +
15-
$"###########################{EOL}" +
16-
$"# Build results #{EOL}" +
17-
$"###########################{EOL}" +
18-
$"{EOL}" +
19-
$"Duration: {summary.totalTime.ToString()}{EOL}" +
20-
$"Warnings: {summary.totalWarnings.ToString()}{EOL}" +
21-
$"Errors: {summary.totalErrors.ToString()}{EOL}" +
22-
$"Size: {summary.totalSize.ToString()} bytes{EOL}" +
23-
$"{EOL}"
14+
EOL +
15+
"###########################" + EOL +
16+
"# Build results #" + EOL +
17+
"###########################" + EOL +
18+
EOL +
19+
"Duration: " + summary.totalTime.ToString() + EOL +
20+
"Warnings: " + summary.totalWarnings.ToString() + EOL +
21+
"Errors: " + summary.totalErrors.ToString() + EOL +
22+
"Size: " + summary.totalSize.ToString() + " bytes" + EOL +
23+
EOL
2424
);
2525
}
2626

dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/Git.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public static string GenerateSemanticCommitVersion()
2121
version = GetSemanticCommitVersion();
2222
Console.WriteLine("Repository has a valid version tag.");
2323
} else {
24-
version = $"0.0.{GetTotalNumberOfCommits()}";
24+
version = "0.0." + GetTotalNumberOfCommits();
2525
Console.WriteLine("Repository does not have tags to base the version on.");
2626
}
2727

28-
Console.WriteLine($"Version is {version}");
28+
Console.WriteLine("Version is " + version);
2929

3030
return version;
3131
}

0 commit comments

Comments
 (0)