Skip to content

Commit 8ff2415

Browse files
YuliiaKovalovaYuliiaKovalova
authored
Revert code style changes (#244)
* revert code stype changes * apply changes for probing dotnet paths * fix review comment
1 parent 650f3d0 commit 8ff2415

15 files changed

Lines changed: 210 additions & 590 deletions

‎.editorconfig‎

Lines changed: 0 additions & 400 deletions
This file was deleted.

‎MSBuildLocator.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
ProjectSection(SolutionItems) = preProject
1414
Directory.Build.props = Directory.Build.props
1515
version.json = version.json
16-
.editorconfig = .editorconfig
1716
EndProjectSection
1817
EndProject
1918
Global

‎samples/BuilderApp/Program.cs‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,44 @@
66
using System.Diagnostics;
77
using System.IO;
88
using System.Linq;
9-
using System.Reflection;
109
using Microsoft.Build.Construction;
1110
using Microsoft.Build.Evaluation;
1211
using Microsoft.Build.Framework;
1312
using Microsoft.Build.Locator;
1413

1514
namespace BuilderApp
1615
{
17-
internal sealed class Program
16+
internal class Program
1817
{
1918
private static void Main(string[] args)
2019
{
2120
Header();
22-
string projectFilePath = Args(args);
21+
var projectFilePath = Args(args);
2322

2423
// Before we can build we need to resolve MSBuild assemblies. We could:
2524
// 1) Use defaults and call: MSBuildLocator.RegisterDefaults();
2625
// 2) Do something fancier and ask the user. As an example we'll do that.
2726
var instances = MSBuildLocator.QueryVisualStudioInstances().ToList();
28-
(VisualStudioInstance VSInstance, string MSBuildPath) = AskWhichMSBuildToUse(instances);
27+
var msbuildDeploymentToUse = AskWhichMSBuildToUse(instances);
2928

3029
// Calling Register methods will subscribe to AssemblyResolve event. After this we can
3130
// safely call code that use MSBuild types (in the Builder class).
32-
if (VSInstance != null)
31+
if (msbuildDeploymentToUse.VSInstance != null)
3332
{
34-
Console.WriteLine($"Using MSBuild from VS Instance: {VSInstance.Name} - {VSInstance.Version}");
33+
Console.WriteLine($"Using MSBuild from VS Instance: {msbuildDeploymentToUse.VSInstance.Name} - {msbuildDeploymentToUse.VSInstance.Version}");
3534
Console.WriteLine();
3635

37-
MSBuildLocator.RegisterInstance(VSInstance);
36+
MSBuildLocator.RegisterInstance(msbuildDeploymentToUse.VSInstance);
3837
}
3938
else
4039
{
41-
Console.WriteLine($"Using MSBuild from path: {MSBuildPath}");
40+
Console.WriteLine($"Using MSBuild from path: {msbuildDeploymentToUse.MSBuildPath}");
4241
Console.WriteLine();
4342

44-
MSBuildLocator.RegisterMSBuildPath(MSBuildPath);
43+
MSBuildLocator.RegisterMSBuildPath(msbuildDeploymentToUse.MSBuildPath);
4544
}
4645

47-
bool result = Builder.Build(projectFilePath);
46+
var result = new Builder().Build(projectFilePath);
4847
Console.WriteLine();
4948

5049
Console.ForegroundColor = result ? ConsoleColor.Green : ConsoleColor.Red;
@@ -60,10 +59,10 @@ private static (VisualStudioInstance VSInstance, string MSBuildPath) AskWhichMSB
6059
}
6160

6261
Console.WriteLine($"0) Custom path");
63-
for (int i = 1; i <= instances.Count; i++)
62+
for (var i = 1; i <= instances.Count; i++)
6463
{
65-
VisualStudioInstance instance = instances[i - 1];
66-
string recommended = string.Empty;
64+
var instance = instances[i - 1];
65+
var recommended = string.Empty;
6766

6867
// The dev console is probably always the right choice because the user explicitly opened
6968
// one associated with a Visual Studio install. It will always be first in the list.
@@ -75,27 +74,27 @@ private static (VisualStudioInstance VSInstance, string MSBuildPath) AskWhichMSB
7574

7675
Console.WriteLine();
7776
Console.WriteLine("Select an instance of MSBuild: ");
78-
string answer = Console.ReadLine();
77+
var answer = Console.ReadLine();
7978

8079
if (int.TryParse(answer, out int instanceChoice) && instanceChoice >= 0 && instanceChoice <= instances.Count)
8180
{
8281
if (instanceChoice == 0)
8382
{
8483
Console.WriteLine("Input path to MSBuild deployment:");
85-
string msBuildPath = Console.ReadLine();
84+
var msbuildPath = Console.ReadLine();
8685

87-
if (!Directory.Exists(msBuildPath))
86+
if (!Directory.Exists(msbuildPath))
8887
{
89-
Console.WriteLine($"Directory does not exist: {msBuildPath}");
88+
Console.WriteLine($"Directory does not exist: {msbuildPath}");
9089
Environment.Exit(-1);
9190
}
9291

93-
return (null, msBuildPath);
92+
return (null, msbuildPath);
9493

9594
}
9695
else
9796
{
98-
VisualStudioInstance instanceUsed = instances[instanceChoice - 1];
97+
var instanceUsed = instances[instanceChoice - 1];
9998
return (instanceUsed, null);
10099
}
101100
}
@@ -117,7 +116,7 @@ private static void Header()
117116
private static string Args(string[] args)
118117
{
119118
if (args.Length < 1 || !File.Exists(args[0])) Usage();
120-
string projectFilePath = args[0];
119+
var projectFilePath = args[0];
121120
return projectFilePath;
122121
}
123122

@@ -140,9 +139,9 @@ private static void Usage()
140139
/// </remarks>
141140
public class Builder
142141
{
143-
public static bool Build(string projectFile)
142+
public bool Build(string projectFile)
144143
{
145-
Assembly assembly = typeof(Project).Assembly;
144+
var assembly = typeof(Project).Assembly;
146145
FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
147146

148147
Console.WriteLine();
@@ -155,7 +154,7 @@ public static bool Build(string projectFile)
155154
return project.Build(new Logger());
156155
}
157156

158-
private sealed class Logger : ILogger
157+
private class Logger : ILogger
159158
{
160159
public void Initialize(IEventSource eventSource)
161160
{

‎src/MSBuildLocator.Tests/QueryOptionsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void NoResultsTest()
5555
VerifyQueryResults(instances, DiscoveryType.DotNetSdk);
5656
}
5757

58-
private static void VerifyQueryResults(IEnumerable<VisualStudioInstance> instances, DiscoveryType discoveryTypes, params string[] expectedInstanceNames)
58+
private void VerifyQueryResults(IEnumerable<VisualStudioInstance> instances, DiscoveryType discoveryTypes, params string[] expectedInstanceNames)
5959
{
6060
IEnumerable<VisualStudioInstance> actual = MSBuildLocator.QueryVisualStudioInstances(instances, new VisualStudioInstanceQueryOptions
6161
{
@@ -76,4 +76,4 @@ private static void VerifyQueryResults(IEnumerable<VisualStudioInstance> instanc
7676
}
7777
}
7878
}
79-
}
79+
}

‎src/MSBuildLocator.Tests/SemanticVersionParserTests.cs‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#if NETCOREAPP
55

6-
using Microsoft.Build.Locator.Utils;
76
using Shouldly;
87
using System.Linq;
98
using Xunit;
@@ -15,94 +14,94 @@ public class SemanticVersionParserTests
1514
[Fact]
1615
public void TryParseTest_ReleaseVersion()
1716
{
18-
string version = "7.0.333";
17+
var version = "7.0.333";
1918

20-
bool isParsed = SemanticVersionParser.TryParse(version, out SemanticVersion parsedVersion);
19+
var isParsed = SemanticVersionParser.TryParse(version, out var parsedVerion);
2120

22-
_ = parsedVersion.ShouldNotBeNull();
21+
parsedVerion.ShouldNotBeNull();
2322
isParsed.ShouldBeTrue();
24-
parsedVersion.Major.ShouldBe(7);
25-
parsedVersion.Minor.ShouldBe(0);
26-
parsedVersion.Patch.ShouldBe(333);
27-
parsedVersion.ReleaseLabels.ShouldBeEmpty();
23+
parsedVerion.Major.ShouldBe(7);
24+
parsedVerion.Minor.ShouldBe(0);
25+
parsedVerion.Patch.ShouldBe(333);
26+
parsedVerion.ReleaseLabels.ShouldBeEmpty();
2827
}
2928

3029
[Fact]
3130
public void TryParseTest_PreviewVersion()
3231
{
33-
string version = "8.0.0-preview.6.23329.7";
32+
var version = "8.0.0-preview.6.23329.7";
3433

35-
bool isParsed = SemanticVersionParser.TryParse(version, out SemanticVersion parsedVersion);
34+
var isParsed = SemanticVersionParser.TryParse(version, out var parsedVerion);
3635

37-
_ = parsedVersion.ShouldNotBeNull();
36+
parsedVerion.ShouldNotBeNull();
3837
isParsed.ShouldBeTrue();
39-
parsedVersion.Major.ShouldBe(8);
40-
parsedVersion.Minor.ShouldBe(0);
41-
parsedVersion.Patch.ShouldBe(0);
42-
parsedVersion.ReleaseLabels.ShouldBe(new[] { "preview", "6", "23329", "7" });
38+
parsedVerion.Major.ShouldBe(8);
39+
parsedVerion.Minor.ShouldBe(0);
40+
parsedVerion.Patch.ShouldBe(0);
41+
parsedVerion.ReleaseLabels.ShouldBe(new[] { "preview", "6", "23329", "7" });
4342
}
4443

4544
[Fact]
4645
public void TryParseTest_InvalidInput_LeadingZero()
4746
{
48-
string version = "0.0-preview.6";
47+
var version = "0.0-preview.6";
4948

50-
bool isParsed = SemanticVersionParser.TryParse(version, out SemanticVersion parsedVersion);
49+
var isParsed = SemanticVersionParser.TryParse(version, out var parsedVerion);
5150

52-
Assert.Null(parsedVersion);
51+
Assert.Null(parsedVerion);
5352
isParsed.ShouldBeFalse();
5453
}
5554

5655
[Fact]
5756
public void TryParseTest_InvalidInput_FourPartsVersion()
5857
{
59-
string version = "5.0.3.4";
58+
var version = "5.0.3.4";
6059

61-
bool isParsed = SemanticVersionParser.TryParse(version, out SemanticVersion parsedVersion);
60+
var isParsed = SemanticVersionParser.TryParse(version, out var parsedVerion);
6261

63-
Assert.Null(parsedVersion);
62+
Assert.Null(parsedVerion);
6463
isParsed.ShouldBeFalse();
6564
}
6665

6766
[Fact]
6867
public void VersionSortingTest_WithPreview()
6968
{
70-
string[] versions = new[] { "7.0.7", "8.0.0-preview.6.23329.7", "8.0.0-preview.3.23174.8" };
69+
var versions = new[] { "7.0.7", "8.0.0-preview.6.23329.7", "8.0.0-preview.3.23174.8" };
7170

72-
SemanticVersion maxVersion = versions.Select(v => SemanticVersionParser.TryParse(v, out SemanticVersion parsedVersion) ? parsedVersion : null).Max();
71+
var maxVersion = versions.Select(v => SemanticVersionParser.TryParse(v, out var parsedVerion) ? parsedVerion : null).Max();
7372

7473
maxVersion.OriginalValue.ShouldBe("8.0.0-preview.6.23329.7");
7574
}
7675

7776
[Fact]
7877
public void VersionSortingTest_ReleaseOnly()
7978
{
80-
string[] versions = new[] { "7.0.7", "3.7.2", "10.0.0" };
79+
var versions = new[] { "7.0.7", "3.7.2", "10.0.0" };
8180

82-
SemanticVersion maxVersion = versions.Max(v => SemanticVersionParser.TryParse(v, out SemanticVersion parsedVersion) ? parsedVersion : null);
81+
var maxVersion = versions.Max(v => SemanticVersionParser.TryParse(v, out var parsedVerion) ? parsedVerion : null);
8382

8483
maxVersion.OriginalValue.ShouldBe("10.0.0");
8584
}
8685

8786
[Fact]
8887
public void VersionSortingTest_WithInvalidFolderNames()
8988
{
90-
string[] versions = new[] { "7.0.7", "3.7.2", "dummy", "5.7.8.9" };
89+
var versions = new[] { "7.0.7", "3.7.2", "dummy", "5.7.8.9" };
9190

92-
SemanticVersion maxVersion = versions.Max(v => SemanticVersionParser.TryParse(v, out SemanticVersion parsedVersion) ? parsedVersion : null);
91+
var maxVersion = versions.Max(v => SemanticVersionParser.TryParse(v, out var parsedVerion) ? parsedVerion : null);
9392

9493
maxVersion.OriginalValue.ShouldBe("7.0.7");
9594
}
9695

9796
[Fact]
9897
public void VersionSortingTest_WithAllInvalidFolderNames()
9998
{
100-
string[] versions = new[] { "dummy", "5.7.8.9" };
99+
var versions = new[] { "dummy", "5.7.8.9" };
101100

102-
SemanticVersion maxVersion = versions.Max(v => SemanticVersionParser.TryParse(v, out SemanticVersion parsedVersion) ? parsedVersion : null);
101+
var maxVersion = versions.Max(v => SemanticVersionParser.TryParse(v, out var parsedVerion) ? parsedVerion : null);
103102

104103
maxVersion.ShouldBeNull();
105104
}
106105
}
107106
}
108-
#endif
107+
#endif

‎src/MSBuildLocator/DiscoveryType.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ public enum DiscoveryType
2727
/// </summary>
2828
DotNetSdk = 4
2929
}
30-
}
30+
}

0 commit comments

Comments
 (0)