Skip to content

Commit 4cdb60e

Browse files
Merge remote-tracking branch 'origin/master' into do_not_throw_general_exceptions_from_generated_data_types
2 parents d6952ae + b749f4d commit 4cdb60e

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,20 @@ jobs:
5555

5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below)
58-
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v2
58+
# - name: Autobuild
59+
# uses: github/codeql-action/autobuild@v2
60+
- name: Setup .NET Core
61+
uses: actions/setup-dotnet@v3
62+
with:
63+
global-json-file: global.json
64+
65+
- name: Restore nHapi
66+
run: |
67+
dotnet restore nHapi.sln --configfile build/.nuget/NuGet.config
68+
69+
- name: Build nHapi
70+
run: |
71+
dotnet build nHapi.sln -c Release --no-restore
6072
6173
# ℹ️ Command-line programs to run using the OS shell.
6274
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -69,4 +81,6 @@ jobs:
6981
# ./location_of_script_within_repo/buildscript.sh
7082

7183
- name: Perform CodeQL Analysis
72-
uses: github/codeql-action/analyze@v2
84+
uses: github/codeql-action/analyze@v2
85+
with:
86+
category: "/language:${{matrix.language}}"

tests/NHapi.Base.NUnit/NHapi.Base.NUnit.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="NUnit" Version="3.13.3" />
20-
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
20+
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
2222
<PackageReference Include="TimeZoneConverter" Version="6.0.1" />
2323

2424
<PackageReference Include="coverlet.collector" Version="3.2.0">

tests/NHapi.NUnit.SourceGeneration/NHapi.NUnit.SourceGeneration.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="NUnit" Version="3.13.3" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
2121
<PackageReference Include="coverlet.collector" Version="3.2.0">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
<PrivateAssets>all</PrivateAssets>
@@ -27,7 +27,7 @@
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>
2929
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
30-
<PackageReference Include="Verify.NUnit" Version="19.1.0" />
30+
<PackageReference Include="Verify.NUnit" Version="19.5.0" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

tests/NHapi.NUnit/NHapi.NUnit.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
<ItemGroup>
3434
<PackageReference Include="NUnit" Version="3.13.3" />
35-
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
36-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
35+
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
36+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
3737
<PackageReference Include="coverlet.collector" Version="3.2.0">
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3939
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)