Skip to content

Commit 17af37a

Browse files
authored
Merge pull request #21 from PandaTechAM/development
dotnet 10 update
2 parents 0368bf9 + eedea20 commit 17af37a

File tree

8 files changed

+171
-60
lines changed

8 files changed

+171
-60
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020

2121
- name: Setup .NET Core
22-
uses: actions/setup-dotnet@v4
22+
uses: actions/setup-dotnet@v5
2323
with:
2424
global-json-file: global.json
2525

.gitignore

Lines changed: 129 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
33
##
4-
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
4+
## Get latest from `dotnet new gitignore`
55

6-
.idea
6+
# dotenv files
7+
.env
78

89
# User-specific files
910
*.rsuser
@@ -31,7 +32,6 @@ x86/
3132
bld/
3233
[Bb]in/
3334
[Oo]bj/
34-
[Oo]ut/
3535
[Ll]og/
3636
[Ll]ogs/
3737

@@ -60,11 +60,14 @@ dlldata.c
6060
# Benchmark Results
6161
BenchmarkDotNet.Artifacts/
6262

63-
# .NET Core
63+
# .NET
6464
project.lock.json
6565
project.fragment.lock.json
6666
artifacts/
6767

68+
# Tye
69+
.tye/
70+
6871
# ASP.NET Scaffolding
6972
ScaffoldingReadMe.txt
7073

@@ -93,6 +96,7 @@ StyleCopReport.xml
9396
*.tmp_proj
9497
*_wpftmp.csproj
9598
*.log
99+
*.tlog
96100
*.vspscc
97101
*.vssscc
98102
.builds
@@ -296,6 +300,17 @@ node_modules/
296300
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
297301
*.vbw
298302

303+
# Visual Studio 6 auto-generated project file (contains which files were open etc.)
304+
*.vbp
305+
306+
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
307+
*.dsw
308+
*.dsp
309+
310+
# Visual Studio 6 technical files
311+
*.ncb
312+
*.aps
313+
299314
# Visual Studio LightSwitch build output
300315
**/*.HTMLClient/GeneratedArtifacts
301316
**/*.DesktopClient/GeneratedArtifacts
@@ -352,6 +367,9 @@ ASALocalRun/
352367
# Local History for Visual Studio
353368
.localhistory/
354369

370+
# Visual Studio History (VSHistory) files
371+
.vshistory/
372+
355373
# BeatPulse healthcheck temp database
356374
healthchecksdb
357375

@@ -362,4 +380,110 @@ MigrationBackup/
362380
.ionide/
363381

364382
# Fody - auto-generated XML schema
365-
FodyWeavers.xsd
383+
FodyWeavers.xsd
384+
385+
# VS Code files for those working on multiple tools
386+
.vscode/*
387+
!.vscode/settings.json
388+
!.vscode/tasks.json
389+
!.vscode/launch.json
390+
!.vscode/extensions.json
391+
*.code-workspace
392+
393+
# Local History for Visual Studio Code
394+
.history/
395+
396+
# Windows Installer files from build outputs
397+
*.cab
398+
*.msi
399+
*.msix
400+
*.msm
401+
*.msp
402+
403+
# JetBrains Rider
404+
*.sln.iml
405+
.idea/
406+
407+
##
408+
## Visual studio for Mac
409+
##
410+
411+
412+
# globs
413+
Makefile.in
414+
*.userprefs
415+
*.usertasks
416+
config.make
417+
config.status
418+
aclocal.m4
419+
install-sh
420+
autom4te.cache/
421+
*.tar.gz
422+
tarballs/
423+
test-results/
424+
425+
# Mac bundle stuff
426+
*.dmg
427+
*.app
428+
429+
# content below from: https://github.com/github/gitignore/blob/main/Global/macOS.gitignore
430+
# General
431+
.DS_Store
432+
.AppleDouble
433+
.LSOverride
434+
435+
# Icon must end with two \r
436+
Icon
437+
438+
439+
# Thumbnails
440+
._*
441+
442+
# Files that might appear in the root of a volume
443+
.DocumentRevisions-V100
444+
.fseventsd
445+
.Spotlight-V100
446+
.TemporaryItems
447+
.Trashes
448+
.VolumeIcon.icns
449+
.com.apple.timemachine.donotpresent
450+
451+
# Directories potentially created on remote AFP share
452+
.AppleDB
453+
.AppleDesktop
454+
Network Trash Folder
455+
Temporary Items
456+
.apdisk
457+
458+
# content below from: https://github.com/github/gitignore/blob/main/Global/Windows.gitignore
459+
# Windows thumbnail cache files
460+
Thumbs.db
461+
ehthumbs.db
462+
ehthumbs_vista.db
463+
464+
# Dump file
465+
*.stackdump
466+
467+
# Folder config file
468+
[Dd]esktop.ini
469+
470+
# Recycle Bin used on file shares
471+
$RECYCLE.BIN/
472+
473+
# Windows Installer files
474+
*.cab
475+
*.msi
476+
*.msix
477+
*.msm
478+
*.msp
479+
480+
# Windows shortcuts
481+
*.lnk
482+
483+
# Vim temporary swap files
484+
*.swp
485+
486+
# Added by me
487+
logs
488+
LocalFileStorage
489+
*.db*

CommissionCalculator.sln

Lines changed: 0 additions & 46 deletions
This file was deleted.

CommissionCalculator.slnx

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Solution>
2+
<Folder Name="/Solution Items/">
3+
<File Path=".editorconfig" />
4+
<File Path=".github/workflows/main.yml" />
5+
<File Path=".gitignore" />
6+
<File Path="global.json" />
7+
<File Path="Readme.md" />
8+
</Folder>
9+
<Folder Name="/src/">
10+
<Project Path="src/CommissionCalculator/CommissionCalculator.csproj" />
11+
</Folder>
12+
<Folder Name="/test/">
13+
<Project Path="test/CommissionCalculator.Benchmark/CommissionCalculator.Benchmark.csproj" />
14+
<Project Path="test/CommissionCalculator.Tests/CommissionCalculator.Tests.csproj" />
15+
</Folder>
16+
</Solution>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "10.0.101",
44
"rollForward": "latestMinor"
55
}
66
}
Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,40 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<PackageIcon>pandatech.png</PackageIcon>
88
<PackageReadmeFile>Readme.md</PackageReadmeFile>
99
<Copyright>MIT</Copyright>
10-
<Version>4.1.0</Version>
10+
<Version>5.0.0</Version>
1111
<Authors>Pandatech</Authors>
1212
<PackageId>Pandatech.CommissionCalculator</PackageId>
1313
<Title>Pandatech.CommissionCalculator</Title>
1414
<PackageTags>Pandatech, library, calculator, commission, fee, bank, fintech</PackageTags>
1515
<Description>PandaTech.CommissionCalculator is a .NET library simplifying common fintech commission calculations.</Description>
1616
<RepositoryUrl>https://github.com/PandaTechAM/be-lib-commission-calculator.git</RepositoryUrl>
17-
<PackageReleaseNotes>Extreme performance boost with backward compatability</PackageReleaseNotes>
17+
<PackageReleaseNotes>Dotnet 10 update</PackageReleaseNotes>
18+
19+
<!-- Never run analyzers as part of compilation (local, CI, dotnet build/test/publish) -->
20+
<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
21+
22+
<!-- Keep background/live analysis in the IDE -->
23+
<RunAnalyzersDuringLiveAnalysis>true</RunAnalyzersDuringLiveAnalysis>
24+
25+
<!-- Optional: ensure code-style analyzers don't run during build either -->
26+
<EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
1827
</PropertyGroup>
1928
<ItemGroup>
2029
<None Include="..\..\pandatech.png" Pack="true" PackagePath="\"/>
2130
<None Include="..\..\Readme.md" Pack="true" PackagePath="\"/>
2231
</ItemGroup>
32+
33+
<ItemGroup>
34+
<PackageReference Include="Pandatech.Analyzers" Version="1.6.0"/>
35+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.17.0.131074">
36+
<PrivateAssets>all</PrivateAssets>
37+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
38+
</PackageReference>
39+
</ItemGroup>
2340
</Project>

test/CommissionCalculator.Benchmark/CommissionCalculator.Benchmark.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="BenchmarkDotNet" Version="0.15.7" />
15+
<PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
1616
</ItemGroup>
1717

1818
</Project>

test/CommissionCalculator.Tests/CommissionCalculator.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

0 commit comments

Comments
 (0)