Skip to content

Commit c345306

Browse files
Fixing build
1 parent 9aa4d74 commit c345306

File tree

5 files changed

+28
-4
lines changed

5 files changed

+28
-4
lines changed

CSharpInteractive.Tests/UsageScenarios/BaseScenario.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ namespace CSharpInteractive.Tests.UsageScenarios;
66
using System.Diagnostics.CodeAnalysis;
77
using System.Text;
88
using CSharpInteractive;
9+
using NuGet.Versioning;
910
using Environment = System.Environment;
1011

1112
[SuppressMessage("Usage", "CA1816:Dispose methods should call SuppressFinalize")]
@@ -31,6 +32,24 @@ public BaseScenario(ITestOutputHelper output)
3132

3233
public int? ExpectedExitCode { get; set; } = 0;
3334

35+
public bool HasSdk(string sdkVersion)
36+
{
37+
var versions = new List<NuGetVersion>();
38+
new DotNetSdkCheck()
39+
.Run(output =>
40+
{
41+
if (output.Line.Split(' ', StringSplitOptions.RemoveEmptyEntries) is ["Microsoft.NETCore.App", var versionStr, ..]
42+
&& NuGetVersion.TryParse(versionStr, out var version))
43+
{
44+
versions.Add(version);
45+
}
46+
})
47+
.EnsureSuccess();
48+
49+
var sdkVersionValue = NuGetVersion.Parse(sdkVersion);
50+
return versions.Any(i => i >= sdkVersionValue);
51+
}
52+
3453
// ReSharper disable once MemberCanBeProtected.Global
3554
public IHost Host => this;
3655

CSharpInteractive.Tests/UsageScenarios/DotNetNuGetConfigGetScenario.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
namespace CSharpInteractive.Tests.UsageScenarios;
66

77
using System.Diagnostics.CodeAnalysis;
8+
using NuGet.Versioning;
89

910
[CollectionDefinition("Integration", DisableParallelization = true)]
1011
[Trait("Integration", "True")]
1112
[SuppressMessage("Performance", "CA1861:Avoid constant arrays as arguments")]
1213
public class DotNetNuGetConfigSetScenario(ITestOutputHelper output) : BaseScenario(output)
1314
{
14-
[Fact]
15+
[SkippableFact]
1516
public void Run()
1617
{
18+
Skip.IfNot(HasSdk("8.0.10"));
1719
var configFile = Path.GetFullPath("nuget.config");
1820
File.WriteAllText(configFile, "<configuration></configuration>");
1921

CSharpInteractive.Tests/UsageScenarios/DotNetNuGetConfigPathsScenario.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ namespace CSharpInteractive.Tests.UsageScenarios;
1111
[SuppressMessage("Performance", "CA1861:Avoid constant arrays as arguments")]
1212
public class DotNetNuGetConfigPathsScenario(ITestOutputHelper output) : BaseScenario(output)
1313
{
14-
[Fact]
14+
[SkippableFact]
1515
public void Run()
1616
{
17+
Skip.IfNot(HasSdk("8.0.10"));
1718
var configFile = Path.GetFullPath("nuget.config");
1819
File.WriteAllText(configFile, "<configuration></configuration>");
1920

CSharpInteractive.Tests/UsageScenarios/DotNetNuGetConfigSetScenario.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ namespace CSharpInteractive.Tests.UsageScenarios;
1111
[SuppressMessage("Performance", "CA1861:Avoid constant arrays as arguments")]
1212
public class DotNetNuGetConfigGetScenario(ITestOutputHelper output) : BaseScenario(output)
1313
{
14-
[Fact]
14+
[SkippableFact]
1515
public void Run()
1616
{
17+
Skip.IfNot(HasSdk("8.0.10"));
1718
var configFile = Path.GetFullPath("nuget.config");
1819
File.WriteAllText(configFile, "<configuration></configuration>");
1920

CSharpInteractive.Tests/UsageScenarios/DotNetNuGetWhyScenario.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ namespace CSharpInteractive.Tests.UsageScenarios;
99
[Trait("Integration", "True")]
1010
public class DotNetNuGetWhyScenario(ITestOutputHelper output) : BaseScenario(output)
1111
{
12-
[Fact]
12+
[SkippableFact]
1313
public void Run()
1414
{
15+
Skip.IfNot(HasSdk("8.0.10"));
1516
new DotNetNew()
1617
.WithTemplateName("classlib")
1718
.WithName("MyLib")

0 commit comments

Comments
 (0)