Merge branch 'main' of https://github.com/bc3tech/docgpt into pkg-upd…

…ates # Conflicts: # DocGpt.Roslyn/DocGpt.Roslyn.csproj # DocGpt.Test/DocGpt.Test.csproj # DocGpt.Vsix/DocGpt.Vsix.csproj
bc3tech · Dec 13, 2024 · e57e308 · e57e308
2 parents 94462be + ad71798
commit e57e308
Showing 1 changed file with 22 additions and 14 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -58,11 +58,11 @@ jobs:
 
           echo "extVersion=$env:EXTENSION_VERSION" >> "$env:GITHUB_OUTPUT"
 
-      - name: Restore NuGet packages
-        run: nuget restore .\DocGpt.sln
+#      - name: Restore NuGet packages
+#        run: nuget restore .\DocGpt.sln
 
       - name: Build Extension
-        run: msbuild .\DocGpt.sln -p:Configuration=Release
+        run: msbuild .\DocGpt.sln /p:Configuration=Release /t:"Restore;Build"
 
       - name: Store unsigned artifact
         uses: actions/upload-artifact@v4
@@ -91,18 +91,26 @@ jobs:
 
       # TODO: Switch from prerelease when they ship a release version
       - name: Sign Extension
+        shell: bash
+        env:
+          kv_name: ${{secrets.AZURE_KEYVAULT_NAME}}
+          kv_tenant: ${{ secrets.AZURE_TENANT_ID }}
+          kv_client: ${{ secrets.AZURE_CLIENT_ID }}
+          kv_secret: ${{ secrets.AZURE_CLIENT_SECRET }}
+          kv_cert: ${{ secrets.SIGNING_CERTIFICATE_NAME }}
         run: |
-          dotnet tool install --tool-path signer sign --prerelease
-
-          ./signer/sign code azure-key-vault `
-            -t "http://timestamp.digicert.com" "./o/DocGPT.vsix" `
-            -kvu "https://${{ secrets.AZURE_KEYVAULT_NAME }}.vault.azure.net" `
-            -kvt "${{ secrets.AZURE_TENANT_ID }}" `
-            -kvi "${{ secrets.AZURE_CLIENT_ID }}" `
-            -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" `
-            -kvc "${{ secrets.SIGNING_CERTIFICATE_NAME }}" `
-            -d "DocGPT CodeSign Certificate" `
-            -u "https://bc3.tech/docgpt"
+          dotnet tool install --tool-path signer sign --version 0.9.1-beta.24325.5
+
+          ./signer/sign code azure-key-vault \
+            "./o/DocGPT.vsix" \
+            -kvu "https://${kv_name}.vault.azure.net" \
+            -kvt "${kv_tenant}" \
+            -kvi "${kv_client}" \
+            -kvs "${kv_secret}" \
+            -kvc "${kv_cert}" \
+            -d "DocGPT CodeSign Certificate" \
+            -u "https://bc3.tech/docgpt" \
+            -t "http://timestamp.digicert.com"
 
       - name: Publish signed artifact
         uses: actions/upload-artifact@v4