From f8ab759a493489704c3011256ecab6c30b21e499 Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Thu, 27 Apr 2023 16:30:40 -0700 Subject: [PATCH 1/6] Fix broken language service --- ossdbtoolsservice/workspace/contracts/common.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ossdbtoolsservice/workspace/contracts/common.py b/ossdbtoolsservice/workspace/contracts/common.py index 71bb71b98..24694c3a6 100644 --- a/ossdbtoolsservice/workspace/contracts/common.py +++ b/ossdbtoolsservice/workspace/contracts/common.py @@ -93,6 +93,10 @@ def get_child_serializable_types(cls): def __init__(self): self.text_document: TextDocumentIdentifier = None self.position: Position = None + + @classmethod + def ignore_extra_attributes(cls): + return True class Location(Serializable): From 2c824147af5d787f4ea956cf87e8819157f9823a Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Wed, 21 Jun 2023 16:08:23 -0700 Subject: [PATCH 2/6] use variable for vsts artifact versioning --- .pipeline/templates/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipeline/templates/build.yml b/.pipeline/templates/build.yml index 6a556bd5b..3d58430c8 100644 --- a/.pipeline/templates/build.yml +++ b/.pipeline/templates/build.yml @@ -16,7 +16,7 @@ steps: command: download vstsFeed: 'Database Systems/azuredatastudio-pgsqltoolsservice' vstsFeedPackage: 'pgsqltoolsservice-osx-arm64' - vstsPackageVersion: '1.6.1' + vstsPackageVersion: $(VstsPackageVersion) downloadDirectory: '$(Build.SourcesDirectory)' - task: ExtractFiles@1 condition: eq(variables['platform'], 'mac-arm64') From d2e30ed0195556cc0763ef57f33f489d11143930 Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Wed, 21 Jun 2023 16:33:24 -0700 Subject: [PATCH 3/6] use variable for vsts artifact versioning --- ossdbtoolsservice/workspace/contracts/common.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ossdbtoolsservice/workspace/contracts/common.py b/ossdbtoolsservice/workspace/contracts/common.py index bee745ba2..24694c3a6 100644 --- a/ossdbtoolsservice/workspace/contracts/common.py +++ b/ossdbtoolsservice/workspace/contracts/common.py @@ -98,10 +98,6 @@ def __init__(self): def ignore_extra_attributes(cls): return True - @classmethod - def ignore_extra_attributes(cls): - return True - class Location(Serializable): """ From 42ab1ebe513103deb01cd558e77adc9a3f74a007 Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Wed, 21 Jun 2023 16:50:01 -0700 Subject: [PATCH 4/6] use package name as a variable too --- .pipeline/templates/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipeline/templates/build.yml b/.pipeline/templates/build.yml index 3d58430c8..bcd83597c 100644 --- a/.pipeline/templates/build.yml +++ b/.pipeline/templates/build.yml @@ -15,8 +15,8 @@ steps: inputs: command: download vstsFeed: 'Database Systems/azuredatastudio-pgsqltoolsservice' - vstsFeedPackage: 'pgsqltoolsservice-osx-arm64' - vstsPackageVersion: $(VstsPackageVersion) + vstsFeedPackage: '$(VstsPackageName)' + vstsPackageVersion: '$(VstsPackageVersion)' downloadDirectory: '$(Build.SourcesDirectory)' - task: ExtractFiles@1 condition: eq(variables['platform'], 'mac-arm64') From 6d9b1f485704b262e44446ec0ee2c64e5c1c04df Mon Sep 17 00:00:00 2001 From: Daeun Yim <69321306+DaeunYim@users.noreply.github.com> Date: Wed, 21 Jun 2023 16:54:05 -0700 Subject: [PATCH 5/6] Update common.py --- ossdbtoolsservice/workspace/contracts/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ossdbtoolsservice/workspace/contracts/common.py b/ossdbtoolsservice/workspace/contracts/common.py index 24694c3a6..7103ff6bd 100644 --- a/ossdbtoolsservice/workspace/contracts/common.py +++ b/ossdbtoolsservice/workspace/contracts/common.py @@ -93,7 +93,7 @@ def get_child_serializable_types(cls): def __init__(self): self.text_document: TextDocumentIdentifier = None self.position: Position = None - + @classmethod def ignore_extra_attributes(cls): return True From 94d4520239db7379a0a742354f920ae63df36fd8 Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Thu, 22 Jun 2023 11:38:01 -0700 Subject: [PATCH 6/6] trigger ci