Skip to content

Commit

Permalink
fix .NET8 builds (#851)
Browse files Browse the repository at this point in the history
  • Loading branch information
irahopkinson authored Apr 12, 2024
1 parent 40052c8 commit 44d5064
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "npm: build:data",
"program": "${workspaceFolder}/c-sharp/bin/Debug/net7.0/ParanextDataProvider",
"program": "${workspaceFolder}/c-sharp/bin/Debug/net8.0/ParanextDataProvider",
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
"justMyCode": false,
"windows": {
"program": "${workspaceFolder}/c-sharp/bin/Debug/net7.0/win-x64/ParanextDataProvider.exe"
"program": "${workspaceFolder}/c-sharp/bin/Debug/net8.0/win-x64/ParanextDataProvider.exe"
},
"linux": {
"program": "${workspaceFolder}/c-sharp/bin/Debug/net7.0/linux-x64/ParanextDataProvider"
"program": "${workspaceFolder}/c-sharp/bin/Debug/net8.0/linux-x64/ParanextDataProvider"
},
"osx": {
"program": "${workspaceFolder}/c-sharp/bin/Debug/net7.0/osx-x64/ParanextDataProvider"
"program": "${workspaceFolder}/c-sharp/bin/Debug/net8.0/osx-x64/ParanextDataProvider"
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions electron-builder.json5
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
extraResources: [
{
from: './c-sharp/bin/Release/net7.0/publish/osx-${arch}/',
from: './c-sharp/bin/Release/net8.0/publish/osx-${arch}/',
to: './dotnet/',
},
],
Expand Down Expand Up @@ -43,7 +43,7 @@
target: ['nsis', 'nsis-web', 'portable'],
extraResources: [
{
from: './c-sharp/bin/Release/net7.0/publish/win-x64/',
from: './c-sharp/bin/Release/net8.0/publish/win-x64/',
to: './dotnet/',
},
],
Expand All @@ -53,7 +53,7 @@
category: 'Development',
extraResources: [
{
from: './c-sharp/bin/Release/net7.0/publish/linux-x64/',
from: './c-sharp/bin/Release/net8.0/publish/linux-x64/',
to: './dotnet/',
},
],
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
"build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts",
"build:data": "dotnet build c-sharp/ParanextDataProvider.sln",
"build:data-release": "run-script-os",
"build:data-release:windows": "dotnet publish c-sharp/ParanextDataProvider.csproj -r win-x64 -o ./c-sharp/bin/Release/net7.0/publish/win-x64/",
"build:data-release:linux": "dotnet publish c-sharp/ParanextDataProvider.csproj -r linux-x64 -o ./c-sharp/bin/Release/net7.0/publish/linux-x64/",
"build:data-release:macos": "dotnet publish c-sharp/ParanextDataProvider.csproj -r osx-x64 -o ./c-sharp/bin/Release/net7.0/publish/osx-x64/ && dotnet publish c-sharp/ParanextDataProvider.csproj -r osx-arm64 -o ./c-sharp/bin/Release/net7.0/publish/osx-arm64/",
"build:data-release:windows": "dotnet publish c-sharp/ParanextDataProvider.csproj -r win-x64 -o ./c-sharp/bin/Release/net8.0/publish/win-x64/",
"build:data-release:linux": "dotnet publish c-sharp/ParanextDataProvider.csproj -r linux-x64 -o ./c-sharp/bin/Release/net8.0/publish/linux-x64/",
"build:data-release:macos": "dotnet publish c-sharp/ParanextDataProvider.csproj -r osx-x64 -o ./c-sharp/bin/Release/net8.0/publish/osx-x64/ && dotnet publish c-sharp/ParanextDataProvider.csproj -r osx-arm64 -o ./c-sharp/bin/Release/net8.0/publish/osx-arm64/",
"build:types": "cd lib/papi-dts && npm run build",
"build:platform-bible-react": "cd lib/platform-bible-react && npm run build",
"build:platform-bible-utils": "cd lib/platform-bible-utils && npm run build",
Expand Down

0 comments on commit 44d5064

Please sign in to comment.