diff --git a/src/ReferenceResolver/NuGetReferenceResolver.cs b/src/ReferenceResolver/NuGetReferenceResolver.cs index e24db82..2eede5c 100644 --- a/src/ReferenceResolver/NuGetReferenceResolver.cs +++ b/src/ReferenceResolver/NuGetReferenceResolver.cs @@ -3,14 +3,9 @@ namespace ReferenceResolver; -public sealed class NuGetReferenceResolver : IReferenceResolver +public sealed class NuGetReferenceResolver(INuGetHelper nugetHelper) : IReferenceResolver { - private readonly INuGetHelper _nugetHelper; - - public NuGetReferenceResolver(INuGetHelper nugetHelper) - { - _nugetHelper = nugetHelper; - } + private readonly INuGetHelper _nugetHelper = nugetHelper; public ReferenceType ReferenceType => ReferenceType.NuGetPackage; diff --git a/src/ReferenceResolver/ReferenceResolverFactory.cs b/src/ReferenceResolver/ReferenceResolverFactory.cs index abbba07..d90c65a 100644 --- a/src/ReferenceResolver/ReferenceResolverFactory.cs +++ b/src/ReferenceResolver/ReferenceResolverFactory.cs @@ -9,16 +9,11 @@ namespace ReferenceResolver; -public sealed class ReferenceResolverFactory : IReferenceResolverFactory +public sealed class ReferenceResolverFactory(IServiceProvider? serviceProvider) : IReferenceResolverFactory { private static readonly char[] ReferenceSchemaSeparator = [':']; - private readonly IServiceProvider _serviceProvider; - - public ReferenceResolverFactory(IServiceProvider? serviceProvider) - { - _serviceProvider = serviceProvider ?? DependencyResolver.Current; - } + private readonly IServiceProvider _serviceProvider = serviceProvider ?? DependencyResolver.Current; public static IReference ParseReference(string referenceWithSchema) { diff --git a/src/ReferenceResolver/ReferenceSchemaAttribute.cs b/src/ReferenceResolver/ReferenceSchemaAttribute.cs index 132def9..858801b 100644 --- a/src/ReferenceResolver/ReferenceSchemaAttribute.cs +++ b/src/ReferenceResolver/ReferenceSchemaAttribute.cs @@ -4,12 +4,7 @@ namespace ReferenceResolver; [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] -internal sealed class ReferenceSchemaAttribute : Attribute +internal sealed class ReferenceSchemaAttribute(string schema) : Attribute { - public string Schema { get; } - - public ReferenceSchemaAttribute(string schema) - { - Schema = schema; - } + public string Schema { get; } = schema; } diff --git a/src/dotnet-exec/Contracts/AppConfiguration.cs b/src/dotnet-exec/Contracts/AppConfiguration.cs index 9659ef6..c18b242 100644 --- a/src/dotnet-exec/Contracts/AppConfiguration.cs +++ b/src/dotnet-exec/Contracts/AppConfiguration.cs @@ -10,9 +10,7 @@ public sealed class AppConfiguration public Dictionary Aliases { get; set; } = new() { { "new-guid", "System.Guid.NewGuid()" }, -#if NET8_0_OR_GREATER - { "now", "System.TimeProvider.System.GetLocalNow()" }, - { "date", "System.TimeProvider.System.GetLocalNow()" }, -#endif + { "now", "System.DateTimeOffset.Now" }, + { "date", "System.DateTimeOffset.Now" }, }; } diff --git a/src/dotnet-exec/Services/Repl.cs b/src/dotnet-exec/Services/Repl.cs index 34b73ba..889cf57 100644 --- a/src/dotnet-exec/Services/Repl.cs +++ b/src/dotnet-exec/Services/Repl.cs @@ -41,7 +41,7 @@ public async Task RunAsync(ExecOptions options) Console.WriteLine(""" REPL started, Enter #q or #exit to exit #cls or #clear to clear screen - #r to reference dll or package, for example: "#r nuget:CsvHelper", "#r nuget: CsvHelper, 30.0.0" + #r to reference dll or package, for example: "#r nuget:CsvHelper", "#r nuget: CsvHelper, 30.0.0", "#r /a/b/c.dll" """); ScriptState? state = null; while (true) diff --git a/tests/IntegrationTest/ConfigProfileManagerTests.cs b/tests/IntegrationTest/ConfigProfileManagerTests.cs index 7edd0d6..7fbcb53 100644 --- a/tests/IntegrationTest/ConfigProfileManagerTests.cs +++ b/tests/IntegrationTest/ConfigProfileManagerTests.cs @@ -5,14 +5,9 @@ namespace IntegrationTest; -public class ConfigProfileManagerTests +public class ConfigProfileManagerTests(IConfigProfileManager configProfileManager) { - private readonly IConfigProfileManager _configProfileManager; - - public ConfigProfileManagerTests(IConfigProfileManager configProfileManager) - { - _configProfileManager = configProfileManager; - } + private readonly IConfigProfileManager _configProfileManager = configProfileManager; [Fact] public async Task ProfileOperation() diff --git a/tests/IntegrationTest/IntegrationTests.cs b/tests/IntegrationTest/IntegrationTests.cs index 2d6af78..50ec474 100644 --- a/tests/IntegrationTest/IntegrationTests.cs +++ b/tests/IntegrationTest/IntegrationTests.cs @@ -8,25 +8,17 @@ namespace IntegrationTest; -public class IntegrationTests -{ - private readonly CommandHandler _handler; - private readonly ICompilerFactory _compilerFactory; - private readonly IExecutorFactory _executorFactory; - private readonly ITestOutputHelper _outputHelper; - - public IntegrationTests( - CommandHandler handler, - ICompilerFactory compilerFactory, - IExecutorFactory executorFactory, - ITestOutputHelper outputHelper +public class IntegrationTests( + CommandHandler handler, + ICompilerFactory compilerFactory, + IExecutorFactory executorFactory, + ITestOutputHelper outputHelper ) - { - _handler = handler; - _compilerFactory = compilerFactory; - _executorFactory = executorFactory; - _outputHelper = outputHelper; - } +{ + private readonly CommandHandler _handler = handler; + private readonly ICompilerFactory _compilerFactory = compilerFactory; + private readonly IExecutorFactory _executorFactory = executorFactory; + private readonly ITestOutputHelper _outputHelper = outputHelper; [Theory] [InlineData("ConfigurationManagerSample")] diff --git a/tests/IntegrationTest/NuGetHelperTest.cs b/tests/IntegrationTest/NuGetHelperTest.cs index 59618a7..987e3e3 100644 --- a/tests/IntegrationTest/NuGetHelperTest.cs +++ b/tests/IntegrationTest/NuGetHelperTest.cs @@ -67,7 +67,7 @@ public async Task GetLatestVersion() var packageId = "WeihanLi.Common"; var result = await NuGetHelper.GetLatestPackageVersion(packageId); Assert.NotNull(result); - Assert.True(result >= new NuGetVersion("1.0.61")); + Assert.True(result >= new NuGetVersion("1.0.72")); } [Fact] @@ -77,7 +77,7 @@ public async Task GetVersions() var result = await NuGetHelper.GetPackageVersions(packageId).ToArrayAsync(); Assert.NotNull(result); Assert.NotEmpty(result); - Assert.Contains(result, v => v.Version is { Major: 1, Minor: 0, Patch: 61 }); + Assert.Contains(result, v => v.Version is { Major: 1, Minor: 0, Patch: 72 }); } [Fact] diff --git a/tests/IntegrationTest/NuGetReferenceResolverTest.cs b/tests/IntegrationTest/NuGetReferenceResolverTest.cs index 7129d5d..ea6021c 100644 --- a/tests/IntegrationTest/NuGetReferenceResolverTest.cs +++ b/tests/IntegrationTest/NuGetReferenceResolverTest.cs @@ -8,13 +8,12 @@ namespace IntegrationTest; public class NuGetReferenceResolverTest { - private readonly NuGetReferenceResolver _resolver = - new(new NuGetHelper(NullLoggerFactory.Instance)); + private readonly NuGetReferenceResolver _resolver = new(new NuGetHelper(NullLoggerFactory.Instance)); [Fact] public async Task Resolve() { - var references = await _resolver.Resolve("WeihanLi.Common,1.0.69", ExecOptions.DefaultTargetFramework); + var references = await _resolver.Resolve("WeihanLi.Common,1.0.72", ExecOptions.DefaultTargetFramework); Assert.NotNull(references); Assert.NotEmpty(references); } @@ -22,7 +21,7 @@ public async Task Resolve() [Fact] public async Task ResolveReference() { - var reference = new NuGetReference("WeihanLi.Common", "1.0.69"); + var reference = new NuGetReference("WeihanLi.Common", "1.0.72"); Assert.Equal($"nuget: {reference.Reference}", reference.ReferenceWithSchema()); var references = await _resolver.Resolve(reference.Reference, ExecOptions.DefaultTargetFramework); diff --git a/tests/UnitTest/CodeExecutorTest.cs b/tests/UnitTest/CodeExecutorTest.cs index 472fb1e..f5dbe83 100644 --- a/tests/UnitTest/CodeExecutorTest.cs +++ b/tests/UnitTest/CodeExecutorTest.cs @@ -8,16 +8,11 @@ namespace UnitTest; -public sealed class CodeExecutorTest +public sealed class CodeExecutorTest(ITestOutputHelper outputHelper) { - private readonly ITestOutputHelper _outputHelper; + private readonly ITestOutputHelper _outputHelper = outputHelper; private readonly SimpleCodeCompiler _compiler = SimpleCodeCompilerTest.GetSimpleCodeCompiler(); - public CodeExecutorTest(ITestOutputHelper outputHelper) - { - _outputHelper = outputHelper; - } - [Theory] [InlineData("Console.WriteLine(123);")] [InlineData("using WeihanLi.Extensions; Console.WriteLine(args.StringJoin(\", \"));")]