Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Version="10.0.9"
/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
<PackageVersion Include="Tomlyn" Version="0.19.0" />
<PackageVersion Include="Tomlyn" Version="2.10.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.9" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta5.25306.1" />
Expand Down
8 changes: 4 additions & 4 deletions src/IviCli.Cli/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@
"Microsoft.Extensions.Logging.Abstractions": "[10.0.9, )",
"TestableIO.System.IO.Abstractions": "[22.2.0, )",
"TestableIO.System.IO.Abstractions.Wrappers": "[22.2.0, )",
"Tomlyn": "[0.19.0, )"
"Tomlyn": "[2.10.1, )"
}
},
"ivicli.plugin": {
Expand Down Expand Up @@ -622,9 +622,9 @@
},
"Tomlyn": {
"type": "CentralTransitive",
"requested": "[0.19.0, )",
"resolved": "0.19.0",
"contentHash": "GlI2o8R8jbZIaE+YX6uA/VoAOH7zIxYeqxDm7jHW2hqUhuB+q19oKold35FkMuv8IZDoCqsTMolaBv2eBLBmrQ=="
"requested": "[2.10.1, )",
"resolved": "2.10.1",
"contentHash": "ykjOY3IpYmC4SpPcAZRTl/w2jTmhPMDydHq8xcV7tTBAQ22nKBsOkPqauIrZlMjHm03cmKfV23UOPscKp+J4Og=="
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/IviCli.Infrastructure/Auth/TomlApiTokenStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public async Task<Result<ApiTokenDocument, ApiTokenStoreError>> LoadAsync(Cancel
return Result.Success<ApiTokenDocument, ApiTokenStoreError>(ApiTokenDocument.Empty);
}
var text = await _fs.File.ReadAllTextAsync(_path, ct);
var model = Toml.ToModel(text);
var model = TomlSerializer.Deserialize<TomlTable>(text) ?? new TomlTable();
var tokens = ImmutableArray.CreateBuilder<ApiToken>();
if (model.TryGetValue("token", out var raw) && raw is TomlTableArray array)
{
Expand Down Expand Up @@ -157,6 +157,6 @@ private static string Serialize(ApiTokenDocument document)
array.Add(table);
}
model["token"] = array;
return Toml.FromModel(model);
return TomlSerializer.Serialize(model);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static Result<ConfigDocument, ConfigStoreError> Parse(string toml)
TomlTable model;
try
{
model = Toml.ToModel(toml);
model = TomlSerializer.Deserialize<TomlTable>(toml) ?? new TomlTable();
}
catch (TomlException ex)
{
Expand Down
2 changes: 1 addition & 1 deletion src/IviCli.Infrastructure/Mock/TomlScenarioParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static Result<MockScenario, ScenarioStoreError> Parse(ScenarioName name,
TomlTable model;
try
{
model = Toml.ToModel(toml);
model = TomlSerializer.Deserialize<TomlTable>(toml) ?? new TomlTable();
}
catch (TomlException ex)
{
Expand Down
2 changes: 1 addition & 1 deletion src/IviCli.Infrastructure/Plugins/PluginLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ private static Result<PluginManifest, PluginLoadError> ParseManifest(string toml
TomlTable model;
try
{
model = Toml.ToModel(toml);
model = TomlSerializer.Deserialize<TomlTable>(toml) ?? new TomlTable();
}
catch (TomlException ex)
{
Expand Down
6 changes: 3 additions & 3 deletions src/IviCli.Infrastructure/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
},
"Tomlyn": {
"type": "Direct",
"requested": "[0.19.0, )",
"resolved": "0.19.0",
"contentHash": "GlI2o8R8jbZIaE+YX6uA/VoAOH7zIxYeqxDm7jHW2hqUhuB+q19oKold35FkMuv8IZDoCqsTMolaBv2eBLBmrQ=="
"requested": "[2.10.1, )",
"resolved": "2.10.1",
"contentHash": "ykjOY3IpYmC4SpPcAZRTl/w2jTmhPMDydHq8xcV7tTBAQ22nKBsOkPqauIrZlMjHm03cmKfV23UOPscKp+J4Og=="
},
"Testably.Abstractions.FileSystem.Interface": {
"type": "Transitive",
Expand Down
8 changes: 4 additions & 4 deletions tests/IviCli.Api.Tests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"IviCli.Plugin": "[0.2.8, )",
"TestableIO.System.IO.Abstractions": "[22.2.0, )",
"TestableIO.System.IO.Abstractions.Wrappers": "[22.2.0, )",
"Tomlyn": "[0.19.0, )"
"Tomlyn": "[2.10.1, )"
}
},
"ivicli.plugin": {
Expand Down Expand Up @@ -264,9 +264,9 @@
},
"Tomlyn": {
"type": "CentralTransitive",
"requested": "[0.19.0, )",
"resolved": "0.19.0",
"contentHash": "GlI2o8R8jbZIaE+YX6uA/VoAOH7zIxYeqxDm7jHW2hqUhuB+q19oKold35FkMuv8IZDoCqsTMolaBv2eBLBmrQ=="
"requested": "[2.10.1, )",
"resolved": "2.10.1",
"contentHash": "ykjOY3IpYmC4SpPcAZRTl/w2jTmhPMDydHq8xcV7tTBAQ22nKBsOkPqauIrZlMjHm03cmKfV23UOPscKp+J4Og=="
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions tests/IviCli.Cli.Tests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@
"Microsoft.Extensions.Logging.Abstractions": "[10.0.9, )",
"TestableIO.System.IO.Abstractions": "[22.2.0, )",
"TestableIO.System.IO.Abstractions.Wrappers": "[22.2.0, )",
"Tomlyn": "[0.19.0, )"
"Tomlyn": "[2.10.1, )"
}
},
"ivicli.plugin": {
Expand Down Expand Up @@ -859,9 +859,9 @@
},
"Tomlyn": {
"type": "CentralTransitive",
"requested": "[0.19.0, )",
"resolved": "0.19.0",
"contentHash": "GlI2o8R8jbZIaE+YX6uA/VoAOH7zIxYeqxDm7jHW2hqUhuB+q19oKold35FkMuv8IZDoCqsTMolaBv2eBLBmrQ=="
"requested": "[2.10.1, )",
"resolved": "2.10.1",
"contentHash": "ykjOY3IpYmC4SpPcAZRTl/w2jTmhPMDydHq8xcV7tTBAQ22nKBsOkPqauIrZlMjHm03cmKfV23UOPscKp+J4Og=="
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions tests/IviCli.Infrastructure.Tests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
"Microsoft.Extensions.Logging.Abstractions": "[10.0.9, )",
"TestableIO.System.IO.Abstractions": "[22.2.0, )",
"TestableIO.System.IO.Abstractions.Wrappers": "[22.2.0, )",
"Tomlyn": "[0.19.0, )"
"Tomlyn": "[2.10.1, )"
}
},
"ivicli.plugin": {
Expand Down Expand Up @@ -280,9 +280,9 @@
},
"Tomlyn": {
"type": "CentralTransitive",
"requested": "[0.19.0, )",
"resolved": "0.19.0",
"contentHash": "GlI2o8R8jbZIaE+YX6uA/VoAOH7zIxYeqxDm7jHW2hqUhuB+q19oKold35FkMuv8IZDoCqsTMolaBv2eBLBmrQ=="
"requested": "[2.10.1, )",
"resolved": "2.10.1",
"contentHash": "ykjOY3IpYmC4SpPcAZRTl/w2jTmhPMDydHq8xcV7tTBAQ22nKBsOkPqauIrZlMjHm03cmKfV23UOPscKp+J4Og=="
}
}
}
Expand Down