Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7d544e3

Browse files
tamasvajktamasvajk
committed
C#: Add declaration visibility modifiers
1 parent 466e0cf commit 7d544e3

199 files changed

Lines changed: 912 additions & 895 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Semmle.Autobuild.CSharp.Tests
1515
/// - an IList to capture the the arguments passed to it
1616
/// - an IDictionary of possible return values.
1717
/// </summary>
18-
class TestActions : IBuildActions
18+
internal class TestActions : IBuildActions
1919
{
2020
/// <summary>
2121
/// List of strings passed to FileDelete.
@@ -197,7 +197,7 @@ public void DownloadFile(string address, string fileName)
197197
/// <summary>
198198
/// A fake solution to build.
199199
/// </summary>
200-
class TestSolution : ISolution
200+
internal class TestSolution : ISolution
201201
{
202202
public IEnumerable<SolutionConfigurationInSolution> Configurations => throw new NotImplementedException();
203203

@@ -219,21 +219,21 @@ public TestSolution(string path)
219219

220220
public class BuildScriptTests
221221
{
222-
readonly TestActions Actions = new TestActions();
222+
private readonly TestActions Actions = new TestActions();
223223

224224
// Records the arguments passed to StartCallback.
225-
readonly IList<string> StartCallbackIn = new List<string>();
225+
private readonly IList<string> StartCallbackIn = new List<string>();
226226

227-
void StartCallback(string s, bool silent)
227+
private void StartCallback(string s, bool silent)
228228
{
229229
StartCallbackIn.Add(s);
230230
}
231231

232232
// Records the arguments passed to EndCallback
233-
readonly IList<string> EndCallbackIn = new List<string>();
234-
readonly IList<int> EndCallbackReturn = new List<int>();
233+
private readonly IList<string> EndCallbackIn = new List<string>();
234+
private readonly IList<int> EndCallbackReturn = new List<int>();
235235

236-
void EndCallback(int ret, string s, bool silent)
236+
private void EndCallback(int ret, string s, bool silent)
237237
{
238238
EndCallbackReturn.Add(ret);
239239
EndCallbackIn.Add(s);
@@ -372,7 +372,7 @@ public void TestTry()
372372
Assert.Equal(0, BuildScript.Try(BuildScript.Failure).Run(Actions, StartCallback, EndCallback));
373373
}
374374

375-
CSharpAutobuilder CreateAutoBuilder(bool isWindows,
375+
private CSharpAutobuilder CreateAutoBuilder(bool isWindows,
376376
string? buildless = null, string? solution = null, string? buildCommand = null, string? ignoreErrors = null,
377377
string? msBuildArguments = null, string? msBuildPlatform = null, string? msBuildConfiguration = null, string? msBuildTarget = null,
378378
string? dotnetArguments = null, string? dotnetVersion = null, string? vsToolsVersion = null,
@@ -572,7 +572,7 @@ public void TestLinuxBuildlessExtractionSolution()
572572
TestAutobuilderScript(autobuilder, 0, 1);
573573
}
574574

575-
void SkipVsWhere()
575+
private void SkipVsWhere()
576576
{
577577
Actions.FileExists[@"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"] = false;
578578
Actions.FileExists[@"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"] = false;
@@ -581,7 +581,7 @@ void SkipVsWhere()
581581
Actions.FileExists[@"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"] = false;
582582
}
583583

584-
void TestAutobuilderScript(Autobuilder autobuilder, int expectedOutput, int commandsRun)
584+
private void TestAutobuilderScript(Autobuilder autobuilder, int expectedOutput, int commandsRun)
585585
{
586586
Assert.Equal(expectedOutput, autobuilder.GetBuildScript().Run(Actions, StartCallback, EndCallback));
587587

‎csharp/autobuilder/Semmle.Autobuild.CSharp/CSharpAutobuilder.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ BuildScript IntermediateAttempt(BuildScript s) =>
9292
/// Gets the build strategy that the autobuilder should apply, based on the
9393
/// options in the `lgtm.yml` file.
9494
/// </summary>
95-
CSharpBuildStrategy GetCSharpBuildStrategy()
95+
private CSharpBuildStrategy GetCSharpBuildStrategy()
9696
{
9797
if (Options.BuildCommand != null)
9898
return CSharpBuildStrategy.CustomBuildCommand;
@@ -112,7 +112,7 @@ CSharpBuildStrategy GetCSharpBuildStrategy()
112112
return CSharpBuildStrategy.Auto;
113113
}
114114

115-
enum CSharpBuildStrategy
115+
private enum CSharpBuildStrategy
116116
{
117117
CustomBuildCommand,
118118
Buildless,

‎csharp/autobuilder/Semmle.Autobuild.CSharp/DotNetRule.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Semmle.Autobuild.CSharp
1414
/// A build rule where the build command is of the form "dotnet build".
1515
/// Currently unused because the tracer does not work with dotnet.
1616
/// </summary>
17-
class DotNetRule : IBuildRule
17+
internal class DotNetRule : IBuildRule
1818
{
1919
public BuildScript Analyse(Autobuilder builder, bool auto)
2020
{
@@ -57,7 +57,7 @@ public BuildScript Analyse(Autobuilder builder, bool auto)
5757
});
5858
}
5959

60-
static BuildScript WithDotNet(Autobuilder builder, Func<string?, IDictionary<string, string>?, bool, BuildScript> f)
60+
private static BuildScript WithDotNet(Autobuilder builder, Func<string?, IDictionary<string, string>?, bool, BuildScript> f)
6161
{
6262
string? installDir = builder.Actions.PathCombine(builder.Options.RootDirectory, ".dotnet");
6363
var installScript = DownloadDotNet(builder, installDir);
@@ -129,7 +129,7 @@ public static BuildScript WithDotNet(Autobuilder builder, Func<IDictionary<strin
129129
/// .NET Core SDK. The SDK(s) will be installed at <code>installDir</code>
130130
/// (provided that the script succeeds).
131131
/// </summary>
132-
static BuildScript DownloadDotNet(Autobuilder builder, string installDir)
132+
private static BuildScript DownloadDotNet(Autobuilder builder, string installDir)
133133
{
134134
if (!string.IsNullOrEmpty(builder.Options.DotNetVersion))
135135
// Specific version supplied in configuration: always use that
@@ -166,7 +166,7 @@ static BuildScript DownloadDotNet(Autobuilder builder, string installDir)
166166
///
167167
/// See https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script.
168168
/// </summary>
169-
static BuildScript DownloadDotNetVersion(Autobuilder builder, string path, string version)
169+
private static BuildScript DownloadDotNetVersion(Autobuilder builder, string path, string version)
170170
{
171171
return BuildScript.Bind(GetInstalledSdksScript(builder.Actions), (sdks, sdksRet) =>
172172
{
@@ -257,42 +257,42 @@ public bool CheckValidationResult(ServicePoint srvPoint, X509Certificate certifi
257257
});
258258
}
259259

260-
static BuildScript GetInstalledSdksScript(IBuildActions actions)
260+
private static BuildScript GetInstalledSdksScript(IBuildActions actions)
261261
{
262262
var listSdks = new CommandBuilder(actions, silent: true).
263263
RunCommand("dotnet").
264264
Argument("--list-sdks");
265265
return listSdks.Script;
266266
}
267267

268-
static string DotNetCommand(IBuildActions actions, string? dotNetPath) =>
268+
private static string DotNetCommand(IBuildActions actions, string? dotNetPath) =>
269269
dotNetPath != null ? actions.PathCombine(dotNetPath, "dotnet") : "dotnet";
270270

271-
static BuildScript GetInfoCommand(IBuildActions actions, string? dotNetPath, IDictionary<string, string>? environment)
271+
private static BuildScript GetInfoCommand(IBuildActions actions, string? dotNetPath, IDictionary<string, string>? environment)
272272
{
273273
var info = new CommandBuilder(actions, null, environment).
274274
RunCommand(DotNetCommand(actions, dotNetPath)).
275275
Argument("--info");
276276
return info.Script;
277277
}
278278

279-
static CommandBuilder GetCleanCommand(IBuildActions actions, string? dotNetPath, IDictionary<string, string>? environment)
279+
private static CommandBuilder GetCleanCommand(IBuildActions actions, string? dotNetPath, IDictionary<string, string>? environment)
280280
{
281281
var clean = new CommandBuilder(actions, null, environment).
282282
RunCommand(DotNetCommand(actions, dotNetPath)).
283283
Argument("clean");
284284
return clean;
285285
}
286286

287-
static CommandBuilder GetRestoreCommand(IBuildActions actions, string? dotNetPath, IDictionary<string, string>? environment)
287+
private static CommandBuilder GetRestoreCommand(IBuildActions actions, string? dotNetPath, IDictionary<string, string>? environment)
288288
{
289289
var restore = new CommandBuilder(actions, null, environment).
290290
RunCommand(DotNetCommand(actions, dotNetPath)).
291291
Argument("restore");
292292
return restore;
293293
}
294294

295-
static BuildScript GetInstalledRuntimesScript(IBuildActions actions, string? dotNetPath, IDictionary<string, string>? environment)
295+
private static BuildScript GetInstalledRuntimesScript(IBuildActions actions, string? dotNetPath, IDictionary<string, string>? environment)
296296
{
297297
var listSdks = new CommandBuilder(actions, environment: environment, silent: true).
298298
RunCommand(DotNetCommand(actions, dotNetPath)).
@@ -309,7 +309,7 @@ static BuildScript GetInstalledRuntimesScript(IBuildActions actions, string? dot
309309
/// hence the need for CLR tracing), by adding a
310310
/// `/p:UseSharedCompilation=false` argument.
311311
/// </summary>
312-
static BuildScript GetBuildScript(Autobuilder builder, string? dotNetPath, IDictionary<string, string>? environment, bool compatibleClr, string projOrSln)
312+
private static BuildScript GetBuildScript(Autobuilder builder, string? dotNetPath, IDictionary<string, string>? environment, bool compatibleClr, string projOrSln)
313313
{
314314
var build = new CommandBuilder(builder.Actions, null, environment);
315315
var script = builder.MaybeIndex(build, DotNetCommand(builder.Actions, dotNetPath)).

‎csharp/autobuilder/Semmle.Autobuild.CSharp/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
namespace Semmle.Autobuild.CSharp
55
{
6-
class Program
6+
public static class Program
77
{
8-
static int Main()
8+
public static int Main()
99
{
1010

1111
try

‎csharp/autobuilder/Semmle.Autobuild.CSharp/StandaloneBuildRule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Semmle.Autobuild.CSharp
55
/// <summary>
66
/// Build using standalone extraction.
77
/// </summary>
8-
class StandaloneBuildRule : IBuildRule
8+
internal class StandaloneBuildRule : IBuildRule
99
{
1010
public BuildScript Analyse(Autobuilder builder, bool auto)
1111
{

‎csharp/autobuilder/Semmle.Autobuild.Shared/AutobuildOptions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public static string[] AsListWithExpandedEnvVars(this string? value, IBuildActio
8888
Select(s => AsStringWithExpandedEnvVars(s, actions)).ToArray();
8989
}
9090

91-
static readonly Regex linuxEnvRegEx = new Regex(@"\$([a-zA-Z_][a-zA-Z_0-9]*)", RegexOptions.Compiled);
91+
private static readonly Regex linuxEnvRegEx = new Regex(@"\$([a-zA-Z_][a-zA-Z_0-9]*)", RegexOptions.Compiled);
9292

9393
public static string AsStringWithExpandedEnvVars(this string value, IBuildActions actions)
9494
{

‎csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public abstract class Autobuilder
4848
/// by distance in ascending order.
4949
/// </summary>
5050
public IEnumerable<(string, int)> Paths => pathsLazy.Value;
51-
readonly Lazy<IEnumerable<(string, int)>> pathsLazy;
51+
private readonly Lazy<IEnumerable<(string, int)>> pathsLazy;
5252

5353
/// <summary>
5454
/// Gets a list of paths matching a set of extensions (including the "."),
@@ -91,7 +91,7 @@ public abstract class Autobuilder
9191
/// <returns>True iff the path was found.</returns>
9292
public bool HasPath(string path) => Paths.Any(p => path == p.Item1);
9393

94-
void FindFiles(string dir, int depth, int maxDepth, IList<(string, int)> results)
94+
private void FindFiles(string dir, int depth, int maxDepth, IList<(string, int)> results)
9595
{
9696
foreach (var f in Actions.EnumerateFiles(dir))
9797
{
@@ -110,7 +110,7 @@ void FindFiles(string dir, int depth, int maxDepth, IList<(string, int)> results
110110
/// <summary>
111111
/// The root of the source directory.
112112
/// </summary>
113-
string RootDirectory => Options.RootDirectory;
113+
private string RootDirectory => Options.RootDirectory;
114114

115115
/// <summary>
116116
/// Gets the supplied build configuration.
@@ -123,7 +123,7 @@ void FindFiles(string dir, int depth, int maxDepth, IList<(string, int)> results
123123
/// </summary>
124124
public IBuildActions Actions { get; }
125125

126-
IEnumerable<IProjectOrSolution>? FindFiles(string extension, Func<string, ProjectOrSolution> create)
126+
private IEnumerable<IProjectOrSolution>? FindFiles(string extension, Func<string, ProjectOrSolution> create)
127127
{
128128
var matchingFiles = GetExtensions(extension)
129129
.Select(p => (ProjectOrSolution: create(p.Item1), DistanceFromRoot: p.Item2))
@@ -209,7 +209,7 @@ protected Autobuilder(IBuildActions actions, AutobuildOptions options)
209209

210210
protected string SourceArchiveDir { get; }
211211

212-
readonly ILogger logger = new ConsoleLogger(Verbosity.Info);
212+
private readonly ILogger logger = new ConsoleLogger(Verbosity.Info);
213213

214214
/// <summary>
215215
/// Log a given build event to the console.

‎csharp/autobuilder/Semmle.Autobuild.Shared/BuildActions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public class SystemBuildActions : IBuildActions
150150

151151
bool IBuildActions.FileExists(string file) => File.Exists(file);
152152

153-
static ProcessStartInfo GetProcessStartInfo(string exe, string arguments, string? workingDirectory, IDictionary<string, string>? environment, bool redirectStandardOutput)
153+
private static ProcessStartInfo GetProcessStartInfo(string exe, string arguments, string? workingDirectory, IDictionary<string, string>? environment, bool redirectStandardOutput)
154154
{
155155
var pi = new ProcessStartInfo(exe, arguments)
156156
{
@@ -215,7 +215,7 @@ XmlDocument IBuildActions.LoadXml(string filename)
215215

216216
public string EnvironmentExpandEnvironmentVariables(string s) => Environment.ExpandEnvironmentVariables(s);
217217

218-
static async Task DownloadFileAsync(string address, string filename)
218+
private static async Task DownloadFileAsync(string address, string filename)
219219
{
220220
using var httpClient = new HttpClient();
221221
using var request = new HttpRequestMessage(HttpMethod.Get, address);

‎csharp/autobuilder/Semmle.Autobuild.Shared/BuildCommandAutoRule.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ public BuildCommandAutoRule(WithDotNet withDotNet)
1616
this.withDotNet = withDotNet;
1717
}
1818

19-
readonly IEnumerable<string> winExtensions = new List<string> {
19+
private readonly IEnumerable<string> winExtensions = new List<string> {
2020
".bat",
2121
".cmd",
2222
".exe"
2323
};
2424

25-
readonly IEnumerable<string> linuxExtensions = new List<string> {
25+
private readonly IEnumerable<string> linuxExtensions = new List<string> {
2626
"",
2727
".sh"
2828
};
2929

30-
readonly IEnumerable<string> buildScripts = new List<string> {
30+
private readonly IEnumerable<string> buildScripts = new List<string> {
3131
"build"
3232
};
3333

‎csharp/autobuilder/Semmle.Autobuild.Shared/BuildScript.cs‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ public abstract class BuildScript
4646
/// <returns>The exit code from this build script.</returns>
4747
public abstract int Run(IBuildActions actions, Action<string, bool> startCallback, Action<int, string, bool> exitCallBack, out IList<string> stdout);
4848

49-
class BuildCommand : BuildScript
49+
private class BuildCommand : BuildScript
5050
{
51-
readonly string exe, arguments;
52-
readonly string? workingDirectory;
53-
readonly IDictionary<string, string>? environment;
54-
readonly bool silent;
51+
private readonly string exe, arguments;
52+
private readonly string? workingDirectory;
53+
private readonly IDictionary<string, string>? environment;
54+
private readonly bool silent;
5555

5656
/// <summary>
5757
/// Create a simple build command.
@@ -112,9 +112,9 @@ public override int Run(IBuildActions actions, Action<string, bool> startCallbac
112112

113113
}
114114

115-
class ReturnBuildCommand : BuildScript
115+
private class ReturnBuildCommand : BuildScript
116116
{
117-
readonly Func<IBuildActions, int> func;
117+
private readonly Func<IBuildActions, int> func;
118118
public ReturnBuildCommand(Func<IBuildActions, int> func)
119119
{
120120
this.func = func;
@@ -129,11 +129,12 @@ public override int Run(IBuildActions actions, Action<string, bool> startCallbac
129129
}
130130
}
131131

132-
class BindBuildScript : BuildScript
132+
private class BindBuildScript : BuildScript
133133
{
134-
readonly BuildScript s1;
135-
readonly Func<IList<string>, int, BuildScript>? s2a;
136-
readonly Func<int, BuildScript>? s2b;
134+
private readonly BuildScript s1;
135+
private readonly Func<IList<string>, int, BuildScript>? s2a;
136+
private readonly Func<int, BuildScript>? s2b;
137+
137138
public BindBuildScript(BuildScript s1, Func<IList<string>, int, BuildScript> s2)
138139
{
139140
this.s1 = s1;
@@ -227,19 +228,19 @@ public static BuildScript Bind(BuildScript s1, Func<int, BuildScript> s2) =>
227228
public static BuildScript Bind(BuildScript s1, Func<IList<string>, int, BuildScript> s2) =>
228229
new BindBuildScript(s1, s2);
229230

230-
const int SuccessCode = 0;
231+
private const int SuccessCode = 0;
231232
/// <summary>
232233
/// The empty build script that always returns exit code 0.
233234
/// </summary>
234235
public static readonly BuildScript Success = Create(actions => SuccessCode);
235236

236-
const int FailureCode = 1;
237+
private const int FailureCode = 1;
237238
/// <summary>
238239
/// The empty build script that always returns exit code 1.
239240
/// </summary>
240241
public static readonly BuildScript Failure = Create(actions => FailureCode);
241242

242-
static bool Succeeded(int i) => i == SuccessCode;
243+
private static bool Succeeded(int i) => i == SuccessCode;
243244

244245
public static BuildScript operator &(BuildScript s1, BuildScript s2) =>
245246
new BindBuildScript(s1, ret1 => Succeeded(ret1) ? s2 : Create(actions => ret1));

0 commit comments

Comments
 (0)