Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
vasiliy-chefonov committed Nov 11, 2024
2 parents 234f6c6 + 1d81df6 commit 3b2734f
Show file tree
Hide file tree
Showing 83 changed files with 29 additions and 430 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/pack-library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,14 @@ jobs:
file: "src/**/*.csproj"
version: ${{ steps.getversion.outputs.version }}

- name: Update .nuspec version
uses: vers-one/[email protected]
with:
file: "src/Saritasa.NetForge.Blazor/NetForge.nuspec"
version: ${{ steps.getversion.outputs.version }}

- name: Restore Packages
run: dotnet restore src/Saritasa.NetForge.sln

- name: Build NetForge solution
run: dotnet build src/Saritasa.NetForge.sln

- name: Pack NetForge
run: dotnet pack /p:NuspecFile=NetForge.nuspec --output ../artifacts
run: dotnet pack --output ../artifacts
working-directory: src

- name: Upload Release
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@
[*] Change way of displaying navigation details on List View page.

0.4.3-alpha [2024-10-17]
[*] Fix problem with displaying not included navigation's properties.
[*] Fix problem with displaying not included navigation's properties.

0.4.4-alpha [2024-11-02]
[*] Fix importing static files.
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.3-alpha
0.4.4-alpha
1 change: 0 additions & 1 deletion demo/Saritasa.NetForge.Demo/Saritasa.NetForge.Demo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@

<ItemGroup>
<ProjectReference Include="..\..\src\Saritasa.NetForge.Blazor\Saritasa.NetForge.Blazor.csproj" />
<ProjectReference Include="..\..\src\Saritasa.NetForge.Infrastructure.EfCore\Saritasa.NetForge.Infrastructure.EfCore.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "/_content/Saritasa.NetForge/ckeditor.js";
import "../../ckeditor.js";

const timeouts = [];
const editorConfig = {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ public override decimal ReadJson(
/// <inheritdoc />
public override void WriteJson(JsonWriter writer, decimal value, JsonSerializer serializer)
{
writer.WriteRawValue(value.ToString());
writer.WriteValue(value.ToString(System.Globalization.CultureInfo.InvariantCulture));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
namespace Saritasa.NetForge.Infrastructure.EfCore.Services;

/// <inheritdoc/>
internal class EfCoreMetadataService : IOrmMetadataService
public class EfCoreMetadataService : IOrmMetadataService
{
private readonly EfCoreOptions efCoreOptions;
private readonly IServiceProvider serviceProvider;
Expand Down
74 changes: 0 additions & 74 deletions src/Saritasa.NetForge.Blazor/NetForge.nuspec

This file was deleted.

25 changes: 20 additions & 5 deletions src/Saritasa.NetForge.Blazor/Saritasa.NetForge.Blazor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,24 @@

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="MudBlazor" Version="6.3.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.16" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="MudBlazor" Version="6.3.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.5" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="MudBlazor" Version="6.12.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\icon.png">
Expand All @@ -70,11 +82,14 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Saritasa.NetForge.DomainServices\Saritasa.NetForge.DomainServices.csproj" />
<ProjectReference Include="..\Saritasa.NetForge.Infrastructure.Abstractions\Saritasa.NetForge.Infrastructure.Abstractions.csproj" />
<ProjectReference Include="..\Saritasa.NetForge.Infrastructure.EfCore\Saritasa.NetForge.Infrastructure.EfCore.csproj" />
<ProjectReference Include="..\Saritasa.NetForge.Mvvm\Saritasa.NetForge.Mvvm.csproj" />
<ProjectReference Include="..\Saritasa.NetForge.UseCases\Saritasa.NetForge.UseCases.csproj" />
<Folder Include="Domain\UseCases\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="PluralizeService.Core" Version="1.2.21147.2" />
<PackageReference Include="Saritasa.Tools.Common" Version="3.0.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
</ItemGroup>

</Project>
44 changes: 0 additions & 44 deletions src/Saritasa.NetForge.Domain/Saritasa.NetForge.Domain.csproj

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 3b2734f

Please sign in to comment.