Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update deps #10

Merged
merged 4 commits into from
Feb 12, 2024
Merged

update deps #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44c42ac
update deps
elringus Feb 12, 2024
06cbf19
Merge branch 'main' into 1.20
elringus Feb 12, 2024
2a65b09
fix ci
elringus Feb 12, 2024
44798c0
fix tests
elringus Feb 12, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
languages: ${{ matrix.language }}
- name: build
run: |
dotnet nuget add source https://nuget.pkg.github.com/naninovel/index.json -n github --username ${{ secrets.GH_USER }} --password ${{ secrets.GH_TOKEN }} --store-password-in-clear-text
dotnet workload restore backend/Naninovel.Language.sln
dotnet publish backend
npm ci
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/cover.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
node-version: 20
- name: cover
run: |
dotnet nuget add source https://nuget.pkg.github.com/naninovel/index.json -n github --username ${{ secrets.GH_USER }} --password ${{ secrets.GH_TOKEN }} --store-password-in-clear-text
dotnet workload restore backend/Naninovel.Language.sln
dotnet test backend /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
dotnet publish backend
Expand Down
13 changes: 6 additions & 7 deletions backend/Naninovel.Language.Bindings/Language.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
using System.Diagnostics.CodeAnalysis;
using Bootsharp;
using Bootsharp.DependencyInjection;
using Bootsharp.Inject;
using Microsoft.Extensions.DependencyInjection;
using Naninovel.Bindings;
using Naninovel.Language;
using static Naninovel.Bindings.Utilities;

[assembly: ExcludeFromCodeCoverage]
[assembly: JSNamespace(NamespacePattern, NamespaceReplacement)]
[assembly: JSPreferences(Space = [Space.Pattern, Space.Replacement])]
[assembly: JSImport(typeof(IDiagnosticPublisher))]
[assembly: JSExport(
[assembly: JSExport([
typeof(ISettingsHandler),
typeof(IMetadataHandler),
typeof(IDocumentHandler),
Expand All @@ -18,12 +17,12 @@
typeof(IFoldingHandler),
typeof(ISymbolHandler),
typeof(ITokenHandler),
typeof(IHoverHandler),
InvokePattern = "(.+)", InvokeReplacement = "Naninovel.Bindings.Utilities.Try(() => $1)")]
typeof(IHoverHandler)
])]

namespace Naninovel.Language;

public static partial class Language
public static class Language
{
[JSInvokable]
public static void BootServer () => new ServiceCollection()
Expand Down
6 changes: 3 additions & 3 deletions backend/Naninovel.Language.Bindings/Naninovel.Language.Bindings.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bootsharp.Common" Version="0.1.0-rc.159"/>
<PackageReference Include="Bootsharp.DependencyInjection" Version="0.1.0-rc.159"/>
<PackageReference Include="Naninovel.Common.Bindings" Version="2023.10.17.1938"/>
<PackageReference Include="Bootsharp.Common" Version="0.3.1"/>
<PackageReference Include="Bootsharp.Inject" Version="0.3.1"/>
<PackageReference Include="Naninovel.Common.Bindings" Version="2024.2.12.1921"/>
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions backend/Naninovel.Language.Test/Naninovel.Language.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Naninovel.Common.TestUtilities" Version="2023.10.17.1938"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23503-02"/>
<PackageReference Include="Moq" Version="4.20.69"/>
<PackageReference Include="xunit" Version="2.5.3"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PackageReference Include="Naninovel.Common.TestUtilities" Version="2024.2.12.1921"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0"/>
<PackageReference Include="Moq" Version="4.20.70"/>
<PackageReference Include="xunit" Version="2.6.6"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion backend/Naninovel.Language.WASM/Naninovel.Language.WASM.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bootsharp" Version="0.1.0-rc.159"/>
<PackageReference Include="Bootsharp" Version="0.3.1"/>
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions backend/Naninovel.Language.WASM/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Diagnostics.CodeAnalysis;
using Bootsharp;
using static Naninovel.Bindings.Utilities;
using Naninovel.Bindings;

[assembly: ExcludeFromCodeCoverage]
[assembly: JSNamespace(NamespacePattern, NamespaceReplacement)]
[assembly: JSPreferences(Space = [Space.Pattern, Space.Replacement])]

namespace Naninovel.Language;

Expand Down
2 changes: 1 addition & 1 deletion backend/Naninovel.Language/Naninovel.Language.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Naninovel.Common.Modern" Version="2023.10.17.1938"/>
<PackageReference Include="Naninovel.Common.Modern" Version="2024.2.12.1921"/>
</ItemGroup>

</Project>
5 changes: 3 additions & 2 deletions backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "backend",
"main": "Naninovel.Language.WASM/bin/backend/backend.mjs",
"types": "Naninovel.Language.WASM/bin/backend/types/backend.d.ts"
"type": "module",
"main": "Naninovel.Language.WASM/bin/backend/index.mjs",
"types": "Naninovel.Language.WASM/bin/backend/types/index.d.ts"
}
3 changes: 1 addition & 2 deletions test/server.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ test("when applying custom metadata update metadata is invoked", () => {
});

test("publish diagnostics on backend routes to send diagnostics", () => {
// @ts-ignore
cs.DiagnosticPublisher.$publishDiagnostics("foo", []);
cs.DiagnosticPublisher.publishDiagnostics("foo", []);
expect(connection.sendDiagnostics).toBeCalledWith({ uri: "foo", diagnostics: [] });
});

Expand Down
Loading