Merge branch 'master' into disable_format

Author: JoeRobich

.github/workflows/release-ci.yml

@@ -31,67 +31,67 @@ jobs:
       run: node -e "console.log('VERSION=' + require('./package.json').version)" >> $GITHUB_ENV
 
     - name: Upload release build (darwin-arm64)
-      id: upload-release-asset
+      id: upload-release-asset-darwin-arm64
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./csharp-${{ env.VERSION }}-(darwin-arm64).vsix
-        asset_name: csharp-${{ env.VERSION }}-(darwin-arm64).vsix
+        asset_path: ./csharp-${{ env.VERSION }}-darwin-arm64.vsix
+        asset_name: csharp-${{ env.VERSION }}-darwin-arm64.vsix
         asset_content_type: application/zip
 
     - name: Upload release build (darwin-x64)
-      id: upload-release-asset
+      id: upload-release-asset-darwin-x64
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./csharp-${{ env.VERSION }}-(darwin-x64).vsix
-        asset_name: csharp-${{ env.VERSION }}-(darwin-x64).vsix
+        asset_path: ./csharp-${{ env.VERSION }}-darwin-x64.vsix
+        asset_name: csharp-${{ env.VERSION }}-darwin-x64.vsix
         asset_content_type: application/zip
 
     - name: Upload release build (linux-x64)
-      id: upload-release-asset
+      id: upload-release-asset-linux-x64
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./csharp-${{ env.VERSION }}-(linux-x64).vsix
-        asset_name: csharp-${{ env.VERSION }}-(linux-x64).vsix
+        asset_path: ./csharp-${{ env.VERSION }}-linux-x64.vsix
+        asset_name: csharp-${{ env.VERSION }}-linux-x64.vsix
         asset_content_type: application/zip
 
     - name: Upload release build (win32-arm64)
-      id: upload-release-asset
+      id: upload-release-asset-win32-arm64
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./csharp-${{ env.VERSION }}-(win32-arm64).vsix
-        asset_name: csharp-${{ env.VERSION }}-(win32-arm64).vsix
+        asset_path: ./csharp-${{ env.VERSION }}-win32-arm64.vsix
+        asset_name: csharp-${{ env.VERSION }}-win32-arm64.vsix
         asset_content_type: application/zip
 
     - name: Upload release build (win32-ia32)
-      id: upload-release-asset
+      id: upload-release-asset-win32-ia32
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./csharp-${{ env.VERSION }}-(win32-ia32).vsix
-        asset_name: csharp-${{ env.VERSION }}-(win32-ia32).vsix
+        asset_path: ./csharp-${{ env.VERSION }}-win32-ia32.vsix
+        asset_name: csharp-${{ env.VERSION }}-win32-ia32.vsix
         asset_content_type: application/zip
 
     - name: Upload release build (win32-x64)
-      id: upload-release-asset
+      id: upload-release-asset-win32-x64
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./csharp-${{ env.VERSION }}-(win32-x64).vsix
-        asset_name: csharp-${{ env.VERSION }}-(win32-x64).vsix
+        asset_path: ./csharp-${{ env.VERSION }}-win32-x64.vsix
+        asset_name: csharp-${{ env.VERSION }}-win32-x64.vsix
         asset_content_type: application/zip

tasks/offlinePackagingTasks.ts

@@ -35,7 +35,7 @@ export const offlinePackages = [
 export function getPackageName(packageJSON: any, vscodePlatformId: string) {
     const name = packageJSON.name;
     const version = packageJSON.version;
-    return `${name}.${version}-${vscodePlatformId}.vsix`;
+    return `${name}-${version}-${vscodePlatformId}.vsix`;
 }
 
 gulp.task('vsix:release:package:platform-specific', async () => {