Skip to content

Commit d6d9685

Browse files
committed
fix build erros caused by strong-named assemblies + removed the need for 2 sln files
1 parent 6308ea5 commit d6d9685

File tree

7 files changed

+135
-191
lines changed

7 files changed

+135
-191
lines changed

.github/workflows/build-status.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ jobs:
2020
- name: Restore nHapi
2121
run: |
2222
dotnet restore nHapi.sln --configfile build\.nuget\NuGet.config
23-
dotnet restore Hl7Models.sln --configfile build\.nuget\NuGet.config
2423
2524
- name: Build nHapi
2625
run: |
2726
dotnet build nHapi.sln -c Release --no-restore
28-
dotnet build Hl7Models.sln -c Release --no-restore
2927
3028
- name: Run tests for all target frameworks
3129
run: |
@@ -51,12 +49,10 @@ jobs:
5149
- name: Restore nHapi
5250
run: |
5351
dotnet restore nHapi.sln --configfile build/.nuget/NuGet.config
54-
dotnet restore Hl7Models.sln --configfile build/.nuget/NuGet.config
5552
5653
- name: Build nHapi
5754
run: |
5855
dotnet build nHapi.sln -c Release --no-restore
59-
dotnet build Hl7Models.sln -c Release --no-restore
6056
6157
- name: Run tests for all target frameworks
6258
run: |

.github/workflows/receive-pr.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@ jobs:
1717
- name: Restore nHapi
1818
run: |
1919
dotnet restore nHapi.sln --configfile build\.nuget\NuGet.config
20-
dotnet restore Hl7Models.sln --configfile build\.nuget\NuGet.config
2120
2221
- name: Build nHapi
2322
run: |
2423
dotnet build nHapi.sln -c Release --no-restore
25-
dotnet build Hl7Models.sln -c Release --no-restore
2624
2725
- name: Run tests for all target frameworks
2826
run: |
@@ -61,12 +59,10 @@ jobs:
6159
- name: Restore nHapi
6260
run: |
6361
dotnet restore nHapi.sln --configfile build/.nuget/NuGet.config
64-
dotnet restore Hl7Models.sln --configfile build/.nuget/NuGet.config
6562
6663
- name: Build nHapi
6764
run: |
6865
dotnet build nHapi.sln -c Release --no-restore
69-
dotnet build Hl7Models.sln -c Release --no-restore
7066
7167
- name: Run tests for all target frameworks
7268
run: |

Hl7Models.sln

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

build/default.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ Task Clean {
3434
}
3535

3636
Task Build -depends Clean {
37-
Write-Host "Building Hl7Models.sln" -ForegroundColor Green
38-
Exec { dotnet build "..\Hl7Models.sln" -c $projectConfig -v q }
37+
Write-Host "Building nHapi.sln" -ForegroundColor Green
38+
Exec { dotnet build "..\nHapi.sln" -c $projectConfig -v q }
3939
}
4040

4141
Task BuildModels {
42-
# Exec { dotnet build "Hl7Models.sln" -c Debug -v q }
42+
# Exec { dotnet build "nHapi.sln" -c Debug -v q }
4343
# Exec { ModelGenerator\Bin\Debug\netcoreapp3.1\ModelGenerator.exe /BasePath . /Version 2.1 /ConnectionString "Driver={Microsoft Access Driver (*.mdb, *.accdb)};Dbq=C:\hl7_72_HQ.mdb;"}
4444
# Exec { ModelGenerator\Bin\Debug\netcoreapp3.1\ModelGenerator.exe /BasePath . /Version 2.2 /ConnectionString "Driver={Microsoft Access Driver (*.mdb, *.accdb)};Dbq=C:\hl7_72_HQ.mdb;"}
4545
# Exec { ModelGenerator\Bin\Debug\netcoreapp3.1\ModelGenerator.exe /BasePath . /Version 2.3 /ConnectionString "Driver={Microsoft Access Driver (*.mdb, *.accdb)};Dbq=C:\hl7_72_HQ.mdb;"}

0 commit comments

Comments
 (0)