Skip to content

Commit e96b99a

Browse files
JoeRobichJoeRobich
authored
Merge branch 'master' into master
2 parents 9e848e5 + 132e236 commit e96b99a

File tree

119 files changed

+3843
-1432
lines changed

Some content is hidden

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

119 files changed

+3843
-1432
lines changed

‎.github/workflows/ci.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- name: Setup virtual display
1818
run: /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
1919

20-
- name: Install .NET Core 3.1 SDK
20+
- name: Install .NET Core 5.0 SDK
2121
uses: actions/[email protected]
2222
with:
23-
dotnet-version: 3.1.x
23+
dotnet-version: 5.0.x
2424

2525
- name: Install Node.js 15.x
2626
uses: actions/setup-node@v1
@@ -35,8 +35,8 @@ jobs:
3535
- name: Compile
3636
run: npm run compile
3737

38-
- name: Build extension package
39-
run: gulp 'vsix:release:package'
38+
- name: Build platform-neutral extension package
39+
run: gulp 'vsix:release:package:platform-neutral'
4040

4141
- name: Run unit and integration tests
4242
run: |
@@ -45,3 +45,6 @@ jobs:
4545
env:
4646
CODE_VERSION: 1.45.0
4747
DISPLAY: :99.0
48+
49+
- name: Build platform-specific extension package
50+
run: gulp 'vsix:release:package:platform-specific'

‎.github/workflows/release-ci.yml

Lines changed: 71 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,87 @@ jobs:
2222
npm i -g gulp
2323
2424
- name: Build extension package
25-
run: gulp 'vsix:release:package'
25+
run: gulp 'vsix:release:package:platform-specific'
2626

2727
- name: Run release tests
2828
run: npm run test:release
2929

3030
- name: Get package version
3131
run: node -e "console.log('VERSION=' + require('./package.json').version)" >> $GITHUB_ENV
3232

33-
- name: Upload release build
34-
id: upload-release-asset
33+
- name: Upload release build (darwin-arm64)
34+
id: upload-release-asset-darwin-arm64
3535
uses: actions/upload-release-asset@v1
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3838
with:
3939
upload_url: ${{ github.event.release.upload_url }}
40-
asset_path: ./csharp-${{ env.VERSION }}.vsix
41-
asset_name: csharp-${{ env.VERSION }}.vsix
40+
asset_path: ./csharp-${{ env.VERSION }}-darwin-arm64.vsix
41+
asset_name: csharp-${{ env.VERSION }}-darwin-arm64.vsix
42+
asset_content_type: application/zip
43+
44+
- name: Upload release build (darwin-x64)
45+
id: upload-release-asset-darwin-x64
46+
uses: actions/upload-release-asset@v1
47+
env:
48+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
49+
with:
50+
upload_url: ${{ github.event.release.upload_url }}
51+
asset_path: ./csharp-${{ env.VERSION }}-darwin-x64.vsix
52+
asset_name: csharp-${{ env.VERSION }}-darwin-x64.vsix
53+
asset_content_type: application/zip
54+
55+
- name: Upload release build (linux-arm64)
56+
id: upload-release-asset-linux-arm64
57+
uses: actions/upload-release-asset@v1
58+
env:
59+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
60+
with:
61+
upload_url: ${{ github.event.release.upload_url }}
62+
asset_path: ./csharp-${{ env.VERSION }}-linux-arm64.vsix
63+
asset_name: csharp-${{ env.VERSION }}-linux-arm64.vsix
64+
asset_content_type: application/zip
65+
66+
- name: Upload release build (linux-x64)
67+
id: upload-release-asset-linux-x64
68+
uses: actions/upload-release-asset@v1
69+
env:
70+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71+
with:
72+
upload_url: ${{ github.event.release.upload_url }}
73+
asset_path: ./csharp-${{ env.VERSION }}-linux-x64.vsix
74+
asset_name: csharp-${{ env.VERSION }}-linux-x64.vsix
75+
asset_content_type: application/zip
76+
77+
- name: Upload release build (win32-arm64)
78+
id: upload-release-asset-win32-arm64
79+
uses: actions/upload-release-asset@v1
80+
env:
81+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
82+
with:
83+
upload_url: ${{ github.event.release.upload_url }}
84+
asset_path: ./csharp-${{ env.VERSION }}-win32-arm64.vsix
85+
asset_name: csharp-${{ env.VERSION }}-win32-arm64.vsix
86+
asset_content_type: application/zip
87+
88+
- name: Upload release build (win32-ia32)
89+
id: upload-release-asset-win32-ia32
90+
uses: actions/upload-release-asset@v1
91+
env:
92+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
93+
with:
94+
upload_url: ${{ github.event.release.upload_url }}
95+
asset_path: ./csharp-${{ env.VERSION }}-win32-ia32.vsix
96+
asset_name: csharp-${{ env.VERSION }}-win32-ia32.vsix
97+
asset_content_type: application/zip
98+
99+
- name: Upload release build (win32-x64)
100+
id: upload-release-asset-win32-x64
101+
uses: actions/upload-release-asset@v1
102+
env:
103+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
104+
with:
105+
upload_url: ${{ github.event.release.upload_url }}
106+
asset_path: ./csharp-${{ env.VERSION }}-win32-x64.vsix
107+
asset_name: csharp-${{ env.VERSION }}-win32-x64.vsix
42108
asset_content_type: application/zip

‎.vscode/launch.json

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,31 @@
153153
],
154154
"preLaunchTask": "buildDev"
155155
},
156+
{
157+
"name": "Launch slnWithGenerator Workspace Tests",
158+
"type": "extensionHost",
159+
"request": "launch",
160+
"runtimeExecutable": "${execPath}",
161+
"args": [
162+
"--disable-extensions",
163+
"${workspaceRoot}/test/integrationTests/testAssets/slnWithGenerator",
164+
"--extensionDevelopmentPath=${workspaceRoot}",
165+
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
166+
],
167+
"env": {
168+
"CODE_WORKSPACE_ROOT": "${workspaceRoot}",
169+
"CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
170+
"CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/slnWithGenerator",
171+
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
172+
"OSVC_SUITE": "slnWithGenerator"
173+
},
174+
"stopOnEntry": false,
175+
"sourceMaps": true,
176+
"outFiles": [
177+
"${workspaceRoot}/dist/*.js"
178+
],
179+
"preLaunchTask": "buildDev"
180+
},
156181
{
157182
"type": "node",
158183
"request": "launch",
@@ -163,8 +188,8 @@
163188
"updatePackageDependencies"
164189
],
165190
"env": {
166-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/5d7959540d6bbcadb8c62ed029666b50/omnisharp-linux-x64-1.37.11.zip,https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/38f3ae1091fa7fcfcdb3f053f18ec2cd/omnisharp-linux-x86-1.37.11.zip,https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/1e6ff3628ffa5f0506e40681efab9dc2/omnisharp-osx-1.37.11.zip,https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/6644e2c58c93bc4c67e846ceea47eab0/omnisharp-win-x64-1.37.11.zip,https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/708153288283687c692e6a8ace64ba5d/omnisharp-win-x86-1.37.11.zip",
167-
"NEW_DEPS_VERSION": "1.37.11"
191+
"NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-linux-arm64-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-linux-x64-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-linux-x86-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-osx-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-win-arm64-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-win-x64-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-win-x86-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-linux-arm64-net6.0-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-linux-x64-net6.0-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-osx-arm64-net6.0-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-osx-x64-net6.0-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-win-arm64-net6.0-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-win-x64-net6.0-1.38.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.0/omnisharp-win-x86-net6.0-1.38.0.zip",
192+
"NEW_DEPS_VERSION": "1.38.0"
168193
},
169194
"cwd": "${workspaceFolder}"
170195
}

0 commit comments

Comments
 (0)