Skip to content

Commit 6b8a560

Browse files
committed
C#: Enable nullability for Autobuild tests project.
1 parent 29a5ea1 commit 6b8a560

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

csharp/autobuilder/Semmle.Autobuild.Tests/BuildScripts.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ bool IBuildActions.FileExists(string file)
4444
public IDictionary<string, string> RunProcessOut = new Dictionary<string, string>();
4545
public IDictionary<string, string> RunProcessWorkingDirectory = new Dictionary<string, string>();
4646

47-
int IBuildActions.RunProcess(string cmd, string args, string workingDirectory, IDictionary<string, string> env, out IList<string> stdOut)
47+
int IBuildActions.RunProcess(string cmd, string args, string? workingDirectory, IDictionary<string, string>? env, out IList<string> stdOut)
4848
{
4949
var pattern = cmd + " " + args;
5050
RunProcessIn.Add(pattern);
@@ -60,7 +60,7 @@ int IBuildActions.RunProcess(string cmd, string args, string workingDirectory, I
6060
throw new ArgumentException("Missing RunProcess " + pattern);
6161
}
6262

63-
int IBuildActions.RunProcess(string cmd, string args, string workingDirectory, IDictionary<string, string> env)
63+
int IBuildActions.RunProcess(string cmd, string args, string? workingDirectory, IDictionary<string, string>? env)
6464
{
6565
var pattern = cmd + " " + args;
6666
RunProcessIn.Add(pattern);
@@ -90,16 +90,16 @@ bool IBuildActions.DirectoryExists(string dir)
9090
throw new ArgumentException("Missing DirectoryExists " + dir);
9191
}
9292

93-
public IDictionary<string, string> GetEnvironmentVariable = new Dictionary<string, string>();
93+
public IDictionary<string, string?> GetEnvironmentVariable = new Dictionary<string, string?>();
9494

95-
string IBuildActions.GetEnvironmentVariable(string name)
95+
string? IBuildActions.GetEnvironmentVariable(string name)
9696
{
9797
if (GetEnvironmentVariable.TryGetValue(name, out var ret))
9898
return ret;
9999
throw new ArgumentException("Missing GetEnvironmentVariable " + name);
100100
}
101101

102-
public string GetCurrentDirectory;
102+
public string GetCurrentDirectory = "";
103103

104104
string IBuildActions.GetCurrentDirectory()
105105
{
@@ -334,10 +334,10 @@ public void TestTry()
334334
}
335335

336336
Autobuilder CreateAutoBuilder(string lgtmLanguage, bool isWindows,
337-
string buildless = null, string solution = null, string buildCommand = null, string ignoreErrors = null,
338-
string msBuildArguments = null, string msBuildPlatform = null, string msBuildConfiguration = null, string msBuildTarget = null,
339-
string dotnetArguments = null, string dotnetVersion = null, string vsToolsVersion = null,
340-
string nugetRestore = null, string allSolutions = null,
337+
string? buildless = null, string? solution = null, string? buildCommand = null, string? ignoreErrors = null,
338+
string? msBuildArguments = null, string? msBuildPlatform = null, string? msBuildConfiguration = null, string? msBuildTarget = null,
339+
string? dotnetArguments = null, string? dotnetVersion = null, string? vsToolsVersion = null,
340+
string? nugetRestore = null, string? allSolutions = null,
341341
string cwd = @"C:\Project")
342342
{
343343
Actions.GetEnvironmentVariable["CODEQL_AUTOBUILDER_CSHARP_NO_INDEXING"] = "false";

csharp/autobuilder/Semmle.Autobuild.Tests/Semmle.Autobuild.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<TargetFramework>netcoreapp3.0</TargetFramework>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
8+
<Nullable>enable</Nullable>
89
</PropertyGroup>
910

1011
<ItemGroup>

csharp/autobuilder/Semmle.Autobuild/BuildScript.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class BuildCommand : BuildScript
6161
/// <param name="silent">Whether this command should run silently.</param>
6262
/// <param name="workingDirectory">The working directory (<code>null</code> for current directory).</param>
6363
/// <param name="environment">Additional environment variables.</param>
64-
public BuildCommand(string exe, string argumentsOpt, bool silent, string? workingDirectory = null, IDictionary<string, string>? environment = null)
64+
public BuildCommand(string exe, string? argumentsOpt, bool silent, string? workingDirectory = null, IDictionary<string, string>? environment = null)
6565
{
6666
this.exe = exe;
6767
this.arguments = argumentsOpt ?? "";
@@ -183,7 +183,7 @@ public override int Run(IBuildActions actions, Action<string, bool> startCallbac
183183
/// <param name="silent">Whether the executable should run silently.</param>
184184
/// <param name="workingDirectory">The working directory (<code>null</code> for current directory).</param>
185185
/// <param name="environment">Additional environment variables.</param>
186-
public static BuildScript Create(string exe, string argumentsOpt, bool silent, string? workingDirectory, IDictionary<string, string>? environment) =>
186+
public static BuildScript Create(string exe, string? argumentsOpt, bool silent, string? workingDirectory, IDictionary<string, string>? environment) =>
187187
new BuildCommand(exe, argumentsOpt, silent, workingDirectory, environment);
188188

189189
/// <summary>

0 commit comments

Comments
 (0)