Fixing build

Author: NikolayPianikov

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: Pure.DI check
+name: CSharpInteractive check
 
 on: [ push, pull_request ]
 

CSharpInteractive.HostApi/DotNetCommands.cs

@@ -3446,7 +3446,7 @@ public IStartInfo GetStartInfo(IHost host)
 }
 
 /// <summary>
-/// Signs all the NuGet packages matching the first argument with a certificate.
+/// Signs the NuGet packages with a certificate.
 /// <p>
 /// This command signs all the packages matching the first argument with a certificate. The certificate with the private key can be obtained from a file or from a certificate installed in a certificate store by providing a subject name or a SHA-1 fingerprint. This command requires a certificate root store that is valid for both code signing and timestamping. Also, this command may not be supported on some combinations of operating system and .NET SDK.
 /// </p>
@@ -3552,7 +3552,7 @@ public IStartInfo GetStartInfo(IHost host)
     }
 
     /// <inheritdoc/>
-    public override string ToString() => (ExecutablePath == string.Empty ? "dotnet" : Path.GetFileNameWithoutExtension(ExecutablePath)).GetShortName("Signs all the NuGet packages matching the first argument with a certificate.", ShortName, new [] {"nuget", "sign"}.Concat(Packages).ToArray());
+    public override string ToString() => (ExecutablePath == string.Empty ? "dotnet" : Path.GetFileNameWithoutExtension(ExecutablePath)).GetShortName("Signs the NuGet packages with a certificate.", ShortName, new [] {"nuget", "sign"}.Concat(Packages).ToArray());
 }
 
 /// <summary>
@@ -3723,7 +3723,7 @@ public IStartInfo GetStartInfo(IHost host)
 /// using HostApi;
 /// 
 /// new DotNetNuGetConfigSet()
-///     .WithConfigFile("nuget.config")
+///     .WithConfigFile(configFile)
 ///     .WithConfigKey("repositoryPath")
 ///     .WithConfigValue("MyValue")
 ///     .Run().EnsureSuccess();

CSharpInteractive.HostApi/DotNetCommands.tt

@@ -871,7 +871,7 @@ using Internal;
         ),
         new(
             "DotNetNuGetSign",
-            "Signs all the NuGet packages matching the first argument with a certificate.",
+            "Signs the NuGet packages with a certificate.",
             [
                 paraStart,
                 "This command signs all the packages matching the first argument with a certificate. The certificate with the private key can be obtained from a file or from a certificate installed in a certificate store by providing a subject name or a SHA-1 fingerprint. This command requires a certificate root store that is valid for both code signing and timestamping. Also, this command may not be supported on some combinations of operating system and .NET SDK.",

CSharpInteractive.Tests/README_TEMPLATE.md

@@ -874,7 +874,7 @@ new DotNetNuGetConfigPaths()
 using HostApi;
 
 new DotNetNuGetConfigSet()
-    .WithConfigFile("nuget.config")
+    .WithConfigFile(configFile)
     .WithConfigKey("repositoryPath")
     .WithConfigValue("MyValue")
     .Run().EnsureSuccess();

CSharpInteractive.Tests/UsageScenarios/BaseScenario.cs

@@ -1,11 +1,13 @@
 // ReSharper disable MemberCanBeProtected.Global
 
+// ReSharper disable MemberCanBeMadeStatic.Global
 namespace CSharpInteractive.Tests.UsageScenarios;
 
 using System.Collections;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using CSharpInteractive;
+using NuGet.Versioning;
 using Environment = System.Environment;
 
 [SuppressMessage("Usage", "CA1816:Dispose methods should call SuppressFinalize")]
@@ -31,6 +33,25 @@ public BaseScenario(ITestOutputHelper output)
 
     public int? ExpectedExitCode { get; set; } = 0;
 
+    [SuppressMessage("Performance", "CA1822:Пометьте члены как статические")]
+    public bool HasSdk(string sdkVersion)
+    {
+        var versions = new List<NuGetVersion>();
+        new DotNetSdkCheck()
+            .Run(output =>
+            {
+                if (output.Line.Split(' ', StringSplitOptions.RemoveEmptyEntries) is ["Microsoft.NETCore.App", var versionStr, ..]
+                    && NuGetVersion.TryParse(versionStr, out var version))
+                {
+                    versions.Add(version);
+                }
+            })
+            .EnsureSuccess();
+
+        var sdkVersionValue = NuGetVersion.Parse(sdkVersion);
+        return versions.Any(i => i >= sdkVersionValue);
+    }
+
     // ReSharper disable once MemberCanBeProtected.Global
     public IHost Host => this;
 

CSharpInteractive.Tests/UsageScenarios/Comments/DotNetNuGetConfigSetScenario.txt

@@ -1,7 +1,7 @@
 using HostApi;
 
 new DotNetNuGetConfigSet()
-    .WithConfigFile("nuget.config")
+    .WithConfigFile(configFile)
     .WithConfigKey("repositoryPath")
     .WithConfigValue("MyValue")
     .Run().EnsureSuccess();

CSharpInteractive.Tests/UsageScenarios/DotNetNuGetConfigGetScenario.cs

@@ -5,15 +5,17 @@
 namespace CSharpInteractive.Tests.UsageScenarios;
 
 using System.Diagnostics.CodeAnalysis;
+using NuGet.Versioning;
 
 [CollectionDefinition("Integration", DisableParallelization = true)]
 [Trait("Integration", "True")]
 [SuppressMessage("Performance", "CA1861:Avoid constant arrays as arguments")]
 public class DotNetNuGetConfigSetScenario(ITestOutputHelper output) : BaseScenario(output)
 {
-    [Fact]
+    [SkippableFact]
     public void Run()
     {
+        Skip.IfNot(HasSdk("8.0.10"));
         var configFile = Path.GetFullPath("nuget.config");
         File.WriteAllText(configFile, "<configuration></configuration>");
 

CSharpInteractive.Tests/UsageScenarios/DotNetNuGetConfigPathsScenario.cs

@@ -11,9 +11,10 @@ namespace CSharpInteractive.Tests.UsageScenarios;
 [SuppressMessage("Performance", "CA1861:Avoid constant arrays as arguments")]
 public class DotNetNuGetConfigPathsScenario(ITestOutputHelper output) : BaseScenario(output)
 {
-    [Fact]
+    [SkippableFact]
     public void Run()
     {
+        Skip.IfNot(HasSdk("8.0.10"));
         var configFile = Path.GetFullPath("nuget.config");
         File.WriteAllText(configFile, "<configuration></configuration>");
 

CSharpInteractive.Tests/UsageScenarios/DotNetNuGetConfigSetScenario.cs

@@ -11,9 +11,10 @@ namespace CSharpInteractive.Tests.UsageScenarios;
 [SuppressMessage("Performance", "CA1861:Avoid constant arrays as arguments")]
 public class DotNetNuGetConfigGetScenario(ITestOutputHelper output) : BaseScenario(output)
 {
-    [Fact]
+    [SkippableFact]
     public void Run()
     {
+        Skip.IfNot(HasSdk("8.0.10"));
         var configFile = Path.GetFullPath("nuget.config");
         File.WriteAllText(configFile, "<configuration></configuration>");
 

CSharpInteractive.Tests/UsageScenarios/DotNetNuGetConfigUnsetScenario.cs

@@ -11,13 +11,15 @@ namespace CSharpInteractive.Tests.UsageScenarios;
 [SuppressMessage("Performance", "CA1861:Avoid constant arrays as arguments")]
 public class DotNetNuGetConfigUnsetScenario(ITestOutputHelper output) : BaseScenario(output)
 {
-    [Fact]
+    [SkippableFact]
     public void Run()
     {
+        Skip.IfNot(HasSdk("8.0.10"));
         ExpectedExitCode = default;
-        File.WriteAllText("nuget.config", "<configuration></configuration>");
+        var configFile = Path.GetFullPath("nuget.config");
+        File.WriteAllText(configFile, "<configuration></configuration>");
         new DotNetNuGetConfigSet()
-            .WithConfigFile("nuget.config")
+            .WithConfigFile(configFile)
             .WithConfigKey("repositoryPath")
             .WithConfigValue("MyValue")
             .Run().EnsureSuccess();