Add implicit global usings and nullable reference types

SteveDesmond-ca · SteveDesmond-ca · commit 78db403e21e8 · 2021-11-16T13:21:04.000-05:00
diff --git a/src/App.cs b/src/App.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Security.Authentication;
-using System.Threading.Tasks;
 using Octokit;
 
 namespace GitHubLabelSync;
@@ -65,4 +63,4 @@ private async Task<Account> GetValidAccount(Settings settings)
 
 		return account;
 	}
-}
+}
diff --git a/src/Command.cs b/src/Command.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Threading.Tasks;
 using Spectre.Console;
 using Spectre.Console.Cli;
 
@@ -31,4 +29,4 @@ private Func<StatusContext, Task> Run(Settings settings)
 			=> await Factory
 				.App(settings.APIKey, s => ctx.Status(s), s => _console.WriteLine(s))
 				.Run(settings);
-}
+}
diff --git a/src/Factory.cs b/src/Factory.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 using Octokit;
 
@@ -16,4 +15,4 @@ public static App App(string apiKey, Action<string> setStatus, Action<string> lo
 		var sync = new Synchronizer(gitHub, setStatus, log);
 		return new App(sync, setStatus, log);
 	}
-}
+}
diff --git a/src/GitHub.cs b/src/GitHub.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Octokit;
 
 namespace GitHubLabelSync;
@@ -137,4 +133,4 @@ public async Task DeleteLabel(Repository repo, Label label)
 		await _client.Issue.Labels.Delete(repo.Id, label.Name);
 		_log($"Deleted {label.Name}");
 	}
-}
+}
diff --git a/src/GitHubLabelSync.csproj b/src/GitHubLabelSync.csproj
@@ -17,6 +17,8 @@
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<IncludeSymbols>true</IncludeSymbols>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Octokit" Version="0.50.0"/>
diff --git a/src/IGitHub.cs b/src/IGitHub.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using Octokit;
 
 namespace GitHubLabelSync;
@@ -23,4 +21,4 @@ public interface IGitHub
 	Task AddLabel(Repository repo, Label label);
 	Task EditLabel(Repository repo, Label label);
 	Task DeleteLabel(Repository repo, Label label);
-}
+}
diff --git a/src/ISynchronizer.cs b/src/ISynchronizer.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using Octokit;
 using Spectre.Console;
 
@@ -15,4 +13,4 @@ public interface ISynchronizer
 	Task<IReadOnlyList<Label>> GetAccountLabels(Account account);
 
 	Task SyncRepo(Repository repo, Settings settings, IReadOnlyList<Label> accountLabels);
-}
+}
diff --git a/src/Program.cs b/src/Program.cs
@@ -1,4 +1,3 @@
-using System.Threading.Tasks;
 using Spectre.Console.Cli;
 
 namespace GitHubLabelSync;
@@ -7,4 +6,4 @@ public static class Program
 {
 	public static async Task Main(string[] args)
 		=> await new CommandApp<Command>().RunAsync(args);
-}
+}
diff --git a/src/Settings.cs b/src/Settings.cs
@@ -8,11 +8,11 @@ public class Settings : CommandSettings
 {
 	[CommandArgument(0, "<org/username>")]
 	[Description("The name of the GitHub organization or username to sync")]
-	public string Name { get; init; }
+	public string Name { get; init; } = null!;
 
 	[CommandOption("-k|--api-key")]
 	[Description("GitHub API Key (Personal Access Token)")]
-	public string APIKey { get; init; }
+	public string APIKey { get; init; } = null!;
 
 	private readonly bool _noAdd;
 
@@ -56,4 +56,4 @@ public override ValidationResult Validate()
 		=> string.IsNullOrWhiteSpace(APIKey)
 			? ValidationResult.Error("GitHub API Key (Personal Access Token) is required")
 			: base.Validate();
-}
+}
diff --git a/src/Synchronizer.cs b/src/Synchronizer.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Octokit;
 using Spectre.Console;
 
@@ -183,4 +179,4 @@ private static bool NeedsUpdating(Label accountLabel, Label repoLabel)
 		=> string.Equals(accountLabel.Name, repoLabel.Name, StringComparison.InvariantCultureIgnoreCase) &&
 		   (!string.Equals(accountLabel.Description, repoLabel.Description, StringComparison.InvariantCultureIgnoreCase)
 			|| !string.Equals(accountLabel.Color, repoLabel.Color, StringComparison.InvariantCultureIgnoreCase));
-}
+}
diff --git a/test/AppTests.cs b/test/AppTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using NSubstitute;
 using Octokit;
 using Spectre.Console;
@@ -86,4 +83,4 @@ public async Task ThrowsOnUserValidationFailure()
 		//assert
 		await Assert.ThrowsAnyAsync<Exception>(async () => await task);
 	}
-}
+}
diff --git a/test/CommandTests.cs b/test/CommandTests.cs
@@ -1,4 +1,3 @@
-using System.Threading.Tasks;
 using NSubstitute;
 using Spectre.Console;
 using Spectre.Console.Cli;
@@ -26,4 +25,4 @@ public async Task RunPassesByDefault()
 		//assert
 		Assert.Equal(0, result);
 	}
-}
+}
diff --git a/test/FactoryTests.cs b/test/FactoryTests.cs
@@ -8,9 +8,9 @@ public class FactoryTests
 	public void CanCreateApp()
 	{
 		//act
-		var app = Factory.App("abc123", null, null);
+		var app = Factory.App("abc123", _ => { }, _ => { });
 
 		//assert
 		Assert.IsType<App>(app);
 	}
-}
+}
diff --git a/test/GitHubLabelSync.Tests.csproj b/test/GitHubLabelSync.Tests.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
-		<IsPackable>false</IsPackable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0"/>
diff --git a/test/GitHubTests.cs b/test/GitHubTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Threading.Tasks;
 using NSubstitute;
 using NSubstitute.ExceptionExtensions;
 using Octokit;
@@ -298,4 +295,4 @@ public async Task CanDeleteLabel()
 		//assert
 		await client.Issue.Labels.Received().Delete(123, "test");
 	}
-}
+}
diff --git a/test/ProgramTests.cs b/test/ProgramTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace GitHubLabelSync.Tests;
@@ -19,4 +17,4 @@ public async Task CanRunProgram()
 		await program;
 		Assert.True(program.IsCompleted);
 	}
-}
+}
diff --git a/test/SettingsTests.cs b/test/SettingsTests.cs
@@ -70,4 +70,4 @@ public void APIKeyIsRequired()
 		//assert
 		Assert.False(valid.Successful);
 	}
-}
+}
diff --git a/test/Stubs/ArchivedRepository.cs b/test/Stubs/ArchivedRepository.cs
@@ -8,4 +8,4 @@ public ArchivedRepository()
 	{
 		Archived = true;
 	}
-}
+}
diff --git a/test/Stubs/Label.cs b/test/Stubs/Label.cs
@@ -8,4 +8,4 @@ public Label(string name, string description, string color)
 		Description = description;
 		Color = color;
 	}
-}
+}
diff --git a/test/Stubs/Organization.cs b/test/Stubs/Organization.cs
@@ -9,4 +9,4 @@ public Organization(string name)
 		Type = AccountType.Organization;
 		Login = name;
 	}
-}
+}
diff --git a/test/Stubs/User.cs b/test/Stubs/User.cs
@@ -9,4 +9,4 @@ public User(string name)
 		Type = AccountType.User;
 		Login = name;
 	}
-}
+}
diff --git a/test/SynchronizerTests.cs b/test/SynchronizerTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Threading.Tasks;
 using NSubstitute;
 using NSubstitute.ExceptionExtensions;
 using Octokit;
@@ -394,4 +392,4 @@ public async Task DryRunPerformsNoActions()
 		await gitHub.DidNotReceive().EditLabel(Arg.Any<Repository>(), Arg.Any<Label>());
 		await gitHub.DidNotReceive().DeleteLabel(Arg.Any<Repository>(), Arg.Any<Label>());
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System;`
`2`	`1`	`using System.Reflection;`
`3`	`2`	`using Octokit;`
`4`	`3`
`@@ -16,4 +15,4 @@ public static App App(string apiKey, Action<string> setStatus, Action<string> lo`
`16`	`15`	`var sync = new Synchronizer(gitHub, setStatus, log);`
`17`	`16`	`return new App(sync, setStatus, log);`
`18`	`17`	`}`
`19`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System.Threading.Tasks;`
`2`	`1`	`using Spectre.Console.Cli;`
`3`	`2`
`4`	`3`	`namespace GitHubLabelSync;`
`@@ -7,4 +6,4 @@ public static class Program`
`7`	`6`	`{`
`8`	`7`	`public static async Task Main(string[] args)`
`9`	`8`	`=> await new CommandApp<Command>().RunAsync(args);`
`10`		`-}`
	`9`	`+}`