Update deps

DevTeam · Aug 28, 2024 · 042a52b · 042a52b
1 parent 652d9e5
commit 042a52b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
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.11.0" />
         <PackageReference Include="Moq" Version="4.20.70"/>
-        <PackageReference Include="Pure.DI" Version="2.1.32">
+        <PackageReference Include="Pure.DI" Version="2.1.34">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/CSharpInteractive/CSharpInteractive.Tool.csproj b/CSharpInteractive/CSharpInteractive.Tool.csproj
@@ -32,7 +32,7 @@
         <PackageReference Include="NuGet.Build.Tasks" Version="6.4.0"/>
         <PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" IncludeAssets="all"/>
         <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" IncludeAssets="all"/>
-        <PackageReference Include="Pure.DI" Version="2.1.32">
+        <PackageReference Include="Pure.DI" Version="2.1.34">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/CSharpInteractive/CSharpInteractive.csproj b/CSharpInteractive/CSharpInteractive.csproj
@@ -26,7 +26,7 @@
         <PackageReference Include="NuGet.Build.Tasks" Version="6.4.0"/>
         <PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" IncludeAssets="all"/>
         <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" IncludeAssets="all"/>
-        <PackageReference Include="Pure.DI" Version="2.1.32">
+        <PackageReference Include="Pure.DI" Version="2.1.34">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/CSharpInteractive/Composition.cs b/CSharpInteractive/Composition.cs
@@ -46,13 +46,19 @@ private static void Setup()
                         return scriptRunner;
                     }
                 })
+                // Default settings
+                .Bind().To(_ => OptimizationLevel.Release)
+                .Bind().To(_ => (WarningLevel)ScriptOptions.Default.WarningLevel)
+                .Bind().To(_ => ScriptOptions.Default.CheckOverflow ? CheckOverflow.On : CheckOverflow.Off)
+                .Bind().To(_ => ScriptOptions.Default.AllowUnsafe ? AllowUnsafe.On : AllowUnsafe.Off)
 
             .DefaultLifetime(Lifetime.Singleton)
                 .Bind(Tag.Type).To<ExitManager>()
                 .Bind(Tag.Type).To<Debugger>()
                 .Bind(InteractionMode.Interactive).To<InteractiveRunner>()
                 .Bind(InteractionMode.NonInteractive).To<ScriptRunner>()
                 .Bind().To<CommandSource>()
+                .Bind().To<Setting<TTE>>()
 #endif
 #if APPLICATION
             .Bind().As(Lifetime.Transient).To(_ => RunningMode.Application)
@@ -165,11 +171,6 @@ private static void Setup()
                 .Bind().To<ProcessInFlowRunner>()
                 .Bind().To<NuGetReferenceResolver>()
                 .Bind().To<ScriptContentReplacer>()
-                .Bind().To(_ => new Setting<LanguageVersion>(LanguageVersion.Default))
-                .Bind().To(_ => new Setting<OptimizationLevel>(OptimizationLevel.Release))
-                .Bind().To(_ => new Setting<WarningLevel>((WarningLevel)ScriptOptions.Default.WarningLevel))
-                .Bind().To(_ => new Setting<CheckOverflow>(ScriptOptions.Default.CheckOverflow ? CheckOverflow.On : CheckOverflow.Off))
-                .Bind().To(_ => new Setting<AllowUnsafe>(ScriptOptions.Default.AllowUnsafe ? AllowUnsafe.On : AllowUnsafe.Off))
                 .Bind(Tag.Type).To<AssembliesScriptOptionsProvider>()
                 .Bind(Tag.Type).Bind<IReferenceRegistry>().To<ReferencesScriptOptionsFactory>()
                 .Bind(Tag.Type).To<SourceFileScriptOptionsFactory>()

diff --git a/CSharpInteractive/Core/Setting.cs b/CSharpInteractive/Core/Setting.cs
@@ -3,12 +3,14 @@ namespace CSharpInteractive.Core;
 internal class Setting<T>(T defaultSettingValue) : ISettingGetter<T>, ISettingSetter<T>
     where T: struct, Enum
 {
-    public T GetSetting() => defaultSettingValue;
+    private T _defaultSettingValue = defaultSettingValue;
+
+    public T GetSetting() => _defaultSettingValue;
 
     public T SetSetting(T value)
     {
-        var prevValue = defaultSettingValue;
-        defaultSettingValue = value;
+        var prevValue = _defaultSettingValue;
+        _defaultSettingValue = value;
         return prevValue;
     }
 }