Skip to content

Commit a9e3e3b

Browse files
committed
Merge remote-tracking branch 'upstream/master' into fix-1278
2 parents 610dd44 + b161728 commit a9e3e3b

File tree

15 files changed

+3275
-657
lines changed

15 files changed

+3275
-657
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ jobs:
5555
tmp=$(mktemp)
5656
jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
5757
mkdir dist
58-
echo $VERSION > .version
59-
echo $NAME > .name
58+
echo $VERSION > meta.version
59+
echo $NAME > meta.name
6060
- name: Use Node.js
6161
uses: actions/setup-node@v4
6262
with:
@@ -79,8 +79,8 @@ jobs:
7979
with:
8080
name: meta
8181
path: |
82-
.name
83-
.version
82+
meta.name
83+
meta.version
8484
beta:
8585
if: (github.event_name == 'push')
8686
runs-on: ubuntu-latest
@@ -94,8 +94,8 @@ jobs:
9494
id: set-version
9595
run: |
9696
set -x
97-
echo "version=`cat .version`" >> $GITHUB_OUTPUT
98-
echo "name=`cat .name`" >> $GITHUB_OUTPUT
97+
echo "version=`cat meta.version`" >> $GITHUB_OUTPUT
98+
echo "name=`cat meta.name`" >> $GITHUB_OUTPUT
9999
- uses: actions/download-artifact@v4
100100
with:
101101
name: ${{ steps.set-version.outputs.name }}.vsix
@@ -127,9 +127,9 @@ jobs:
127127
- name: Prepare build
128128
id: set-version
129129
run: |
130-
VERSION=`cat .version`
131-
NEXT_VERSION=`cat .version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.`
132-
echo "name=`cat .name`" >> $GITHUB_OUTPUT
130+
VERSION=`cat meta.version`
131+
NEXT_VERSION=`cat meta.version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.`
132+
echo "name=`cat meta.name`" >> $GITHUB_OUTPUT
133133
tmp=$(mktemp)
134134
git config --global user.name 'ProjectBot'
135135
git config --global user.email '[email protected]'

.github/workflows/prerelease.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
tmp=$(mktemp)
5151
jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
5252
mkdir dist
53-
echo $VERSION > .version
54-
echo $NAME > .name
53+
echo $VERSION > meta.version
54+
echo $NAME > meta.name
5555
- name: Use Node.js
5656
uses: actions/setup-node@v4
5757
with:
@@ -74,8 +74,8 @@ jobs:
7474
with:
7575
name: meta
7676
path: |
77-
.name
78-
.version
77+
meta.name
78+
meta.version
7979
beta:
8080
if: (github.event_name == 'push')
8181
runs-on: ubuntu-latest
@@ -89,8 +89,8 @@ jobs:
8989
id: set-version
9090
run: |
9191
set -x
92-
echo "version=`cat .version`" >> $GITHUB_OUTPUT
93-
echo "name=`cat .name`" >> $GITHUB_OUTPUT
92+
echo "version=`cat meta.version`" >> $GITHUB_OUTPUT
93+
echo "name=`cat meta.name`" >> $GITHUB_OUTPUT
9494
- uses: actions/download-artifact@v4
9595
with:
9696
name: ${{ steps.set-version.outputs.name }}.vsix
@@ -122,9 +122,9 @@ jobs:
122122
- name: Prepare pre-release build
123123
id: set-version
124124
run: |
125-
VERSION=`cat .version`
126-
NEXT_VERSION=`cat .version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.`
127-
echo "name=`cat .name`" >> $GITHUB_OUTPUT
125+
VERSION=`cat meta.version`
126+
NEXT_VERSION=`cat meta.version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.`
127+
echo "name=`cat meta.name`" >> $GITHUB_OUTPUT
128128
tmp=$(mktemp)
129129
git config --global user.name 'ProjectBot'
130130
git config --global user.email '[email protected]'

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Change Log
22

3+
## [2.12.9] 29-Oct-2024
4+
- Enhancements
5+
- Add `Launch Lite Terminal` action to Explorer (#1438)
6+
- Add timeout to initial connection request (#1440)
7+
- Use more granular symbols for class members (#1442)
8+
- Migrate to `@vscode-elements/elements` (#1449)
9+
- Fixes
10+
- Make Explorer Find widget work in 1.94 as long as proposed APIs are enabled (#1444)
11+
- Fix fuzzy match in Explorer tree Find on an ISFS folder in 1.94 (#1446)
12+
- Support for line wrapping in Lite Terminal (#1452)
13+
14+
## [2.12.8] 23-Sep-2024
15+
- Fixes
16+
- Solve 1.93 performance issue (#1428)
17+
318
## [2.12.7] 05-Aug-2024
419
- Enhancements
520
- Fire source control hooks for opened and closed documents (#1414)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ To unlock these features (optional):
5555

5656
1. Download and install a beta version from GitHub. This is necessary because Marketplace does not allow publication of extensions that use proposed APIs.
5757
- Go to https://github.com/intersystems-community/vscode-objectscript/releases
58-
- Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `2.12.7`, look for `2.12.8-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs.
59-
- Download the VSIX file (for example `vscode-objectscript-2.12.8-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code.
58+
- Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `2.12.9`, look for `2.12.10-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs.
59+
- Download the VSIX file (for example `vscode-objectscript-2.12.10-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code.
6060

6161
2. From [Command Palette](https://code.visualstudio.com/docs/getstarted/tips-and-tricks#_command-palette) choose `Preferences: Configure Runtime Arguments`.
6262
3. In the argv.json file that opens, add this line (required for both Stable and Insiders versions of VS Code):

0 commit comments

Comments
 (0)