Skip to content

Commit

Permalink
Update packages.
Browse files Browse the repository at this point in the history
  • Loading branch information
@SebastianStehle
SebastianStehle committed Jan 14, 2024
1 parent 3627e78 commit afcbac7
Show file tree
Hide file tree
Showing 24 changed files with 3,082 additions and 1,941 deletions.
2 changes: 1 addition & 1 deletion cli/Squidex.CLI/Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
<PackageTags>Squidex HeadlessCMS</PackageTags>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Version>12.2</Version>
<Version>13.0</Version>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/AI/AIContentGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private async Task<ChatCompletionCreateResponse> MakeRequestAsync(string descrip

private static GeneratedContent ParseResult(string? schemaName, ChatCompletionCreateResponse cachedResponse)
{
var parsed = Markdown.Parse(cachedResponse.Choices[0].Message.Content);
var parsed = Markdown.Parse(cachedResponse.Choices[0].Message.Content ?? string.Empty);

var codeBlocks = parsed.OfType<FencedCodeBlock>().ToList();
if (codeBlocks.Count != 3)
Expand Down
5 changes: 3 additions & 2 deletions cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/SyncService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using NJsonSchema.Generation;
using NJsonSchema.Generation.TypeMappers;
using NJsonSchema.Infrastructure;
using NJsonSchema.NewtonsoftJson.Generation;
using Squidex.CLI.Commands.Implementation.FileSystem;
using Squidex.ClientLibrary;

Expand Down Expand Up @@ -53,7 +54,7 @@ public SyncService(IFileSystem fileSystem, ISession session)
jsonSerializerSettings.Formatting = Formatting.Indented;
jsonSerializerSettings.NullValueHandling = NullValueHandling.Ignore;

jsonSchemaGeneratorSettings = new JsonSchemaGeneratorSettings
jsonSchemaGeneratorSettings = new NewtonsoftJsonSchemaGeneratorSettings
{
FlattenInheritanceHierarchy = true,
SchemaType = NJsonSchema.SchemaType.JsonSchema,
Expand Down Expand Up @@ -87,7 +88,7 @@ public T Read<T>(IFile file, ILogger log)

var errors = jsonSchema.Validate(jsonText);

if (errors.Any())
if (errors.Count != 0)
{
log.WriteLine("File {0} is not valid", file.FullName);

Expand Down
11 changes: 6 additions & 5 deletions cli/Squidex.CLI/Squidex.CLI.Core/Squidex.CLI.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,22 @@
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Betalgo.OpenAI" Version="7.4.1" />
<PackageReference Include="Betalgo.OpenAI" Version="7.4.3" />
<PackageReference Include="CsvHelper" Version="30.0.1" />
<PackageReference Include="LibGit2Sharp" Version="0.28.0" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.110">
<PackageReference Include="LibGit2Sharp" Version="0.29.0" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.136">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NJsonSchema" Version="10.9.0" />
<PackageReference Include="NJsonSchema" Version="11.0.0" />
<PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Slugify.Core" Version="4.0.1" />
<PackageReference Include="Squidex.Text" Version="6.2.0" />
<PackageReference Include="Squidex.Text" Version="6.3.5" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions cli/Squidex.CLI/Squidex.CLI.Tests/Squidex.CLI.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FakeItEasy" Version="8.0.0" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.110">
<PackageReference Include="FakeItEasy" Version="8.1.0" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.136">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="CommandDotNet.FluentValidation" Version="6.0.2" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PackageReference Include="xunit" Version="2.6.5" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion cli/Squidex.CLI/Squidex.CLI.Tests/TestDataGeneratorTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ private static HashSet<List<string>> CreateManyStringTags(FieldPropertiesDto fie
Name = "field",
Properties = field,
Partitioning = "invariant"
}
},
]
};

Expand Down
6 changes: 6 additions & 0 deletions cli/Squidex.CLI/Squidex.CLI/Commands/App_Backup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ public async Task Create(CreateArguments arguments)
{
while (!tcs.Token.IsCancellationRequested)
{
#pragma warning disable CS0612 // Type or member is obsolete
var backups = await session.Client.Backups.GetBackupsAsync(tcs.Token);
#pragma warning restore CS0612 // Type or member is obsolete
var backup = backups.Items.Find(x => x.Started >= backupStarted);

if (backup?.Stopped != null)
Expand All @@ -61,7 +63,9 @@ public async Task Create(CreateArguments arguments)

await using (var fs = new FileStream(arguments.File, FileMode.CreateNew))
{
#pragma warning disable CS0612 // Type or member is obsolete
using (var download = await session.Client.Backups.GetBackupContentAsync(foundBackup.Id))
#pragma warning restore CS0612 // Type or member is obsolete
{
await download.Stream.CopyToAsync(fs);
}
Expand All @@ -71,7 +75,9 @@ public async Task Create(CreateArguments arguments)
{
log.WriteLine("Removing backup from app");

#pragma warning disable CS0612 // Type or member is obsolete
await session.Client.Backups.DeleteBackupAsync(foundBackup.Id);
#pragma warning restore CS0612 // Type or member is obsolete
}

log.Completed("Backup Download completed.");
Expand Down
10 changes: 5 additions & 5 deletions cli/Squidex.CLI/Squidex.CLI/Squidex.CLI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@
<None Remove="Commands\Implementation\OpenLibrary\Structure\schemas\author.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommandDotNet" Version="7.0.2" />
<PackageReference Include="CommandDotNet" Version="7.0.3" />
<PackageReference Include="CommandDotNet.FluentValidation" Version="6.0.2" />
<PackageReference Include="ConsoleTables" Version="2.6.1" />
<PackageReference Include="CommandDotNet.IoC.MicrosoftDependencyInjection" Version="5.0.1" />
<PackageReference Include="CoreTweet" Version="1.0.0.483" />
<PackageReference Include="CsvHelper" Version="30.0.1" />
<PackageReference Include="LibGit2Sharp" Version="0.28.0" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.110">
<PackageReference Include="LibGit2Sharp" Version="0.29.0" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.136">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NJsonSchema" Version="10.9.0" />
<PackageReference Include="NJsonSchema" Version="11.0.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Slugify.Core" Version="4.0.1" />
<PackageReference Include="Squidex.Text" Version="6.2.0" />
<PackageReference Include="Squidex.Text" Version="6.3.5" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
</ItemGroup>
Expand Down
72 changes: 0 additions & 72 deletions csharp/Squidex.ClientLibrary/CodeGeneration/Client.Class.ProcessResponse.liquid
View file

This file was deleted.

58 changes: 0 additions & 58 deletions csharp/Squidex.ClientLibrary/CodeGeneration/Client.Class.ReadObjectResponse.liquid
View file

This file was deleted.

Loading

0 comments on commit afcbac7

Please sign in to comment.