Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ build/*
out/
native/**/bin/
native/**/obj/
src-dotnet/**/bin/
src-dotnet/**/obj/
src/**/bin/
src/**/obj/
.certs/*
!.certs/.gitkeep
.env
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"version": "0.2.0",
"description": "Desktop companion app for Switchify Android.",
"scripts": {
"dotnet:restore": "dotnet restore src-dotnet/SwitchifyPc.sln",
"dotnet:build": "dotnet build src-dotnet/SwitchifyPc.sln -c Release --no-restore",
"dotnet:test": "dotnet test src-dotnet/SwitchifyPc.sln -c Release --no-build",
"dotnet:publish": "dotnet publish src-dotnet/SwitchifyPc.App/SwitchifyPc.App.csproj -c Release -r win-x64 --self-contained true",
"dotnet:restore": "dotnet restore src/SwitchifyPc.sln",
"dotnet:build": "dotnet build src/SwitchifyPc.sln -c Release --no-restore",
"dotnet:test": "dotnet test src/SwitchifyPc.sln -c Release --no-build",
"dotnet:publish": "dotnet publish src/SwitchifyPc.App/SwitchifyPc.App.csproj -c Release -r win-x64 --self-contained true",
"dotnet:package:win": "node scripts/package-dotnet-win.cjs",
"dotnet:package:win:stage": "node scripts/package-dotnet-win.cjs --stage-only --skip-sign",
"dotnet:package:win:verify": "node scripts/verify-dotnet-package.cjs",
Expand Down
4 changes: 2 additions & 2 deletions scripts/package-dotnet-win.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ const {

const stageOnly = process.argv.includes('--stage-only');
const skipSign = process.argv.includes('--skip-sign');
const appProjectPath = resolveProjectPath('src-dotnet', 'SwitchifyPc.App', 'SwitchifyPc.App.csproj');
const appProjectPath = resolveProjectPath('src', 'SwitchifyPc.App', 'SwitchifyPc.App.csproj');
const version = readDotnetAppVersion(appProjectPath);
const publishDir = resolveProjectPath(
'src-dotnet',
'src',
'SwitchifyPc.App',
'bin',
'Release',
Expand Down
2 changes: 1 addition & 1 deletion scripts/verify-dotnet-package.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const stageDir = path.join(distDir, 'win-unpacked');
const appExe = path.join(stageDir, 'Switchify PC.exe');
const builderDebug = path.join(distDir, 'builder-debug.yml');
const latestYml = path.join(distDir, 'latest.yml');
const appProjectPath = resolveProjectPath('src-dotnet', 'SwitchifyPc.App', 'SwitchifyPc.App.csproj');
const appProjectPath = resolveProjectPath('src', 'SwitchifyPc.App', 'SwitchifyPc.App.csproj');
const appVersion = readDotnetAppVersion(appProjectPath);
const expectedInstaller = path.join(distDir, `Switchify-PC-Setup-${appVersion}-x64.exe`);
const installerScript = resolveProjectPath('installer', 'SwitchifyPc.DotNet.nsi');
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.