Updating to Pure.DI 2.1.60

NikolayPianikov · NikolayPianikov · commit dcd3d371fd30 · 2025-04-16T12:05:05.000+03:00
diff --git a/CSharpInteractive.Tests/CSharpInteractive.Tests.csproj b/CSharpInteractive.Tests/CSharpInteractive.Tests.csproj
@@ -10,7 +10,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
         <PackageReference Include="Moq" Version="4.20.72" />
-        <PackageReference Include="Pure.DI" Version="2.1.59">
+        <PackageReference Include="Pure.DI" Version="2.1.60">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/CSharpInteractive.Tests/LineCodeSourceTests.cs b/CSharpInteractive.Tests/LineCodeSourceTests.cs
@@ -3,19 +3,18 @@ namespace CSharpInteractive.Tests;
 public class LineCodeSourceTests
 {
     [Fact]
-    public void Should()
+    public void ShouldIntiLine()
     {
         // Given
-        var source = CreateInstance();
 
         // When
-        source.Line = "Abc";
+        var source = CreateInstance("Abc");
 
         // Then
         source.Name.ShouldBe("Abc");
         source.ToArray().ShouldBe(["Abc"]);
     }
 
-    private static LineCodeSource CreateInstance() =>
-        new();
+    private static LineCodeSource CreateInstance(string line) =>
+        new(line);
 }
diff --git a/CSharpInteractive.Tests/LoadFileCodeSourceTests.cs b/CSharpInteractive.Tests/LoadFileCodeSourceTests.cs
@@ -25,5 +25,5 @@ public void ShouldProvideLoadCommand()
     }
 
     private LoadFileCodeSource CreateInstance(string fileName) =>
-        new(_filePathResolver.Object, _workingDirectoryContext.Object) {Name = fileName};
+        new(_filePathResolver.Object, _workingDirectoryContext.Object, fileName);
 }
diff --git a/CSharpInteractive/CSharpInteractive.Tool.csproj b/CSharpInteractive/CSharpInteractive.Tool.csproj
@@ -31,7 +31,7 @@
     <ItemGroup>
         <!--<CompilerVisibleProperty Include="PureDIProfilePath" />-->
         <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="4.12.0" />
-        <PackageReference Include="Pure.DI" Version="2.1.59">
+        <PackageReference Include="Pure.DI" Version="2.1.60">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/CSharpInteractive/CSharpInteractive.csproj b/CSharpInteractive/CSharpInteractive.csproj
@@ -22,7 +22,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="4.12.0" />
-        <PackageReference Include="Pure.DI" Version="2.1.59">
+        <PackageReference Include="Pure.DI" Version="2.1.60">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/CSharpInteractive/Composition.cs b/CSharpInteractive/Composition.cs
@@ -17,6 +17,7 @@ namespace CSharpInteractive;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Scripting;
 using Pure.DI;
+using static DateTime;
 using static Pure.DI.Lifetime;
 using static Pure.DI.Tag;
 using CommandLineParser = Core.CommandLineParser;
@@ -29,8 +30,8 @@ internal partial class Composition
     private static void Setup()
     {
         DI.Setup()
-            .Hint(Hint.Resolve, "Off")
-            .Root<Root>("Root")
+            .Hint(Hint.Resolve, Name.Off)
+            .Root<Root>(nameof(Root))
 
 #if TOOL
             .DefaultLifetime(Transient)
@@ -40,12 +41,12 @@ private static void Setup()
                     ctx.Inject<ISettings>(out var settings);
                     if (settings.InteractionMode == InteractionMode.Interactive)
                     {
-                        ctx.Inject<IScriptRunner>(InteractionMode.Interactive, out var scriptRunner);
+                        ctx.Inject<IScriptRunner>(InteractiveTag, out var scriptRunner);
                         return scriptRunner;
                     }
                     else
                     {
-                        ctx.Inject<IScriptRunner>(InteractionMode.NonInteractive, out var scriptRunner);
+                        ctx.Inject<IScriptRunner>(NonInteractiveTag, out var scriptRunner);
                         return scriptRunner;
                     }
                 })
@@ -58,8 +59,8 @@ private static void Setup()
             .DefaultLifetime(Singleton)
                 .Bind(Unique).To<ExitManager>()
                 .Bind(Unique).To<Debugger>()
-                .Bind(InteractionMode.Interactive).To<InteractiveRunner>()
-                .Bind(InteractionMode.NonInteractive).To<ScriptRunner>()
+                .Bind(InteractiveTag).To<InteractiveRunner>()
+                .Bind(NonInteractiveTag).To<ScriptRunner>()
                 .Bind().To<CommandSource>()
                 .Bind().To<Setting<TTE>>()
                 .Bind(Unique).Bind<IReferenceRegistry>().To<ReferencesScriptOptionsFactory>()
@@ -68,19 +69,19 @@ private static void Setup()
             .Bind().As(Transient).To(_ => RunningMode.Application)
 #endif
             .DefaultLifetime(Transient)
-                .Bind().To(_ => DateTime.Now)
+                .Bind().To(_ => Now)
                 .Bind().To(_ => typeof(Composition).Assembly)
                 .Bind().To(_ => new CSharpParseOptions().LanguageVersion)
-                .Bind(RuntimePath).To(_ => Path.GetDirectoryName(typeof(object).Assembly.Location) ?? string.Empty)
+                .Bind(RuntimePathTag).To(_ => Path.GetDirectoryName(typeof(object).Assembly.Location) ?? string.Empty)
                 .Bind().To((CancellationTokenSource cancellationTokenSource) => cancellationTokenSource.Token)
-                .Bind(TargetFrameworkMoniker).To((Assembly assembly) => assembly.GetCustomAttribute<System.Runtime.Versioning.TargetFrameworkAttribute>()?.FrameworkName ?? string.Empty)
+                .Bind(TargetFrameworkMonikerTag).To((Assembly assembly) => assembly.GetCustomAttribute<System.Runtime.Versioning.TargetFrameworkAttribute>()?.FrameworkName ?? string.Empty)
                 .Bind().To(_ => Process.GetCurrentProcess())
-                .Bind(ModuleFile).To((Process process) => process.MainModule?.FileName ?? string.Empty)
+                .Bind(ModuleFileTag).To((Process process) => process.MainModule?.FileName ?? string.Empty)
                 .Bind().To<ScriptCommandFactory>()
                 .Bind().To<ReliableBuildContext>()
                 .Bind().To<ProcessMonitor>()
                 .Bind().To<ProcessManager>()
-                .Bind(Base).To<BuildContext>()
+                .Bind(BaseTag).To<BuildContext>()
                 .Bind().To(_ => MemoryPool<TT>.Shared)
                 .Bind().To<SourceResolver>()
                 .Bind().To<MetadataResolver>()
@@ -119,12 +120,12 @@ private static void Setup()
                 .Bind().To<FileExplorer>()
                 .Bind().To<Utf8Encoding>()
                 .Bind().To<BuildOutputProcessor>()
-                .Bind(Base).To<DefaultBuildMessagesProcessor>()
-                .Bind(Custom).To<CustomMessagesProcessor>()
+                .Bind(BaseTag).To<DefaultBuildMessagesProcessor>()
+                .Bind(CustomTag).To<CustomMessagesProcessor>()
                 .Bind().To<TeamCityContext>()
                 .Bind().To<SummaryPresenter>()
                 .Bind().To<ExitCodeParser>()
-                .Bind(Base).To<ProcessRunner>()
+                .Bind(BaseTag).To<ProcessRunner>()
                 .Bind().To<ProcessResultHandler>()
                 .Bind().To<TextReplacer>()
                 .Bind().To<RuntimeExplorer>()
@@ -133,14 +134,14 @@ private static void Setup()
                 .Bind().To<Root>()
                 .Bind().To(_ => new CancellationTokenSource())
                 .Bind().To<CISpecific<TT>>()
-                .Bind(Base).To<ConsoleInOut>()
-                .Bind(TeamCity).To<TeamCityInOut>()
-                .Bind(Ansi).To<AnsiInOut>()
+                .Bind(BaseTag).To<ConsoleInOut>()
+                .Bind(TeamCityTag).To<TeamCityInOut>()
+                .Bind(AnsiTag).To<AnsiInOut>()
                 .Bind().To<Console>()
                 .Bind().To((ICISpecific<IStdOut> stdOut) => stdOut.Instance)
                 .Bind().To((ICISpecific<IStdErr> stdErr) => stdErr.Instance)
-                .Bind(Base, Ansi).To<Log<TT>>()
-                .Bind(TeamCity).To<TeamCityLog<TT>>()
+                .Bind(BaseTag, AnsiTag).To<Log<TT>>()
+                .Bind(TeamCityTag).To<TeamCityLog<TT>>()
                 .Bind().To((ICISpecific<ILog<TT>> log) => log.Instance)
                 .Bind().To<CISettings>()
                 .Bind().To<ExitTracker>()
@@ -149,18 +150,8 @@ private static void Setup()
                 .Bind().To<Settings>()
                 .Bind().To<Info>()
                 .Bind().To<ConsoleSource>()
-                .Bind(LoadFileCode).To(ctx => new Func<string, ICodeSource>(name =>
-                {
-                    ctx.Inject<LoadFileCodeSource>(out var loadFileCodeSource);
-                    loadFileCodeSource.Name = name;
-                    return loadFileCodeSource;
-                }))
-                .Bind(LineCode).To(ctx => new Func<string, ICodeSource>(line =>
-                {
-                    ctx.Inject<LineCodeSource>(out var lineCodeSource);
-                    lineCodeSource.Line = line;
-                    return lineCodeSource;
-                }))
+                .Bind(LoadFileCodeTag).To<LoadFileCodeSource>()
+                .Bind(LineCodeTag).To<LineCodeSource>()
                 .Bind().To<Statistics>()
                 .Bind().To<CommandsRunner>()
                 .Bind().To<CodeSourceCommandFactory>()
@@ -202,8 +193,8 @@ private static void Setup()
                 .Bind(Unique).To<SettingCommandRunner<VerbosityLevel>>()
                 .Bind(Unique).To<AddNuGetReferenceCommandFactory>()
                 .Bind(Unique).To<AddNuGetReferenceCommandRunner>()
-                .Bind(Base, Ansi).To<Properties>()
-                .Bind(TeamCity).To<TeamCityProperties>()
+                .Bind(BaseTag, AnsiTag).To<Properties>()
+                .Bind(TeamCityTag).To<TeamCityProperties>()
                 .Bind().To((ICISpecific<IProperties> properties) => properties.Instance)
 
                 // Public services
@@ -215,8 +206,9 @@ private static void Setup()
                 .Bind().To<ServiceMessageFormatter>()
                 .Bind().To<FlowIdGenerator>()
                 .Bind().To<TimestampUpdater>()
-                .Bind().To((ITeamCityServiceMessages teamCityServiceMessages, IConsole console)
-                    => new SafeTeamCityWriter(teamCityServiceMessages.CreateWriter(str => console.WriteToOut((null, str + "\n")))))
+                .Bind(BaseTag).To((ITeamCityServiceMessages teamCityServiceMessages, IConsole console)
+                    => teamCityServiceMessages.CreateWriter(str => console.WriteToOut((null, str + "\n"))))
+                .Bind().To<SafeTeamCityWriter>()
                 .Bind().To<ServiceMessageParser>();
     }
 }
diff --git a/CSharpInteractive/Core/BuildMessageLogWriter.cs b/CSharpInteractive/Core/BuildMessageLogWriter.cs
@@ -8,8 +8,8 @@ namespace CSharpInteractive.Core;
 
 internal class BuildMessageLogWriter(
     ILog<BuildMessageLogWriter> log,
-    [Tag(Base)] IStdOut stdOut,
-    [Tag(Base)] IStdErr stdErr)
+    [Tag(BaseTag)] IStdOut stdOut,
+    [Tag(BaseTag)] IStdErr stdErr)
     : IBuildMessageLogWriter
 {
     public void Write(ProcessInfo processInfo, BuildMessage message)
diff --git a/CSharpInteractive/Core/BuildRunner.cs b/CSharpInteractive/Core/BuildRunner.cs
@@ -18,8 +18,8 @@ internal class BuildRunner(
     Func<IBuildContext> buildContextFactory,
     IBuildOutputProcessor buildOutputProcessor,
     Func<IProcessMonitor> monitorFactory,
-    [Tag(Base)] IBuildMessagesProcessor defaultBuildMessagesProcessor,
-    [Tag(Custom)] IBuildMessagesProcessor customBuildMessagesProcessor,
+    [Tag(BaseTag)] IBuildMessagesProcessor defaultBuildMessagesProcessor,
+    [Tag(CustomTag)] IBuildMessagesProcessor customBuildMessagesProcessor,
     IProcessResultHandler processResultHandler,
     IStartInfoDescription startInfoDescription,
     ICommandLineStatisticsRegistry statisticsRegistry)
diff --git a/CSharpInteractive/Core/CISpecific.cs b/CSharpInteractive/Core/CISpecific.cs
@@ -8,9 +8,9 @@ namespace CSharpInteractive.Core;
 
 internal class CISpecific<T>(
     ICISettings settings,
-    [Tag(Base)] Func<T> defaultFactory,
-    [Tag(TeamCity)] Func<T> teamcityFactory,
-    [Tag(Ansi)] Func<T> ansiFactory)
+    [Tag(BaseTag)] Func<T> defaultFactory,
+    [Tag(TeamCityTag)] Func<T> teamcityFactory,
+    [Tag(AnsiTag)] Func<T> ansiFactory)
     : ICISpecific<T>
 {
     public T Instance => settings.CIType switch
diff --git a/CSharpInteractive/Core/DotnetEnvironment.cs b/CSharpInteractive/Core/DotnetEnvironment.cs
@@ -9,8 +9,8 @@ namespace CSharpInteractive.Core;
 using static Pure.DI.Tag;
 
 internal class DotNetEnvironment(
-    [Tag(TargetFrameworkMoniker)] string targetFrameworkMoniker,
-    [Tag(ModuleFile)] string moduleFile,
+    [Tag(TargetFrameworkMonikerTag)] string targetFrameworkMoniker,
+    [Tag(ModuleFileTag)] string moduleFile,
     IEnvironment environment,
     IFileExplorer fileExplorer)
     : IDotNetEnvironment, ITraceSource
diff --git a/CSharpInteractive/Core/LineCodeSource.cs b/CSharpInteractive/Core/LineCodeSource.cs
@@ -4,9 +4,9 @@ namespace CSharpInteractive.Core;
 
 using System.Collections;
 
-internal class LineCodeSource : ICodeSource
+internal class LineCodeSource(string line) : ICodeSource
 {
-    public string Line { get; set; } = string.Empty;
+    public string Line { get; set; } = line;
 
     public IEnumerator<string?> GetEnumerator() => Enumerable.Repeat(Line, 1).GetEnumerator();
 
diff --git a/CSharpInteractive/Core/LoadFileCodeSource.cs b/CSharpInteractive/Core/LoadFileCodeSource.cs
@@ -3,33 +3,33 @@
 namespace CSharpInteractive.Core;
 
 using System.Collections;
+using Pure.DI;
 
-internal class LoadFileCodeSource(
-    IFilePathResolver filePathResolver,
-    IScriptContext scriptContext) : ICodeSource
+internal class LoadFileCodeSource : ICodeSource
 {
-    private string _fileName = "";
+    private readonly IScriptContext _scriptContext;
 
-    public string Name
+    public LoadFileCodeSource(IFilePathResolver filePathResolver,
+        IScriptContext scriptContext,
+        string name)
     {
-        get => _fileName;
-        set
+        _scriptContext = scriptContext;
+        if (!filePathResolver.TryResolve(name, out var fullFilePath))
         {
-            if (!filePathResolver.TryResolve(value, out var fullFilePath))
-            {
-                fullFilePath = value;
-            }
-
-            _fileName = fullFilePath;
+            Name = name;
         }
+
+        Name = fullFilePath;
     }
 
+    public string Name { get; }
+
     public bool Internal => false;
 
     public IEnumerator<string> GetEnumerator()
     {
-        var scope = scriptContext.CreateScope(this);
-        return new LinesEnumerator(new List<string> {$"#load \"{_fileName}\""}, () => scope.Dispose());
+        var scope = _scriptContext.CreateScope(this);
+        return new LinesEnumerator(new List<string> {$"#load \"{Name}\""}, () => scope.Dispose());
     }
 
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
diff --git a/CSharpInteractive/Core/ProcessInFlowRunner.cs b/CSharpInteractive/Core/ProcessInFlowRunner.cs
@@ -9,7 +9,7 @@ namespace CSharpInteractive.Core;
 using static Pure.DI.Tag;
 
 internal class ProcessInFlowRunner(
-    [Tag(Base)] IProcessRunner baseProcessRunner,
+    [Tag(BaseTag)] IProcessRunner baseProcessRunner,
     ICISettings ciSettings,
     ITeamCityWriter teamCityWriter,
     IFlowContext flowContext)
diff --git a/CSharpInteractive/Core/ReliableBuildContext.cs b/CSharpInteractive/Core/ReliableBuildContext.cs
@@ -12,7 +12,7 @@ internal class ReliableBuildContext(
     ICISettings ciSettings,
     IFileSystem fileSystem,
     IMessagesReader messagesReader,
-    [Tag(Base)] IBuildContext baseBuildContext)
+    [Tag(BaseTag)] IBuildContext baseBuildContext)
     : IBuildContext
 {
     private readonly Dictionary<string, Output> _sources = new();
diff --git a/CSharpInteractive/Core/RuntimeExplorer.cs b/CSharpInteractive/Core/RuntimeExplorer.cs
@@ -6,7 +6,7 @@ namespace CSharpInteractive.Core;
 using static Pure.DI.Tag;
 
 internal class RuntimeExplorer(
-    [Tag(RuntimePath)] string runtimePath,
+    [Tag(RuntimePathTag)] string runtimePath,
     IFileSystem fileSystem) : IRuntimeExplorer
 {
     public bool TryFindRuntimeAssembly(string assemblyPath, [MaybeNullWhen(false)] out string runtimeAssemblyPath)
diff --git a/CSharpInteractive/Core/SafeTeamCityWriter.cs b/CSharpInteractive/Core/SafeTeamCityWriter.cs
@@ -2,8 +2,10 @@
 
 using JetBrains.TeamCity.ServiceMessages;
 using JetBrains.TeamCity.ServiceMessages.Write.Special;
+using Pure.DI;
+using static Pure.DI.Tag;
 
-internal class SafeTeamCityWriter(ITeamCityWriter writer): ITeamCityWriter
+internal class SafeTeamCityWriter([Tag(BaseTag)] ITeamCityWriter writer): ITeamCityWriter
 {
     private readonly object _lockObject = new();
 
diff --git a/CSharpInteractive/Core/ScriptContentReplacer.cs b/CSharpInteractive/Core/ScriptContentReplacer.cs
@@ -14,7 +14,7 @@ internal class ScriptContentReplacer(
     IFileSystem fileSystem,
     IUniqueNameGenerator uniqueNameGenerator,
     IEnvironment environment,
-    [Tag(LineCode)] Func<string, ICodeSource> codeSourceFactory)
+    [Tag(LineCodeTag)] Func<string, ICodeSource> codeSourceFactory)
     : IScriptContentReplacer
 {
     [SuppressMessage("Performance", "CA1806:Do not ignore method results")]
diff --git a/CSharpInteractive/Core/Settings.cs b/CSharpInteractive/Core/Settings.cs
@@ -11,7 +11,7 @@ internal class Settings(
     IEnvironment environment,
     ICommandLineParser commandLineParser,
     ICodeSource consoleCodeSource,
-    [Tag(LoadFileCode)] Func<string, ICodeSource> fileCodeSourceFactory)
+    [Tag(LoadFileCodeTag)] Func<string, ICodeSource> fileCodeSourceFactory)
     : ISettings, ISettingSetter<VerbosityLevel>
 {
     private readonly object _lockObject = new();
diff --git a/CSharpInteractive/Core/TeamCityProperties.cs b/CSharpInteractive/Core/TeamCityProperties.cs
@@ -10,7 +10,7 @@ namespace CSharpInteractive.Core;
 using static Pure.DI.Tag;
 
 internal class TeamCityProperties(
-    [Tag(Base)] IProperties properties,
+    [Tag(BaseTag)] IProperties properties,
     // ReSharper disable once SuggestBaseTypeForParameterInConstructor
     ITeamCityWriter teamCityWriter) : IProperties
 {
diff --git a/TestBuild/TestBuild.csproj b/TestBuild/TestBuild.csproj
@@ -22,7 +22,7 @@
         <Using Include="System.Threading.Tasks"/>
         <Using Include="Host" Static="True"/>
         <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1"/>
-        <PackageReference Include="Pure.DI" Version="2.1.59">
+        <PackageReference Include="Pure.DI" Version="2.1.60">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/build.cmd b/build.cmd
@@ -1 +1 @@
-dotnet run -f net8.0 --project Build -- -p integrationTests=true -p version=1.0.0-beta
+dotnet run -f net9.0 --project Build -- -p integrationTests=true -p version=1.0.0-beta
diff --git a/rebuild.cmd b/rebuild.cmd

Original file line number	Diff line number	Diff line change
`@@ -3,19 +3,18 @@ namespace CSharpInteractive.Tests;`
`3`	`3`	`public class LineCodeSourceTests`
`4`	`4`	`{`
`5`	`5`	`[Fact]`
`6`		`- public void Should()`
	`6`	`+ public void ShouldIntiLine()`
`7`	`7`	`{`
`8`	`8`	`// Given`
`9`		`- var source = CreateInstance();`
`10`	`9`
`11`	`10`	`// When`
`12`		`- source.Line = "Abc";`
	`11`	`+ var source = CreateInstance("Abc");`
`13`	`12`
`14`	`13`	`// Then`
`15`	`14`	`source.Name.ShouldBe("Abc");`
`16`	`15`	`source.ToArray().ShouldBe(["Abc"]);`
`17`	`16`	`}`
`18`	`17`
`19`		`- private static LineCodeSource CreateInstance() =>`
`20`		`- new();`
	`18`	`+ private static LineCodeSource CreateInstance(string line) =>`
	`19`	`+ new(line);`
`21`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@ public void ShouldProvideLoadCommand()`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`private LoadFileCodeSource CreateInstance(string fileName) =>`
`28`		`- new(_filePathResolver.Object, _workingDirectoryContext.Object) {Name = fileName};`
	`28`	`+ new(_filePathResolver.Object, _workingDirectoryContext.Object, fileName);`
`29`	`29`	`}`