Skip to content

Commit 9beb51a

Browse files
committed
1 parent 656d194 commit 9beb51a

File tree

6 files changed

+34
-0
lines changed

6 files changed

+34
-0
lines changed

src/GitVersionCore.Tests/VariableProviderTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ public void ShouldLogWarningWhenUsingDefaultInformationalVersionInCustomFormat()
4343
Patch = 3,
4444
};
4545

46+
#pragma warning disable CS0618 // Type or member is obsolete
4647
var propertyName = nameof(SemanticVersionFormatValues.DefaultInformationalVersion);
48+
#pragma warning restore CS0618 // Type or member is obsolete
4749
var config = new TestEffectiveConfiguration(assemblyInformationalFormat: $"{{{propertyName}}}");
4850
variableProvider.GetVariablesFor(semVer, config, false);
4951
logMessages.ShouldContain(message => message.Trim().StartsWith("WARN") && message.Contains(propertyName), 1, $"Expected a warning to be logged when using the variable {propertyName} in a configuration format template");

src/GitVersionCore/OutputVariables/VariableProvider.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ private string CheckAndFormatString<T>(string formatString, T source, IEnvironme
154154

155155
private void WarnIfUsingObsoleteFormatValues(string formatString)
156156
{
157+
#pragma warning disable CS0618 // Type or member is obsolete
157158
var obsoletePropertyName = nameof(SemanticVersionFormatValues.DefaultInformationalVersion);
159+
#pragma warning restore CS0618 // Type or member is obsolete
158160
if (formatString.Contains($"{{{obsoletePropertyName}}}"))
159161
{
160162
log.Write(LogLevel.Warn, $"Use format variable '{nameof(SemanticVersionFormatValues.InformationalVersion)}' instead of '{obsoletePropertyName}' which is obsolete and will be removed in a future release.");

src/GitVersionExe.Tests/ArgumentParserTests.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ public void HMeansIsHelp()
5959
public void Exec()
6060
{
6161
var arguments = argumentParser.ParseArguments("-exec rake");
62+
#pragma warning disable CS0612 // Type or member is obsolete
6263
arguments.Exec.ShouldBe("rake");
64+
#pragma warning restore CS0612 // Type or member is obsolete
6365
}
6466

6567
[Test]
@@ -72,15 +74,19 @@ public void ExecWithArgs()
7274
"-execargs",
7375
"clean build"
7476
});
77+
#pragma warning disable CS0612 // Type or member is obsolete
7578
arguments.Exec.ShouldBe("rake");
7679
arguments.ExecArgs.ShouldBe("clean build");
80+
#pragma warning restore CS0612 // Type or member is obsolete
7781
}
7882

7983
[Test]
8084
public void Msbuild()
8185
{
8286
var arguments = argumentParser.ParseArguments("-proj msbuild.proj");
87+
#pragma warning disable CS0612 // Type or member is obsolete
8388
arguments.Proj.ShouldBe("msbuild.proj");
89+
#pragma warning restore CS0612 // Type or member is obsolete
8490
}
8591

8692
[Test]
@@ -93,16 +99,20 @@ public void MsbuildWithArgs()
9399
"-projargs",
94100
"/p:Configuration=Debug /p:Platform=AnyCPU"
95101
});
102+
#pragma warning disable CS0612 // Type or member is obsolete
96103
arguments.Proj.ShouldBe("msbuild.proj");
97104
arguments.ProjArgs.ShouldBe("/p:Configuration=Debug /p:Platform=AnyCPU");
105+
#pragma warning restore CS0612 // Type or member is obsolete
98106
}
99107

100108
[Test]
101109
public void ExecwithTargetdirectory()
102110
{
103111
var arguments = argumentParser.ParseArguments("targetDirectoryPath -exec rake");
104112
arguments.TargetPath.ShouldBe("targetDirectoryPath");
113+
#pragma warning disable CS0612 // Type or member is obsolete
105114
arguments.Exec.ShouldBe("rake");
115+
#pragma warning restore CS0612 // Type or member is obsolete
106116
}
107117

108118
[Test]
@@ -374,23 +384,29 @@ public void OtherArgumentsCanBeParsedAfterNofetch()
374384
{
375385
var arguments = argumentParser.ParseArguments("-nofetch -proj foo.sln");
376386
arguments.NoFetch.ShouldBe(true);
387+
#pragma warning disable CS0612 // Type or member is obsolete
377388
arguments.Proj.ShouldBe("foo.sln");
389+
#pragma warning restore CS0612 // Type or member is obsolete
378390
}
379391

380392
[Test]
381393
public void OtherArgumentsCanBeParsedAfterNonormalize()
382394
{
383395
var arguments = argumentParser.ParseArguments("-nonormalize -proj foo.sln");
384396
arguments.NoNormalize.ShouldBe(true);
397+
#pragma warning disable CS0612 // Type or member is obsolete
385398
arguments.Proj.ShouldBe("foo.sln");
399+
#pragma warning restore CS0612 // Type or member is obsolete
386400
}
387401

388402
[Test]
389403
public void OtherArgumentsCanBeParsedAfterNocache()
390404
{
391405
var arguments = argumentParser.ParseArguments("-nocache -proj foo.sln");
392406
arguments.NoCache.ShouldBe(true);
407+
#pragma warning disable CS0612 // Type or member is obsolete
393408
arguments.Proj.ShouldBe("foo.sln");
409+
#pragma warning restore CS0612 // Type or member is obsolete
394410
}
395411

396412
[TestCase("-nofetch -nonormalize -nocache")]

src/GitVersionExe/ArgumentParser.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,29 +149,37 @@ public Arguments ParseArguments(string[] commandLineArguments)
149149
if (name.IsSwitch("exec"))
150150
{
151151
EnsureArgumentValueCount(values);
152+
#pragma warning disable CS0612 // Type or member is obsolete
152153
arguments.Exec = value;
154+
#pragma warning restore CS0612 // Type or member is obsolete
153155
continue;
154156
}
155157

156158

157159
if (name.IsSwitch("execargs"))
158160
{
159161
EnsureArgumentValueCount(values);
162+
#pragma warning disable CS0612 // Type or member is obsolete
160163
arguments.ExecArgs = value;
164+
#pragma warning restore CS0612 // Type or member is obsolete
161165
continue;
162166
}
163167

164168
if (name.IsSwitch("proj"))
165169
{
166170
EnsureArgumentValueCount(values);
171+
#pragma warning disable CS0612 // Type or member is obsolete
167172
arguments.Proj = value;
173+
#pragma warning restore CS0612 // Type or member is obsolete
168174
continue;
169175
}
170176

171177
if (name.IsSwitch("projargs"))
172178
{
173179
EnsureArgumentValueCount(values);
180+
#pragma warning disable CS0612 // Type or member is obsolete
174181
arguments.ProjArgs = value;
182+
#pragma warning restore CS0612 // Type or member is obsolete
175183
continue;
176184
}
177185

src/GitVersionExe/ExecCommand.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,19 @@ public void Execute()
8383

8484
private static bool RunMsBuildIfNeeded(Arguments args, string workingDirectory, VersionVariables variables, ILog log)
8585
{
86+
#pragma warning disable CS0612 // Type or member is obsolete
8687
if (string.IsNullOrEmpty(args.Proj)) return false;
8788

8889
args.Exec = "dotnet";
8990
args.ExecArgs = $"msbuild \"{args.Proj}\" {args.ProjArgs}";
91+
#pragma warning restore CS0612 // Type or member is obsolete
9092

9193
return RunExecCommandIfNeeded(args, workingDirectory, variables, log);
9294
}
9395

9496
private static bool RunExecCommandIfNeeded(Arguments args, string workingDirectory, VersionVariables variables, ILog log)
9597
{
98+
#pragma warning disable CS0612 // Type or member is obsolete
9699
if (string.IsNullOrEmpty(args.Exec)) return false;
97100

98101
log.Info($"Launching {args.Exec} {args.ExecArgs}");
@@ -103,6 +106,7 @@ private static bool RunExecCommandIfNeeded(Arguments args, string workingDirecto
103106

104107
if (results != 0)
105108
throw new WarningException($"Execution of {args.Exec} failed, non-zero return code");
109+
#pragma warning restore CS0612 // Type or member is obsolete
106110

107111
return true;
108112
}

src/GitVersionExe/GitVersionExecutor.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ private int VerifyArgumentsAndRun(Arguments arguments)
7676
arguments.Output.Add(OutputType.BuildServer);
7777
}
7878

79+
#pragma warning disable CS0612 // Type or member is obsolete
7980
if (!string.IsNullOrEmpty(arguments.Proj) || !string.IsNullOrEmpty(arguments.Exec))
81+
#pragma warning restore CS0612 // Type or member is obsolete
8082
{
8183
arguments.Output.Add(OutputType.BuildServer);
8284
}

0 commit comments

Comments
 (0)