Skip to content

Commit 2a97ded

Browse files
bitboundbitbound
authored
First pass of solution customization. (#135)
1 parent ef43168 commit 2a97ded

46 files changed

Lines changed: 1652 additions & 218 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ indent_style = space
44

55
[*.cs]
66

7-
# IDE0079: Remove unnecessary suppression
8-
dotnet_diagnostic.IDE0079.severity = none
97
csharp_indent_labels = one_less_than_current
108
csharp_using_directive_placement = outside_namespace:silent
119
csharp_prefer_simple_using_statement = true:suggestion
@@ -45,6 +43,9 @@ dotnet_diagnostic.CA1873.severity = none
4543
# CA1822: Mark members as static
4644
dotnet_diagnostic.CA1822.severity = silent
4745

46+
# IDE0052: Private member can be removed as the value assigned to it is never read
47+
dotnet_diagnostic.IDE0052.severity = warning
48+
4849
[*.{cs,vb}]
4950
#### Naming styles ####
5051

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,11 @@ jobs:
445445
shell: pwsh
446446
run: |
447447
# Create staging directory
448-
New-Item -Path ".build\staging-desktop\${{ matrix.arch }}" -ItemType Directory -Force | Out-Null
448+
$stagingDir = Join-Path $env:RUNNER_TEMP "staging-desktop/${{ matrix.arch }}"
449+
New-Item -Path $stagingDir -ItemType Directory -Force | Out-Null
449450
450451
# Create ZIP
451-
Compress-Archive -Path "ControlR.DesktopClient\bin\publish\${{ matrix.arch }}\*" -DestinationPath ".build\staging-desktop\${{ matrix.arch }}\ControlR.DesktopClient.zip" -Force
452+
Compress-Archive -Path "ControlR.DesktopClient\bin\publish\${{ matrix.arch }}\*" -DestinationPath (Join-Path $stagingDir "ControlR.DesktopClient.zip") -Force
452453
453454
- name: Azure Login For Agent Publish (${{ matrix.arch }})
454455
uses: azure/login@v3
@@ -517,7 +518,7 @@ jobs:
517518
shell: pwsh
518519
run: |
519520
$agentPublishDir = "ControlR.Agent\bin\publish\${{ matrix.arch }}\"
520-
$bundleDir = ".build\bundle\${{ matrix.arch }}"
521+
$bundleDir = Join-Path $env:RUNNER_TEMP "bundle/${{ matrix.arch }}"
521522
$desktopDir = Join-Path $bundleDir "DesktopClient"
522523
Remove-Item -Path $bundleDir -Recurse -Force -ErrorAction SilentlyContinue
523524
New-Item -Path $desktopDir -ItemType Directory -Force | Out-Null
@@ -559,11 +560,11 @@ jobs:
559560
dotnet publish ./ControlR.DesktopClient/ -c Release -f net10.0 -r linux-x64 --self-contained -o ./ControlR.DesktopClient/bin/publish/linux-x64/ -p:Version=$VERSION -p:FileVersion=$VERSION
560561
561562
# Create staging directory
562-
mkdir -p ".build/staging-desktop/linux-x64"
563+
mkdir -p "$RUNNER_TEMP/staging-desktop/linux-x64"
563564
564565
# Create ZIP
565566
cd ./ControlR.DesktopClient/bin/publish/linux-x64
566-
zip -r "${{ github.workspace}}/.build/staging-desktop/linux-x64/ControlR.DesktopClient.zip" .
567+
zip -r "$RUNNER_TEMP/staging-desktop/linux-x64/ControlR.DesktopClient.zip" .
567568
cd ${{ github.workspace}}
568569
569570
- name: Build Agent (linux-x64)
@@ -578,12 +579,12 @@ jobs:
578579
579580
- name: Create Bundle ZIP (linux-x64)
580581
run: |
581-
rm -rf ".build/bundle/linux-x64"
582-
mkdir -p ".build/bundle/linux-x64/DesktopClient"
583-
cp "./ControlR.Agent/bin/publish/linux-x64/ControlR.Agent" ".build/bundle/linux-x64/ControlR.Agent"
584-
cp -R ./ControlR.DesktopClient/bin/publish/linux-x64/. ".build/bundle/linux-x64/DesktopClient/"
582+
rm -rf "$RUNNER_TEMP/bundle/linux-x64"
583+
mkdir -p "$RUNNER_TEMP/bundle/linux-x64/DesktopClient"
584+
cp "./ControlR.Agent/bin/publish/linux-x64/ControlR.Agent" "$RUNNER_TEMP/bundle/linux-x64/ControlR.Agent"
585+
cp -R ./ControlR.DesktopClient/bin/publish/linux-x64/. "$RUNNER_TEMP/bundle/linux-x64/DesktopClient/"
585586
586-
cd .build/bundle/linux-x64
587+
cd "$RUNNER_TEMP/bundle/linux-x64"
587588
zip -r "${{ github.workspace }}/ControlR.Web.Server/wwwroot/downloads/linux-x64/ControlR.Agent.bundle.zip" .
588589
cd "${{ github.workspace }}"
589590

‎.github/workflows/build_custom.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -439,10 +439,11 @@ jobs:
439439
shell: pwsh
440440
run: |
441441
# Create staging directory
442-
New-Item -Path ".build\staging-desktop\${{ matrix.arch }}" -ItemType Directory -Force | Out-Null
442+
$stagingDir = Join-Path $env:RUNNER_TEMP "staging-desktop/${{ matrix.arch }}"
443+
New-Item -Path $stagingDir -ItemType Directory -Force | Out-Null
443444
444445
# Create ZIP
445-
Compress-Archive -Path "ControlR.DesktopClient\bin\publish\${{ matrix.arch }}\*" -DestinationPath ".build\staging-desktop\${{ matrix.arch }}\ControlR.DesktopClient.zip" -Force
446+
Compress-Archive -Path "ControlR.DesktopClient\bin\publish\${{ matrix.arch }}\*" -DestinationPath (Join-Path $stagingDir "ControlR.DesktopClient.zip") -Force
446447
447448
- name: Azure Login For Agent Publish (${{ matrix.arch }})
448449
uses: azure/login@v3
@@ -511,7 +512,7 @@ jobs:
511512
shell: pwsh
512513
run: |
513514
$agentPublishDir = "ControlR.Agent\bin\publish\${{ matrix.arch }}\"
514-
$bundleDir = ".build\bundle\${{ matrix.arch }}"
515+
$bundleDir = Join-Path $env:RUNNER_TEMP "bundle/${{ matrix.arch }}"
515516
$desktopDir = Join-Path $bundleDir "DesktopClient"
516517
Remove-Item -Path $bundleDir -Recurse -Force -ErrorAction SilentlyContinue
517518
New-Item -Path $desktopDir -ItemType Directory -Force | Out-Null
@@ -553,11 +554,11 @@ jobs:
553554
dotnet publish ./ControlR.DesktopClient/ -c Release -f net10.0 -r linux-x64 --self-contained -o ./ControlR.DesktopClient/bin/publish/linux-x64/ -p:Version=$VERSION -p:FileVersion=$VERSION
554555
555556
# Create staging directory
556-
mkdir -p ".build/staging-desktop/linux-x64"
557+
mkdir -p "$RUNNER_TEMP/staging-desktop/linux-x64"
557558
558559
# Create ZIP
559560
cd ./ControlR.DesktopClient/bin/publish/linux-x64
560-
zip -r "${{ github.workspace}}/.build/staging-desktop/linux-x64/ControlR.DesktopClient.zip" .
561+
zip -r "$RUNNER_TEMP/staging-desktop/linux-x64/ControlR.DesktopClient.zip" .
561562
cd ${{ github.workspace}}
562563
563564
- name: Build Agent (linux-x64)
@@ -572,12 +573,12 @@ jobs:
572573
573574
- name: Create Bundle ZIP (linux-x64)
574575
run: |
575-
rm -rf ".build/bundle/linux-x64"
576-
mkdir -p ".build/bundle/linux-x64/DesktopClient"
577-
cp "./ControlR.Agent/bin/publish/linux-x64/ControlR.Agent" ".build/bundle/linux-x64/ControlR.Agent"
578-
cp -R ./ControlR.DesktopClient/bin/publish/linux-x64/. ".build/bundle/linux-x64/DesktopClient/"
576+
rm -rf "$RUNNER_TEMP/bundle/linux-x64"
577+
mkdir -p "$RUNNER_TEMP/bundle/linux-x64/DesktopClient"
578+
cp "./ControlR.Agent/bin/publish/linux-x64/ControlR.Agent" "$RUNNER_TEMP/bundle/linux-x64/ControlR.Agent"
579+
cp -R ./ControlR.DesktopClient/bin/publish/linux-x64/. "$RUNNER_TEMP/bundle/linux-x64/DesktopClient/"
579580
580-
cd .build/bundle/linux-x64
581+
cd "$RUNNER_TEMP/bundle/linux-x64"
581582
zip -r "${{ github.workspace }}/ControlR.Web.Server/wwwroot/downloads/linux-x64/ControlR.Agent.bundle.zip" .
582583
cd "${{ github.workspace }}"
583584

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ FodyWeavers.xsd
376376
.idea/.idea.ControlR/.idea/copilot.data.migration.agent.xml
377377
.idea/.idea.ControlR/.idea/copilot.data.migration.edit.xml
378378
/Tests/ControlR.DesktopClient.Common.Tests/Resources/*
379+
.build/*
379380

380381
# Language servive cache files
381382
*.lscache

0 commit comments

Comments
 (0)