Merge branch 'main' into remove-rsa-sha2-256-workaround-from-bbs2gh

Author: Arin Ghazarian

.devcontainer/Dockerfile

@@ -1,13 +1,6 @@
 {
 	"name": "C# (.NET)",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": { 
-			// Update 'VARIANT' to pick a .NET Core version: 3.1, 6.0
-			// Append -bullseye or -focal to pin to an OS version.
-			"VARIANT": "6.0-bullseye"
-		}
-	},
+	"image": "mcr.microsoft.com/devcontainers/dotnet:8.0",
 
 	// Configure tool-specific properties.
 	"customizations": {

.devcontainer/devcontainer.json

@@ -1,7 +1,8 @@
 # To get started with Dependabot version updates, you'll need to specify which
 # package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
+# Please see the documentation for more information:
 # https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
 
 version: 2
 updates:
@@ -13,3 +14,7 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+  - package-ecosystem: "devcontainers"
+    directory: "/"
+    schedule:
+      interval: weekly

.github/dependabot.yml

@@ -25,7 +25,7 @@ jobs:
 
     - name: Initialize CodeQL
       if: matrix.runner-os == 'ubuntu-latest'
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: 'csharp'
         config-file: ./.github/codeql/codeql-config.yml
@@ -63,29 +63,29 @@ jobs:
     # This is used by the subsequent publish-test-results.yml
     - name: Upload Unit Test Results
       if: always() && matrix.runner-os == 'ubuntu-latest'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Unit Test Results
         path: src/OctoshiftCLI.Tests/unit-tests.xml
 
     # This is used by the subsequent publish-test-results.yml
     - name: Upload Code Coverage Report
       if: always() && matrix.runner-os == 'ubuntu-latest'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Code Coverage Report
         path: code-coverage-results.md
-    
+
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       if: matrix.runner-os == 'ubuntu-latest'
 
   upload-event-file:
     runs-on: ubuntu-latest
     steps:
     # This is used by the subsequent publish-test-results.yaml
     - name: Upload Event File
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Event File
         path: ${{ github.event_path }}
@@ -130,7 +130,7 @@ jobs:
         SKIP_LINUX: "true"
 
     - name: Upload Binaries
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: binaries-${{ matrix.target-os }}
         path: |
@@ -162,8 +162,9 @@ jobs:
       with:
         global-json-file: global.json
 
+
     - name: Download Binaries
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: binaries-${{ matrix.runner-os }}
         path: dist
@@ -213,14 +214,14 @@ jobs:
       working-directory: ./gh-gei
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        
+
     - name: Install gh-ado2gh extension
       run: gh extension install .
       shell: pwsh
       working-directory: ./gh-ado2gh
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        
+
     - name: Install gh-bbs2gh extension
       run: gh extension install .
       shell: pwsh
@@ -229,7 +230,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Integration Test
-      env: 
+      env:
         ADO_PAT: ${{ secrets.ADO_PAT }}
         GHEC_PAT: ${{ secrets.GHEC_PAT }}
         GHES_PAT: ${{ secrets.GHES_PAT }}
@@ -248,8 +249,8 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
-        LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:${{ github.workspace }}/src/OctoshiftCLI.IntegrationTests/bin/Debug/net6.0/runtimes/ubuntu.18.04-x64/native'
-      run: dotnet test src/OctoshiftCLI.IntegrationTests/OctoshiftCLI.IntegrationTests.csproj --filter "${{ matrix.source-vcs }}ToGithub" --logger:"junit;LogFilePath=integration-tests.xml" /p:VersionPrefix=9.9
+        LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:${{ github.workspace }}/src/OctoshiftCLI.IntegrationTests/bin/Debug/net8.0/runtimes/ubuntu.18.04-x64/native'
+      run: dotnet test src/OctoshiftCLI.IntegrationTests/OctoshiftCLI.IntegrationTests.csproj --filter "${{ matrix.source-vcs }}ToGithub" --logger:"junit;LogFilePath=integration-tests.xml" --logger "console;verbosity=normal" /p:VersionPrefix=9.9
 
     - name: Publish Integration Test Results
       uses: EnricoMi/publish-unit-test-result-action@v2
@@ -258,9 +259,9 @@ jobs:
         files: "**/*-tests.xml"
         check_name: "Integration Test Results - ${{ matrix.source-vcs }}"
         comment_mode: off
-    
+
     - name: Upload test logs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: integration-test-logs-${{ matrix.source-vcs }}-${{ matrix.runner-os }}
@@ -317,7 +318,7 @@ jobs:
         CLI_VERSION: ${{ github.ref }}
 
     - name: Create gh-gei Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         body_path: ./RELEASENOTES.md
         files: |
@@ -329,9 +330,9 @@ jobs:
           ./dist/win-x86/gei-windows-386.exe
           ./dist/linux-x64/gei-linux-amd64
           ./dist/osx-x64/gei-darwin-amd64
-    
+
     - name: Create gh-ado2gh Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         body_path: ./RELEASENOTES.md
         repository: github/gh-ado2gh
@@ -343,7 +344,7 @@ jobs:
           ./dist/osx-x64/ado2gh-darwin-amd64
 
     - name: Create gh-bbs2gh Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         body_path: ./RELEASENOTES.md
         repository: github/gh-bbs2gh
@@ -360,13 +361,13 @@ jobs:
         $TAG_NAME = "${{ github.ref }}".Substring(10)
         Get-Content ./RELEASENOTES.md | Out-File -FilePath ./releasenotes/$TAG_NAME.md
         "" | Out-File ./RELEASENOTES.md
-        
+
     - name: Update LATEST-VERSION.TXT
       shell: pwsh
       run: |
         $TAG_NAME = "${{ github.ref }}".Substring(10)
         $TAG_NAME | Out-File ./LATEST-VERSION.txt
-        
+
     - name: Commit Release Notes and Version
       uses: stefanzweifel/git-auto-commit-action@v5
       with:

.github/workflows/CI.yml

@@ -16,6 +16,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+      with:
+        ref: 'refs/pull/${{ github.event.inputs.pr_number }}/merge'
+        fetch-depth: 0
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v2
@@ -47,7 +50,7 @@ jobs:
         SKIP_LINUX: "true"
 
     - name: Upload Binaries
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: binaries-${{ matrix.target-os }}
         path: |
@@ -74,7 +77,7 @@ jobs:
       with:
         ref: 'refs/pull/${{ github.event.inputs.pr_number }}/merge'
         fetch-depth: 0
-        
+
     - name: Get PR Commit
       if: always() && matrix.runner-os == 'ubuntu-latest'
       run: |
@@ -86,9 +89,9 @@ jobs:
       uses: actions/setup-dotnet@v2
       with:
         global-json-file: global.json
-        
+
     - name: Download Binaries
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: binaries-${{ matrix.runner-os }}
         path: dist
@@ -138,14 +141,14 @@ jobs:
       working-directory: ./gh-gei
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        
+
     - name: Install gh-ado2gh extension
       run: gh extension install .
       shell: pwsh
       working-directory: ./gh-ado2gh
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        
+
     - name: Install gh-bbs2gh extension
       run: gh extension install .
       shell: pwsh
@@ -154,7 +157,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Integration Test
-      env: 
+      env:
         ADO_PAT: ${{ secrets.ADO_PAT }}
         GHEC_PAT: ${{ secrets.GHEC_PAT }}
         GHES_PAT: ${{ secrets.GHES_PAT }}
@@ -174,8 +177,8 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
         GEI_DEBUG_MODE: 'true'
-        LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:${{ github.workspace }}/src/OctoshiftCLI.IntegrationTests/bin/Debug/net6.0/runtimes/ubuntu.18.04-x64/native'
-      run: dotnet test src/OctoshiftCLI.IntegrationTests/OctoshiftCLI.IntegrationTests.csproj --filter "${{ matrix.source-vcs }}ToGithub" --logger:"junit;LogFilePath=integration-tests.xml" /p:VersionPrefix=9.9
+        LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:${{ github.workspace }}/src/OctoshiftCLI.IntegrationTests/bin/Debug/net8.0/runtimes/ubuntu.18.04-x64/native'
+      run: dotnet test src/OctoshiftCLI.IntegrationTests/OctoshiftCLI.IntegrationTests.csproj --filter "${{ matrix.source-vcs }}ToGithub" --logger:"junit;LogFilePath=integration-tests.xml" --logger "console;verbosity=normal" /p:VersionPrefix=9.9
 
     - name: Publish Integration Test Results
       uses: EnricoMi/publish-unit-test-result-action@v2
@@ -185,9 +188,9 @@ jobs:
         check_name: "Integration Test Results - ${{ matrix.source-vcs }}"
         comment_mode: off
         commit: ${{ env.PR_SHA }}
-    
+
     - name: Upload test logs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: integration-test-logs-${{ matrix.source-vcs }}-${{ matrix.runner-os }}

.github/workflows/integration-tests.yml

@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/gei/bin/Debug/net6.0/gei.dll",
+            "program": "${workspaceFolder}/src/gei/bin/Debug/net8.0/gei.dll",
             "args": [],
             "cwd": "${workspaceFolder}/src/gei",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
@@ -26,7 +26,7 @@
             "request": "launch",
             "preLaunchTask": "build-ado2gh",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/ado2gh/bin/Debug/net6.0/ado2gh.dll",
+            "program": "${workspaceFolder}/src/ado2gh/bin/Debug/net8.0/ado2gh.dll",
             "args": [],
             "cwd": "${workspaceFolder}/src/ado2gh",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
@@ -47,7 +47,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/bbs2gh/bin/Debug/net6.0/bbs2gh.dll",
+            "program": "${workspaceFolder}/src/bbs2gh/bin/Debug/net8.0/bbs2gh.dll",
             "args": [],
             "cwd": "${workspaceFolder}/src/bbs2gh",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console

.vscode/launch.json

@@ -20,7 +20,7 @@ Use the [Discussions](https://github.com/github/gh-gei/discussions) tab in this
 
 All work done by the maintainers of this repo is tracked in this repo using Issues. We have a hierarchical backlog with Epics at the top, broken down into Batches then broken down to Tasks (epic/batch/task is indicated via labels on the issues). You can see an example Epic and navigate down from there [here](https://github.com/github/gh-gei/issues/101).
 
-## Running tests 
+## Running tests
 
 ### In the terminal
 If you want to run tests selectively in the terminal, you can use dotnet test with `--filter` option.
@@ -36,31 +36,31 @@ Here are some examples:
 dotnet test --filter AdoApiTests.GetUserId_Should_Return_UserId
 ```
 
-### Debugger 
+### Debugger
 
-If you are using VS code, you can install the [C# dev kit](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit) which will add the testing extension. 
-- Press the play to run the entire test suite, or navigate to the specific test you would like to run. 
-- If you set a breakpoint within your code and press the play button with the bug next to it you will be able to inspect your code in more detial. 
+If you are using VS code, you can install the [C# dev kit](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit) which will add the testing extension.
+- Press the play to run the entire test suite, or navigate to the specific test you would like to run.
+- If you set a breakpoint within your code and press the play button with the bug next to it you will be able to inspect your code in more detial.
 
-### Useful links 
+### Useful links
 1. [Dotnet test commands](https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details)
 2. [Run selective unit tests](https://learn.microsoft.com/en-us/dotnet/core/testing/selective-unit-tests?pivots=mstest)
 3. [C# dev kit](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit)
- 
 
 
-## Debugging code 
 
-There are two ways to debug code within VS code. 
+## Debugging code
+
+There are two ways to debug code within VS code.
 
 ### Run GH-GEI command locally
-Run the following commands in your terminal depending on the provider you are looking to run the commands for. 
+Run the following commands in your terminal depending on the provider you are looking to run the commands for.
 
-Azure DevOps: 
+Azure DevOps:
 - Generic: `dotnet run --project src/ado2gh/ado2gh.csproj -- [command]`
 - Example: `dotnet run --project src/ado2gh/ado2gh.csproj -- migrate-repo --help`
 
-Bitbucket Server: 
+Bitbucket Server:
 - Generic: `dotnet run --project src/bbs2gh/bbs2gh.csproj -- [command]`
 - Example: `dotnet run --project src/bbs2gh/bbs2gh.csproj -- migrate-repo --help`
 
@@ -77,7 +77,7 @@ In your terminal:
 (v0.4.0 is the latest version compatible with .NET 6.0)
 
 Run it:
-`csharprepl -r src/bbs2gh/bin/Debug/net6.0/Octoshift.dll`
+`csharprepl -r src/bbs2gh/bin/Debug/net8.0/Octoshift.dll`
 
 Then load up assemblies:
 ```csharp
@@ -96,7 +96,7 @@ var aws = new AwsApi("access-key-id", "secret-access-key");
 
 ### Use debugger
 
-If you use the built in debugger you are able to set breakpoints and inspect the code within VS Code. 
+If you use the built in debugger you are able to set breakpoints and inspect the code within VS Code.
 
 1. Navigate to `.vs_code/launch.json`.
 2. Find the command you are looking to run, for example: `Launch ado2gh`.
@@ -107,7 +107,7 @@ If you use the built in debugger you are able to set breakpoints and inspect the
 6. Navigate to the drop down menu and select the command you would like to run, for example: `Launch ado2gh`.
 7. Press the play button
 
-### Useful links 
+### Useful links
 
 1. [Run a .NET app](https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-run)
 2. [Debugging using vscode](https://code.visualstudio.com/docs/editor/debugging)

CONTRIBUTING.md

@@ -1 +1 @@
-v1.8.0
+v1.11.0