This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Various Fixes and updates. #18

Open

bakerhillpins wants to merge 45 commits into StanDeMan:main from bakerhillpins:development

.github/workflows/ci-cd.yml

-Original file line number
+Diff line change
@@ -0,0 +1,108 @@
+    name: CI-CD
+    # Concurrency control ensures that only one instance of the workflow runs at a time for a given reference.
+    # This prevents multiple runs from interfering with each other.
+    # Reference: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/control-the-concurrency-of-workflows-and-jobs
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+    on:
+      push:
+        branches:
+            - main
+            - development
+      pull_request:
+        branches:
+            - main
+            - development
+      # To allow manual execution
+      workflow_dispatch:
+    env:
+      # Path to the solution file relative to the root of the project.
+      SOLUTION_FILE_PATH: ./src/RaspberryDebugger.sln
+      PROJECT_FILE_PATH: ./src/RaspberryDebugger/RaspberryDebugger.csproj
+      # Configuration type to build.
+      # You can convert this to a build matrix if you need coverage of multiple configuration types.
+      # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+      BUILD_PLATFORM: 'Any CPU'
+      BUILD_PLATFORM_FOR_PROJECTS: 'AnyCPU'
+    permissions:
+      contents: read
+    jobs:
+      # build_Linux:
+      build_Windows:
+        runs-on: [windows-2022]
+        strategy:
+          matrix:
+            configuration: [Release]
+            platform: [Any CPU]
+        steps:
+        - name: 📂 Checkout code
+          uses: actions/checkout@v4
+          with:
+            path: './src'
+            # Fetch depth needs to be set to 0 to use Nerdbank.GitVersioning
+            fetch-depth: 0
+        - name: 📂 Checkout NeonSDK
+          uses: actions/checkout@v4
+          with:
+            repository: bakerhillpins/neonSDK
+            path: './neonSDK'
+            ref: refs/heads/Development
+        # Install the .NET Core workload
+        - name: 🤖 Install .NET Core
+          uses: actions/setup-dotnet@v4
+          with:
+              global-json-file: ./src/global.json
+          env:
+              DOTNET_INSTALL_DIR: "${{ runner.temp }}\\dotnet"
+        # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
+        - name: 🤖 Setup MSBuild.exe
+          uses: microsoft/setup-msbuild@v2
+        # Restore the application to populate the obj folder with RuntimeIdentifiers
+        - name: ⚙️ Restore the application
+          run: >
+              msbuild
+              "${{ env.SOLUTION_FILE_PATH }}"
+              -verbosity:minimal
+              /t:Restore
+              /p:Configuration="${{ env.Configuration }}"
+          env:
+            Configuration: ${{ matrix.configuration }}
+        # Create the app package by building and packaging the Windows Application Packaging project
+        - name: 🤖 Create the app package
+          run: >
+              msbuild
+              -verbosity:minimal
+              "${{ env.SOLUTION_FILE_PATH }}"
+              /p:Configuration="${{ env.Configuration }}"
+          env:
+            Configuration: ${{ matrix.configuration }}
+        - name: 📤 Store Artifact
+          uses: actions/upload-artifact@v4
+          with:
+            name: RaspberryDebugger.vsix
+            path: ./src/RaspberryDebugger/bin/${{ env.Configuration }}/RaspberryDebugger.vsix
+          env:
+            Configuration: ${{ matrix.configuration }}

RaspberryDebugger.sln

-Original file line number
+Diff line change
@@ -1,67 +1,97 @@
-    Microsoft Visual Studio Solution File, Format Version 12.00
-    # Visual Studio Version 17
-    VisualStudioVersion = 17.2.32505.173
-    MinimumVisualStudioVersion = 10.0.40219.1
-    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{177F60A0-B1B9-45D1-9CB1-8F06A6ED2AB5}"
-    	ProjectSection(SolutionItems) = preProject
-    		.gitignore = .gitignore
-    		buildenv.cmd = buildenv.cmd
-    		LICENSE = LICENSE
-    		README.md = README.md
-    	EndProjectSection
-    EndProject
-    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RaspberryDebugger", "RaspberryDebugger\RaspberryDebugger.csproj", "{80D6A0E0-A145-488C-976D-CE34A16D8533}"
-    EndProject
-    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{5A14B2C0-0606-433A-AE9C-9E33C7B2BA27}"
-    	ProjectSection(SolutionItems) = preProject
-    		Doc\DEVELOPER.md = Doc\DEVELOPER.md
-    		MAINTAIN.md = MAINTAIN.md
-    		Doc\RELEASE-TEMPLATE.md = Doc\RELEASE-TEMPLATE.md
-    		Doc\RELEASE.md = Doc\RELEASE.md
-    	EndProjectSection
-    EndProject
-    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Images", "Images", "{642CFDE5-32E6-46EB-B79E-8E380CCE0237}"
-    	ProjectSection(SolutionItems) = preProject
-    		Doc\Images\RaspberryDebugSettings.png = Doc\Images\RaspberryDebugSettings.png
-    	EndProjectSection
-    EndProject
-    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ToolBin", "ToolBin", "{15A5F928-90D4-421A-850D-8A09842DA012}"
-    	ProjectSection(SolutionItems) = preProject
-    		ToolBin\archive.cmd = ToolBin\archive.cmd
-    		ToolBin\archive.ps1 = ToolBin\archive.ps1
-    		ToolBin\builder.cmd = ToolBin\builder.cmd
-    		ToolBin\builder.ps1 = ToolBin\builder.ps1
-    		ToolBin\openssl.exe = ToolBin\openssl.exe
-    		ToolBin\PathTool.exe = ToolBin\PathTool.exe
-    	EndProjectSection
-    EndProject
-    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{21D869D2-B357-485A-89C0-6A18B8886432}"
-    EndProject
-    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Blinky", "Blinky", "{C7EA532F-BE47-4993-9599-66168340E980}"
-    	ProjectSection(SolutionItems) = preProject
-    		Test\Blinkie\Blinky.sln = Test\Blinkie\Blinky.sln
-    	EndProjectSection
-    EndProject
-    Global
-    	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-    		Debug|Any CPU = Debug|Any CPU
-    		Release|Any CPU = Release|Any CPU
-    	EndGlobalSection
-    	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    		{80D6A0E0-A145-488C-976D-CE34A16D8533}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    		{80D6A0E0-A145-488C-976D-CE34A16D8533}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    		{80D6A0E0-A145-488C-976D-CE34A16D8533}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    		{80D6A0E0-A145-488C-976D-CE34A16D8533}.Release|Any CPU.Build.0 = Release|Any CPU
-    	EndGlobalSection
-    	GlobalSection(SolutionProperties) = preSolution
-    		HideSolutionNode = FALSE
-    	EndGlobalSection
-    	GlobalSection(NestedProjects) = preSolution
-    		{642CFDE5-32E6-46EB-B79E-8E380CCE0237} = {5A14B2C0-0606-433A-AE9C-9E33C7B2BA27}
-    		{C7EA532F-BE47-4993-9599-66168340E980} = {21D869D2-B357-485A-89C0-6A18B8886432}
-    	EndGlobalSection
-    	GlobalSection(ExtensibilityGlobals) = postSolution
-    		SolutionGuid = {52E13CDA-74D0-400C-83D8-417CC3C113D6}
-    	EndGlobalSection
-    EndGlobal
+    Microsoft Visual Studio Solution File, Format Version 12.00
+    # Visual Studio Version 17
+    VisualStudioVersion = 17.2.32505.173
+    MinimumVisualStudioVersion = 10.0.40219.1
+    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{177F60A0-B1B9-45D1-9CB1-8F06A6ED2AB5}"
+    	ProjectSection(SolutionItems) = preProject
+    		.gitignore = .gitignore
+    		buildenv.cmd = buildenv.cmd
+    		LICENSE = LICENSE
+    		README.md = README.md
+    	EndProjectSection
+    EndProject
+    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RaspberryDebugger", "RaspberryDebugger\RaspberryDebugger.csproj", "{80D6A0E0-A145-488C-976D-CE34A16D8533}"
+    EndProject
+    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{5A14B2C0-0606-433A-AE9C-9E33C7B2BA27}"
+    	ProjectSection(SolutionItems) = preProject
+    		Doc\DEVELOPER.md = Doc\DEVELOPER.md
+    		MAINTAIN.md = MAINTAIN.md
+    		Doc\RELEASE-TEMPLATE.md = Doc\RELEASE-TEMPLATE.md
+    		Doc\RELEASE.md = Doc\RELEASE.md
+    	EndProjectSection
+    EndProject
+    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Images", "Images", "{642CFDE5-32E6-46EB-B79E-8E380CCE0237}"
+    	ProjectSection(SolutionItems) = preProject
+    		Doc\Images\RaspberryDebugSettings.png = Doc\Images\RaspberryDebugSettings.png
+    	EndProjectSection
+    EndProject
+    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ToolBin", "ToolBin", "{15A5F928-90D4-421A-850D-8A09842DA012}"
+    	ProjectSection(SolutionItems) = preProject
+    		ToolBin\archive.cmd = ToolBin\archive.cmd
+    		ToolBin\archive.ps1 = ToolBin\archive.ps1
+    		ToolBin\builder.cmd = ToolBin\builder.cmd
+    		ToolBin\builder.ps1 = ToolBin\builder.ps1
+    		ToolBin\openssl.exe = ToolBin\openssl.exe
+    		ToolBin\PathTool.exe = ToolBin\PathTool.exe
+    	EndProjectSection
+    EndProject
+    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{21D869D2-B357-485A-89C0-6A18B8886432}"
+    EndProject
+    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Blinky", "Blinky", "{C7EA532F-BE47-4993-9599-66168340E980}"
+    	ProjectSection(SolutionItems) = preProject
+    		Test\Blinkie\Blinky.sln = Test\Blinkie\Blinky.sln
+    	EndProjectSection
+    EndProject
+    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neon.BuildInfo", "..\neonSDK\Lib\Neon.BuildInfo\Neon.BuildInfo.csproj", "{62AEE7BF-2F8B-297E-4BDA-DB9289DE49AA}"
+    EndProject
+    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neon.Common", "..\neonSDK\Lib\Neon.Common\Neon.Common.csproj", "{7B3C9089-7DCC-90DC-A824-B0EECD7C511C}"
+    EndProject
+    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neon.Cryptography", "..\neonSDK\Lib\Neon.Cryptography\Neon.Cryptography.csproj", "{C0E0FD22-0AB6-6B0B-8571-C5F4D6EDD7B8}"
+    EndProject
+    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neon.SSH", "..\neonSDK\Lib\Neon.SSH\Neon.SSH.csproj", "{030C5DD8-990D-0DD3-2886-02CB01C171CB}"
+    EndProject
+    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+    	ProjectSection(SolutionItems) = preProject
+    		.github\workflows\ci-cd.yml = .github\workflows\ci-cd.yml
+    	EndProjectSection
+    EndProject
+    Global
+    	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+    		Debug|Any CPU = Debug|Any CPU
+    		Release|Any CPU = Release|Any CPU
+    	EndGlobalSection
+    	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    		{80D6A0E0-A145-488C-976D-CE34A16D8533}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    		{80D6A0E0-A145-488C-976D-CE34A16D8533}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    		{80D6A0E0-A145-488C-976D-CE34A16D8533}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    		{80D6A0E0-A145-488C-976D-CE34A16D8533}.Release|Any CPU.Build.0 = Release|Any CPU
+    		{62AEE7BF-2F8B-297E-4BDA-DB9289DE49AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    		{62AEE7BF-2F8B-297E-4BDA-DB9289DE49AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    		{62AEE7BF-2F8B-297E-4BDA-DB9289DE49AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    		{62AEE7BF-2F8B-297E-4BDA-DB9289DE49AA}.Release|Any CPU.Build.0 = Release|Any CPU
+    		{7B3C9089-7DCC-90DC-A824-B0EECD7C511C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    		{7B3C9089-7DCC-90DC-A824-B0EECD7C511C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    		{7B3C9089-7DCC-90DC-A824-B0EECD7C511C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    		{7B3C9089-7DCC-90DC-A824-B0EECD7C511C}.Release|Any CPU.Build.0 = Release|Any CPU
+    		{C0E0FD22-0AB6-6B0B-8571-C5F4D6EDD7B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    		{C0E0FD22-0AB6-6B0B-8571-C5F4D6EDD7B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    		{C0E0FD22-0AB6-6B0B-8571-C5F4D6EDD7B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    		{C0E0FD22-0AB6-6B0B-8571-C5F4D6EDD7B8}.Release|Any CPU.Build.0 = Release|Any CPU
+    		{030C5DD8-990D-0DD3-2886-02CB01C171CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    		{030C5DD8-990D-0DD3-2886-02CB01C171CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    		{030C5DD8-990D-0DD3-2886-02CB01C171CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    		{030C5DD8-990D-0DD3-2886-02CB01C171CB}.Release|Any CPU.Build.0 = Release|Any CPU
+    	EndGlobalSection
+    	GlobalSection(SolutionProperties) = preSolution
+    		HideSolutionNode = FALSE
+    	EndGlobalSection
+    	GlobalSection(NestedProjects) = preSolution
+    		{642CFDE5-32E6-46EB-B79E-8E380CCE0237} = {5A14B2C0-0606-433A-AE9C-9E33C7B2BA27}
+    		{C7EA532F-BE47-4993-9599-66168340E980} = {21D869D2-B357-485A-89C0-6A18B8886432}
+    		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {177F60A0-B1B9-45D1-9CB1-8F06A6ED2AB5}
+    	EndGlobalSection
+    	GlobalSection(ExtensibilityGlobals) = postSolution
+    		SolutionGuid = {52E13CDA-74D0-400C-83D8-417CC3C113D6}
+    	EndGlobalSection
+    EndGlobal

RaspberryDebugger/Commands/DebugStartCommand.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,4 +1,4 @@
  
    ﻿//-----------------------------------------------------------------------------

    //-----------------------------------------------------------------------------

    // FILE:	    DebugStartCommand.cs

    // CONTRIBUTOR: Jeff Lill

    // COPYRIGHT:   Copyright (c) 2021 by neonFORGE, LLC.  All rights reserved.

    @@ -108,6 +108,8 @@ private async void Execute(object sender, EventArgs e)
  
            {

                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();

                Log.Clear();

                if (!await DebugHelper.EnsureOpenSshAsync())

                {

                    return;

    @@ -172,57 +174,76 @@ private async void Execute(object sender, EventArgs e)
  
                    var launchReady = false;

                    var foundWebServer = WebServer.None;

                    await NeonHelper.WaitForAsync(async () =>

                        {

                            // The developer must have stopped debugging before the 

                            // ASPNET application was able to begin servicing requests.

                            if (dte.Mode != vsIDEMode.vsIDEModeDebug) return true;

                            using (new CursorWait())

                    try

                    {

                        await NeonHelper.WaitForAsync( async () =>

                            {

                                try

                                {

                                    var (found, webServer) =

                                        await SearchForRunningWebServerAsync(projectProperties, projectSettings, connection);

                                    // web server not found

                                    if (!found) return false;

                                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();

                                    // take the found web server

                                    foundWebServer = webServer;

                                    launchReady = true;

                                // The developer must have stopped debugging before the 

                                // ASPNET application was able to begin servicing requests.

                                if ( dte.Mode != vsIDEMode.vsIDEModeDebug ) return true;

                                    return true;

                                }

                                catch

                                using ( new CursorWait() )

                                {

                                    return false;

                                    try

                                    {

                                        var (found, webServer) =

                                            await SearchForRunningWebServerAsync( projectProperties, projectSettings,

                                                connection );

                                        // web server not found

                                        if ( !found ) return false;

                                        // take the found web server

                                        foundWebServer = webServer;

                                        launchReady = true;

                                        return true;

                                    }

                                    catch

                                    {

                                        return false;

                                    }

                                }

                            }

                        },

                        timeout: TimeSpan.FromSeconds(60),

                        pollInterval: TimeSpan.FromSeconds(0.5));

                            },

                            timeout: TimeSpan.FromSeconds( 60 ),

                            pollInterval: TimeSpan.FromSeconds( 0.5 ) );

                    }

                    catch ( TimeoutException )

                    {

                        //DialogResult result = Dialogs.MessageBoxEx.Show(

                        //    "Raspberry Web Server not found. Start web browser anyway?",

                        //    "Raspberry Web Server",

                        //    MessageBoxButtons.YesNo,

                        //    MessageBoxIcon.Exclamation,

                        //    MessageBoxDefaultButton.Button1);

                        //launchReady = result == DialogResult.Ignore;

                    }

                    if (!launchReady) return;

                    OpenWebBrowser(projectProperties, foundWebServer, connection);

                    await Task.Delay(3000);

                    OpenWebBrowser(projectProperties, projectSettings, foundWebServer, connection);

                }

            }

            /// <summary>

            /// Open web browser for debugging

            /// </summary>

            /// <param name="projectProperties">Related project properties</param>

            /// <param name="projectSettings"></param>

            /// <param name="foundWebServer">Active WebServer: Kestrel or Other (NGiNX, Apache, etc.)</param>

            /// <param name="connection">LinuxSshProxy connection</param>

            private static void OpenWebBrowser(

                ProjectProperties projectProperties, 

                WebServer foundWebServer, 

            private static void OpenWebBrowser(ProjectProperties projectProperties,

                ProjectSettings projectSettings,

                WebServer foundWebServer,

                LinuxSshProxy connection)

            {

                // only '/' present or full relative uri

                const int fullRelativeUri = 2;

                var baseUri = $"http://{connection.Name}.local";

                var baseUri = projectSettings.UseWebServerProxy ? $"http://{connection.Name}.local" : $"http://{connection.Name}";

                var relativeBrowserUri = projectProperties.AspRelativeBrowserUri.FirstOrDefault() == '/'

                    ? projectProperties.AspRelativeBrowserUri

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Various Fixes and updates. #18

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Various Fixes and updates. #18

Are you sure you want to change the base?

Uh oh!

Various Fixes and updates. #18

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!