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.

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

Upgrade to dotnet 7 & project refactoring #252

Merged
merged 20 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
34b1360
feat: bump to dotnet 7 environment (not libs)
Jossec101 Jul 26, 2023
43c6fae
feat: upgrade to dotnet 7 libraries and all libraries to latest version
Jossec101 Jul 26, 2023
1b107fd
refactor(InternalWallet.cs): update comment to reflect change from Fu…
Jossec101 Jul 26, 2023
bf8c2f0
refactor: removed unused files
Jossec101 Jul 26, 2023
cd08c8b
chore(dotnet.yml): upgrade .NET version from 6.0.x to 7.0.x to stay u…
Jossec101 Jul 26, 2023
b86fa98
chore(dotnet.yml): upgrade GitHub actions for checkout and setup-dotn…
Jossec101 Jul 26, 2023
70b4fea
feat(dotnet.yml): add 'ls' command to list directory contents for deb…
Jossec101 Jul 26, 2023
7eb385e
gitignore
Jossec101 Jul 26, 2023
baf1827
chore: add missing tests
Jossec101 Jul 26, 2023
53b6d65
chore(dotnet.yml): remove unnecessary 'ls' command from GitHub Action…
Jossec101 Jul 26, 2023
7aa3d77
Update src/Program.cs
Jossec101 Jul 27, 2023
19b827b
Update src/Program.cs
Jossec101 Jul 27, 2023
766c626
Merge branch 'main' into 132-upgrade-to-dotnet-7
Jossec101 Jul 27, 2023
89067bf
refactor: replace 'FundsManager' namespace with 'NodeGuard' in Channe…
Jossec101 Jul 27, 2023
5fbdbd1
refactor(docker-compose.yml): rename all instances of 'fundsmanager' …
Jossec101 Jul 27, 2023
b68b99b
fix(Constants.cs): update POSTGRES_CONNECTIONSTRING database name fro…
Jossec101 Jul 27, 2023
dfc13e6
nullable status logs
Jossec101 Jul 27, 2023
4e092f1
Merge m ain
Jossec101 Jul 27, 2023
8cfa5e7
Merge branch 'main' into 132-upgrade-to-dotnet-7
Jossec101 Jul 27, 2023
ec435e6
changed local connection string to point to nodeguard database
RodriFS Jul 27, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.x'
dotnet-version: '7.0.x'

- name: Restore dependencies
run: dotnet restore
Expand Down
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ docker/bin/
docker/obj/
**/bin/
**/obj/
FundsManager.sln.DotSettings.user
src/FundsManager.csproj.user

NodeGuard.sln.DotSettings.user
src/NodeGuard.csproj.user
test/NodeGuard.Tests/bin
test/NodeGuard.Tests/obj
# Files created by Polar runs
devnetwork.polar/
docker/volumes
Expand Down
12 changes: 0 additions & 12 deletions .run/FundsManager Docker NOVS.run.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .run/FundsManager Docker VS.run.xml

This file was deleted.

4 changes: 2 additions & 2 deletions FundsManager.sln → NodeGuard.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32526.322
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FundsManager", "src\FundsManager.csproj", "{F0B22CA5-7494-4083-A974-1D85D0483FD8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeGuard", "src\NodeGuard.csproj", "{F0B22CA5-7494-4083-A974-1D85D0483FD8}"
EndProject
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker\docker-compose.dcproj", "{19C8820A-53F4-49C6-8A55-09094BB9F945}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FundsManager.Tests", "test\FundsManager.Tests\FundsManager.Tests.csproj", "{0950DC2F-CEEB-4FF1-AE32-2A64661AFA9F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeGuard.Tests", "test\NodeGuard.Tests\NodeGuard.Tests.csproj", "{0950DC2F-CEEB-4FF1-AE32-2A64661AFA9F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
8 changes: 1 addition & 7 deletions docker/docker-compose.dcproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,7 @@
<ProjectGuid>19c8820a-53f4-49c6-8a55-09094bb9f945</ProjectGuid>
<DockerLaunchAction>LaunchBrowser</DockerLaunchAction>
<DockerServiceUrl>{Scheme}://localhost:{ServicePort}</DockerServiceUrl>
<DockerServiceName>fundsmanager</DockerServiceName>
<DockerServiceName>NodeGuard</DockerServiceName>
<DockerLaunchBrowser>false</DockerLaunchBrowser>
</PropertyGroup>
<ItemGroup>
<None Include="docker-compose.override.yml">
<DependentUpon>docker-compose.yml</DependentUpon>
</None>
<None Include="docker-compose.yml" />
</ItemGroup>
</Project>
161 changes: 0 additions & 161 deletions docker/docker-compose.dev-environment.yml

This file was deleted.

56 changes: 0 additions & 56 deletions docker/docker-compose.dev-novs.yml

This file was deleted.

13 changes: 0 additions & 13 deletions docker/docker-compose.override.yml

This file was deleted.

Loading