Skip to content

Commit 7a56984

Browse files
committed
Reduce solution to only the cross-platform projects. Simplifies building on Ubuntu
1 parent 321eb34 commit 7a56984

File tree

3 files changed

+7
-25
lines changed

3 files changed

+7
-25
lines changed

.github/workflows/pull-requests.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,16 @@ on:
77
jobs:
88
build:
99
runs-on: ubuntu-latest
10-
env:
11-
TARGETS: "src\\ExcelFinancialFunctions;tests\\ExcelFinancialFunctions_Tests"
1210
steps:
1311
- uses: actions/checkout@v2
1412
- name: Setup .NET
1513
uses: actions/setup-dotnet@v1
1614
with:
1715
dotnet-version: 5.0.x
1816
- name: Restore dependencies
19-
run: dotnet restore -target:$TARGETS
17+
run: dotnet restore
2018
- name: Build
21-
run: dotnet build -target:$TARGETS --no-restore
19+
run: dotnet build --no-restore
2220
- name: Run Tests
23-
run: dotnet test .\\tests\\ExcelFinancialFunctions.Tests\\ExcelFinancialFunctions.Tests.fsproj --no-build --verbosity normal
21+
run: dotnet test --no-build --verbosity normal
2422

.github/workflows/push-master.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,20 @@ on:
77
jobs:
88
build:
99
runs-on: ubuntu-latest
10-
env:
11-
TARGETS: "src\\ExcelFinancialFunctions;tests\\ExcelFinancialFunctions_Tests"
1210
steps:
1311
- uses: actions/checkout@v2
1412
- name: Setup .NET
1513
uses: actions/setup-dotnet@v1
1614
with:
1715
dotnet-version: 5.0.x
1816
- name: Restore dependencies
19-
run: dotnet restore -target:$TARGETS
17+
run: dotnet restore
2018
- name: Build Debug
21-
run: dotnet build -target:$TARGETS --no-restore
19+
run: dotnet build --no-restore
2220
- name: Run Debug Tests (Release tests fail to discover)
23-
run: dotnet test .\\tests\\ExcelFinancialFunctions.Tests\\ExcelFinancialFunctions.Tests.fsproj --no-build --verbosity normal
21+
run: dotnet test --no-build --verbosity normal
2422
- name: Build Release
25-
run: dotnet build -target:$TARGETS --no-restore --configuration=Release
23+
run: dotnet build --no-restore --configuration=Release
2624
- name: Restore tools
2725
run: dotnet tool restore
2826
- name: Run fsdocs

ExcelFinancialFunctions.sln

-14
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A38472EB
3333
EndProject
3434
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ExcelFinancialFunctions.Tests", "tests\ExcelFinancialFunctions.Tests\ExcelFinancialFunctions.Tests.fsproj", "{17FE313F-5304-448C-892E-451E17EEEE83}"
3535
EndProject
36-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ExcelFinancialFunctions.ConsoleTests", "tests\ExcelFinancialFunctions.ConsoleTests\ExcelFinancialFunctions.ConsoleTests.fsproj", "{EAF937EA-E9E0-4D8D-8DDF-8430CC47CD2F}"
37-
EndProject
38-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExcelFinancialFunctions.ReleaseTests", "tests\ExcelFinancialFunctions.ReleaseTests\ExcelFinancialFunctions.ReleaseTests.csproj", "{006B5B4E-1293-4FD9-93EF-B48D93534B9C}"
39-
EndProject
4036
Global
4137
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4238
Debug|Any CPU = Debug|Any CPU
@@ -51,14 +47,6 @@ Global
5147
{17FE313F-5304-448C-892E-451E17EEEE83}.Debug|Any CPU.Build.0 = Debug|Any CPU
5248
{17FE313F-5304-448C-892E-451E17EEEE83}.Release|Any CPU.ActiveCfg = Release|Any CPU
5349
{17FE313F-5304-448C-892E-451E17EEEE83}.Release|Any CPU.Build.0 = Release|Any CPU
54-
{EAF937EA-E9E0-4D8D-8DDF-8430CC47CD2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55-
{EAF937EA-E9E0-4D8D-8DDF-8430CC47CD2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
56-
{EAF937EA-E9E0-4D8D-8DDF-8430CC47CD2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
57-
{EAF937EA-E9E0-4D8D-8DDF-8430CC47CD2F}.Release|Any CPU.Build.0 = Release|Any CPU
58-
{006B5B4E-1293-4FD9-93EF-B48D93534B9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59-
{006B5B4E-1293-4FD9-93EF-B48D93534B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
60-
{006B5B4E-1293-4FD9-93EF-B48D93534B9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
61-
{006B5B4E-1293-4FD9-93EF-B48D93534B9C}.Release|Any CPU.Build.0 = Release|Any CPU
6250
EndGlobalSection
6351
GlobalSection(SolutionProperties) = preSolution
6452
HideSolutionNode = FALSE
@@ -68,8 +56,6 @@ Global
6856
{5E196AFF-81D3-4BD5-964A-5A9E642CD104} = {7F0B1813-150B-4B30-8872-625C37BD67D4}
6957
{6FEE0C58-7CBD-4091-8D56-55AA733E1131} = {7F0B1813-150B-4B30-8872-625C37BD67D4}
7058
{17FE313F-5304-448C-892E-451E17EEEE83} = {A38472EB-1686-402D-8619-EC2BA407C111}
71-
{EAF937EA-E9E0-4D8D-8DDF-8430CC47CD2F} = {A38472EB-1686-402D-8619-EC2BA407C111}
72-
{006B5B4E-1293-4FD9-93EF-B48D93534B9C} = {A38472EB-1686-402D-8619-EC2BA407C111}
7359
EndGlobalSection
7460
GlobalSection(ExtensibilityGlobals) = postSolution
7561
SolutionGuid = {F7A0269D-790B-4C1C-807C-7415B62CD59B}

0 commit comments

Comments
 (0)