Skip to content

Commit 8ece4e4

Browse files
authored
Merge branch 'main' into federated-multisearch
2 parents e973642 + 07d719e commit 8ece4e4

File tree

5 files changed

+22
-6
lines changed

5 files changed

+22
-6
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ jobs:
1414
- name: Install dependencies
1515
run: |
1616
sudo apt-get update
17-
sudo apt-get install -y libicu-dev
1817
- name: Check release validity
1918
run: sh .github/scripts/check-release.sh
2019
- name: Setup dotnet
2120
uses: actions/setup-dotnet@v4
2221
with:
23-
dotnet-version: 3.1.101
22+
dotnet-version: 8.x
2423
- name: Pack
2524
run: dotnet pack src/Meilisearch/Meilisearch.csproj -c Release -o src/Meilisearch/bin/Release
2625
- name: Publish

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup .NET Core
2222
uses: actions/setup-dotnet@v4
2323
with:
24-
dotnet-version: "6.0.x"
24+
dotnet-version: "8.0.x"
2525
- name: Install dependencies
2626
run: dotnet restore
2727
- name: Build
@@ -39,7 +39,7 @@ jobs:
3939
- name: Setup .NET Core
4040
uses: actions/setup-dotnet@v4
4141
with:
42-
dotnet-version: "6.0.x"
42+
dotnet-version: "8.0.x"
4343
- name: Check with dotnet-format
4444
run: dotnet format --version
4545
- name: Check with dotnet-format

src/Meilisearch/Meilisearch.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
<!-- You may want to remove the NoWarn node in case documentation will be mandatory in the future -->
1919
<NoWarn Condition=" '$(Configuration)' == 'Release'">$(NoWarn);1591</NoWarn>
2020
</PropertyGroup>
21-
21+
<PropertyGroup>
22+
<InvariantGlobalization>true</InvariantGlobalization>
23+
</PropertyGroup>
2224
<ItemGroup>
2325
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.6.2" />
2426
<PackageReference Include="System.Net.Http.Json" Version="6.0.2" />

src/Meilisearch/runtimeconfig.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"runtimeOptions": {
3+
"configProperties": {
4+
"System.Globalization.Invariant": true
5+
}
6+
}
7+
}

tests/Meilisearch.Tests/Meilisearch.Tests.csproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

8+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
9+
<NoWarn>1701;1702;CA1861</NoWarn>
10+
</PropertyGroup>
11+
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
13+
<NoWarn>1701;1702;CA1861</NoWarn>
14+
</PropertyGroup>
15+
816
<ItemGroup>
917
<PackageReference Include="FluentAssertions" Version="7.0.0" />
1018
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />

0 commit comments

Comments
 (0)