Skip to content

Commit 76ee95d

Browse files
committed
Move solution file to the project's root
1 parent abed3eb commit 76ee95d

5 files changed

Lines changed: 11 additions & 13 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ concurrency:
1313
group: build-${{ github.ref }}
1414
cancel-in-progress: true
1515

16-
defaults:
17-
run:
18-
working-directory: ./src
19-
2016
jobs:
2117
build:
2218

@@ -46,12 +42,14 @@ jobs:
4642

4743
- name: Restore dependencies
4844
run: dotnet restore --verbosity minimal
45+
working-directory: ./src
4946

5047
- name: Build
5148
run: dotnet build --no-restore --configuration ${{ matrix.configuration }} --nologo
49+
working-directory: ./src
5250

5351
- name: Test
54-
run: dotnet test BinanceBot.sln --no-build --configuration ${{ matrix.configuration }} --collect:"XPlat Code Coverage" --logger "trx;LogFileName=test_results.trx"
52+
run: dotnet test --no-build --configuration ${{ matrix.configuration }} --collect:"XPlat Code Coverage" --logger "trx;LogFileName=test_results.trx"
5553

5654
- name: Upload test results
5755
if: always()
@@ -82,6 +80,7 @@ jobs:
8280
-c Release \
8381
-o ./publish/MarketViewer \
8482
--no-build
83+
working-directory: ./src
8584

8685
- name: Upload published artifacts
8786
if: matrix.configuration == 'Release'
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.31613.86
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinanceBot.Market", "BinanceBot.Market\BinanceBot.Market.csproj", "{AD93580C-2CEC-4695-89E7-2029F6E44D32}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinanceBot.Market", "src\BinanceBot.Market\BinanceBot.Market.csproj", "{AD93580C-2CEC-4695-89E7-2029F6E44D32}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinanceBot.MarketBot.Console", "BinanceBot.MarketBot.Console\BinanceBot.MarketBot.Console.csproj", "{F2327623-18BC-4176-AA9C-D7A5F1A0255D}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinanceBot.MarketBot.Console", "src\BinanceBot.MarketBot.Console\BinanceBot.MarketBot.Console.csproj", "{F2327623-18BC-4176-AA9C-D7A5F1A0255D}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinanceBot.MarketViewer.Console", "BinanceBot.MarketViewer.Console\BinanceBot.MarketViewer.Console.csproj", "{7912A437-0EC4-4939-B244-9379927AB0D1}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinanceBot.MarketViewer.Console", "src\BinanceBot.MarketViewer.Console\BinanceBot.MarketViewer.Console.csproj", "{7912A437-0EC4-4939-B244-9379927AB0D1}"
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B6FD43FF-5A63-4978-8444-5F06FCB9C5C0}"
1313
ProjectSection(SolutionItems) = preProject
14-
..\README.md = ..\README.md
14+
README.md = README.md
1515
EndProjectSection
1616
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BinanceBot.Market.Tests", "..\tests\BinanceBot.Market.Tests\BinanceBot.Market.Tests.csproj", "{C2DCC04A-3BF3-4568-96D9-5E54B4952657}"
17+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BinanceBot.Market.Tests", "tests\BinanceBot.Market.Tests\BinanceBot.Market.Tests.csproj", "{C2DCC04A-3BF3-4568-96D9-5E54B4952657}"
1818
EndProject
1919
Global
2020
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Dockerfile.marketbot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG PROJECT_NAME=BinanceBot.MarketBot.Console
55
WORKDIR /src
66

77
# Copy solution and project files for better layer caching
8-
COPY src/*.sln ./
8+
COPY *.sln ./
99
COPY src/BinanceBot.Market/*.csproj ./BinanceBot.Market/
1010
COPY src/BinanceBot.MarketBot.Console/*.csproj ./BinanceBot.MarketBot.Console/
1111
COPY src/BinanceBot.MarketViewer.Console/*.csproj ./BinanceBot.MarketViewer.Console/

Dockerfile.marketviewer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG PROJECT_NAME=BinanceBot.MarketViewer.Console
55
WORKDIR /src
66

77
# Copy solution and project files for better layer caching
8-
COPY src/*.sln ./
8+
COPY *.sln ./
99
COPY src/BinanceBot.Market/*.csproj ./BinanceBot.Market/
1010
COPY src/BinanceBot.MarketBot.Console/*.csproj ./BinanceBot.MarketBot.Console/
1111
COPY src/BinanceBot.MarketViewer.Console/*.csproj ./BinanceBot.MarketViewer.Console/

tests/BinanceBot.Market.Tests/BinanceBot.Market.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="coverlet.collector" Version="6.0.2" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1312
<PackageReference Include="Moq" Version="4.20.72" />
1413
<PackageReference Include="TUnit" Version="0.6.*" />
1514
<PackageReference Include="TUnit.Assertions" Version="0.6.*" />

0 commit comments

Comments
 (0)