Skip to content

Commit

Permalink
Merge branch 'main' into nagilson-python-azure-pipelines
Browse files Browse the repository at this point in the history
  • Loading branch information
nagilson authored Oct 6, 2022
2 parents 0bd81aa + ef572f9 commit 6499c84
Show file tree
Hide file tree
Showing 14 changed files with 2,939 additions and 761 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@ install.*
vscode-dotnet-runtime-library/install scripts/dotnet-install.*
*/images/*
vscode-dotnet-runtime-extension/LICENSE.txt
vscode-dotnet-sdk-extension/LICENSE.txt
vscode-dotnet-sdk-extension/LICENSE.txt
.vscode/launch.json
rimraf
11 changes: 6 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ stages:
versionSpec: '15.x'
displayName: 'Install Node.js'
- bash: |
npm install -g tslint --verbose
npm install --cache /temp/empty-cache
npm install tslint --verbose
npm run lint
displayName: Run Lint
##### Verify NPM and Yarn are in sync #####
Expand Down Expand Up @@ -129,8 +130,8 @@ stages:
displayName: 'Get Version'
workingDirectory: $(dir-name)
- bash: |
npm install -g rimraf
npm install -g vsce
npm install rimraf --verbose
npm install vsce --verbose
vsce package -o $(package-name)-$(GetVersion.version).vsix --ignoreFile ../.vscodeignore --yarn
displayName: Package Artifact
workingDirectory: $(dir-name)
Expand Down Expand Up @@ -194,7 +195,7 @@ stages:
versionSpec: '15.x'
displayName: 'Install Node.js'
- bash: |
npm install -g vsce
npm install vsce --verbose
vsce publish --packagePath vscode-dotnet-runtime-$(version).vsix -p $(VSCODE_MARKETPLACE_TOKEN)
displayName: 'Publish to Marketplace'
workingDirectory: '$(System.ArtifactsDirectory)/vscode-dotnet-runtime-extension'
Expand Down Expand Up @@ -247,7 +248,7 @@ stages:
versionSpec: '15.x'
displayName: 'Install Node.js'
- bash: |
npm install -g vsce
npm install vsce --verbose
vsce publish --packagePath vscode-dotnet-sdk-$(version).vsix -p $(VSCODE_MARKETPLACE_TOKEN)
displayName: 'Publish to Marketplace'
workingDirectory: '$(System.ArtifactsDirectory)/vscode-dotnet-sdk-extension'
8 changes: 4 additions & 4 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ icacls "./vscode-dotnet-runtime-library/install scripts/dotnet-install.sh" /gran
#################### Compile library ####################
pushd vscode-dotnet-runtime-library
if (Test-Path node_modules) { rm -r -force node_modules }
npm install
npm ci
npm run compile

if (! $?)
Expand All @@ -42,7 +42,7 @@ popd
#################### Compile runtime extension ####################
pushd vscode-dotnet-runtime-extension
if (Test-Path node_modules) { rm -r -force node_modules }
npm install
npm ci
npm run compile

if (! $?)
Expand All @@ -55,7 +55,7 @@ popd
#################### Compile SDK extension ####################
pushd vscode-dotnet-sdk-extension
if (Test-Path node_modules) { rm -r -force node_modules }
npm install
npm ci
npm run compile

if (! $?)
Expand All @@ -68,7 +68,7 @@ popd
#################### Compile sample extension ####################
pushd sample
if (Test-Path node_modules) { rm -r -force node_modules }
npm install
npm ci
npm run compile

if (! $?)
Expand Down
8 changes: 4 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ echo "----------- Compiling vscode-dotnet-runtime-library -----------"
echo ""
pushd vscode-dotnet-runtime-library
rm -rf node_modules
npm install
npm ci
npm run compile

if [ $? -ne 0 ];
Expand All @@ -39,7 +39,7 @@ echo "----------- Compiling vscode-dotnet-runtime-extension -----------"
echo ""
pushd vscode-dotnet-runtime-extension
rm -rf node_modules
npm install
npm ci
npm run compile

if [ $? -ne 0 ];
Expand All @@ -55,7 +55,7 @@ echo "----------- Compiling vscode-dotnet-sdk-extension -----------"
echo ""
pushd vscode-dotnet-sdk-extension
rm -rf node_modules
npm install
npm ci
npm run compile

if [ $? -ne 0 ];
Expand All @@ -71,7 +71,7 @@ echo "----------- Compiling sample -----------"
echo ""
pushd sample
rm -rf node_modules
npm install
npm ci
npm run compile

if [ $? -ne 0 ];
Expand Down
Loading

0 comments on commit 6499c84

Please sign in to comment.