Skip to content

Commit 042a52b

Browse files
Update deps
1 parent 652d9e5 commit 042a52b

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

CSharpInteractive.Tests/CSharpInteractive.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
1212
<PackageReference Include="Moq" Version="4.20.70"/>
13-
<PackageReference Include="Pure.DI" Version="2.1.32">
13+
<PackageReference Include="Pure.DI" Version="2.1.34">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>

CSharpInteractive/CSharpInteractive.Tool.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<PackageReference Include="NuGet.Build.Tasks" Version="6.4.0"/>
3333
<PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" IncludeAssets="all"/>
3434
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" IncludeAssets="all"/>
35-
<PackageReference Include="Pure.DI" Version="2.1.32">
35+
<PackageReference Include="Pure.DI" Version="2.1.34">
3636
<PrivateAssets>all</PrivateAssets>
3737
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3838
</PackageReference>

CSharpInteractive/CSharpInteractive.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PackageReference Include="NuGet.Build.Tasks" Version="6.4.0"/>
2727
<PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" IncludeAssets="all"/>
2828
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" IncludeAssets="all"/>
29-
<PackageReference Include="Pure.DI" Version="2.1.32">
29+
<PackageReference Include="Pure.DI" Version="2.1.34">
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>

CSharpInteractive/Composition.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,19 @@ private static void Setup()
4646
return scriptRunner;
4747
}
4848
})
49+
// Default settings
50+
.Bind().To(_ => OptimizationLevel.Release)
51+
.Bind().To(_ => (WarningLevel)ScriptOptions.Default.WarningLevel)
52+
.Bind().To(_ => ScriptOptions.Default.CheckOverflow ? CheckOverflow.On : CheckOverflow.Off)
53+
.Bind().To(_ => ScriptOptions.Default.AllowUnsafe ? AllowUnsafe.On : AllowUnsafe.Off)
4954

5055
.DefaultLifetime(Lifetime.Singleton)
5156
.Bind(Tag.Type).To<ExitManager>()
5257
.Bind(Tag.Type).To<Debugger>()
5358
.Bind(InteractionMode.Interactive).To<InteractiveRunner>()
5459
.Bind(InteractionMode.NonInteractive).To<ScriptRunner>()
5560
.Bind().To<CommandSource>()
61+
.Bind().To<Setting<TTE>>()
5662
#endif
5763
#if APPLICATION
5864
.Bind().As(Lifetime.Transient).To(_ => RunningMode.Application)
@@ -165,11 +171,6 @@ private static void Setup()
165171
.Bind().To<ProcessInFlowRunner>()
166172
.Bind().To<NuGetReferenceResolver>()
167173
.Bind().To<ScriptContentReplacer>()
168-
.Bind().To(_ => new Setting<LanguageVersion>(LanguageVersion.Default))
169-
.Bind().To(_ => new Setting<OptimizationLevel>(OptimizationLevel.Release))
170-
.Bind().To(_ => new Setting<WarningLevel>((WarningLevel)ScriptOptions.Default.WarningLevel))
171-
.Bind().To(_ => new Setting<CheckOverflow>(ScriptOptions.Default.CheckOverflow ? CheckOverflow.On : CheckOverflow.Off))
172-
.Bind().To(_ => new Setting<AllowUnsafe>(ScriptOptions.Default.AllowUnsafe ? AllowUnsafe.On : AllowUnsafe.Off))
173174
.Bind(Tag.Type).To<AssembliesScriptOptionsProvider>()
174175
.Bind(Tag.Type).Bind<IReferenceRegistry>().To<ReferencesScriptOptionsFactory>()
175176
.Bind(Tag.Type).To<SourceFileScriptOptionsFactory>()

CSharpInteractive/Core/Setting.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ namespace CSharpInteractive.Core;
33
internal class Setting<T>(T defaultSettingValue) : ISettingGetter<T>, ISettingSetter<T>
44
where T: struct, Enum
55
{
6-
public T GetSetting() => defaultSettingValue;
6+
private T _defaultSettingValue = defaultSettingValue;
7+
8+
public T GetSetting() => _defaultSettingValue;
79

810
public T SetSetting(T value)
911
{
10-
var prevValue = defaultSettingValue;
11-
defaultSettingValue = value;
12+
var prevValue = _defaultSettingValue;
13+
_defaultSettingValue = value;
1214
return prevValue;
1315
}
1416
}

0 commit comments

Comments
 (0)