Merge pull request #124 from liprec/develop

🚀 v1.5.11
liprec · May 15, 2023 · ad345c9 · ad345c9
2 parents 35026e5 + a46c279
commit ad345c9
Show file tree

Hide file tree

Showing 22 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
     name: Build, test and pack tasks
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: install tfx-cli
         run: |
           npm install tfx-cli
@@ -24,10 +24,10 @@ jobs:
         if: ${{ endsWith(github.ref, 'main') }}
         id: extract_version
         run: |
-          node -e "const v = require('.\\vss-extension.json').version;console.log('::set-output name=version::' + v);"
+          node -e "const v = require('.\\vss-extension.json').version;console.log('version=' + v);" >> $env:GITHUB_OUTPUT
       - name: store extension - production version
         if: ${{ endsWith(github.ref, 'main') }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: liprec.vsts-release-aas-${{ steps.extract_version.outputs.version }}
           path: |
@@ -41,10 +41,10 @@ jobs:
         if: ${{ endsWith(github.ref, 'develop') }}
         id: extract_version_preview
         run: |
-          node -e "const v = require('.\\vss-extension-preview.json').version;console.log('::set-output name=version::' + v);"
+          node -e "const v = require('.\\vss-extension-preview.json').version;console.log('version=' + v);" >> $env:GITHUB_OUTPUT
       - name: store extension - preview version
         if: ${{ endsWith(github.ref, 'develop') }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: liprec.vsts-release-aas-preview-${{ steps.extract_version_preview.outputs.version }}
           path: |

diff --git a/deploy-aas-db/v1/VstsAzureRestHelperExtra_.psm1 b/deploy-aas-db/v1/VstsAzureRestHelperExtra_.psm1
@@ -32,7 +32,7 @@ function Get-AzureRmAnalysisServicesResourceId {
 
     Write-Verbose "Get Resource Groups"
     $method = "GET"
-    $uri = "$($endpoint.Url)/subscriptions/$subscriptionId/resources?api-version=$apiVersion"
+    $uri = "$($endpoint.Url)/subscriptions/$subscriptionId/resources?api-version=$apiVersion&$filter=resourceType eq '$serverType'"
     $headers = @{Authorization = ("{0} {1}" -f $accessToken.token_type, $accessToken.access_token) }
 
     do {

diff --git a/deploy-aas-db/v1/assemblies/Microsoft.AnalysisServices.AdomdClient.dll b/deploy-aas-db/v1/assemblies/Microsoft.AnalysisServices.AdomdClient.dll
diff --git a/deploy-aas-db/v1/assemblies/Microsoft.AnalysisServices.Core.dll b/deploy-aas-db/v1/assemblies/Microsoft.AnalysisServices.Core.dll
diff --git a/deploy-aas-db/v1/assemblies/Microsoft.AnalysisServices.SPClient.Interfaces.dll b/deploy-aas-db/v1/assemblies/Microsoft.AnalysisServices.SPClient.Interfaces.dll
diff --git a/deploy-aas-db/v1/assemblies/Microsoft.AnalysisServices.Tabular.Json.dll b/deploy-aas-db/v1/assemblies/Microsoft.AnalysisServices.Tabular.Json.dll
diff --git a/deploy-aas-db/v1/assemblies/Microsoft.AnalysisServices.Tabular.dll b/deploy-aas-db/v1/assemblies/Microsoft.AnalysisServices.Tabular.dll
diff --git a/deploy-aas-db/v1/assemblies/Microsoft.AnalysisServices.dll b/deploy-aas-db/v1/assemblies/Microsoft.AnalysisServices.dll
diff --git a/deploy-aas-db/v1/assemblies/Microsoft.Identity.Client.dll b/deploy-aas-db/v1/assemblies/Microsoft.Identity.Client.dll
diff --git a/deploy-aas-db/v1/deploy-aas-db.ps1 b/deploy-aas-db/v1/deploy-aas-db.ps1
@@ -129,6 +129,7 @@ switch ($loginType) {
     }
     "inherit" {
         Write-Verbose "Using endpoint credentials"
+
         if ($isPBI) {
             $identifier = ("app:{0}@{1}" -f $endpoint.Auth.parameters.applicationId, $endpoint.Auth.parameters.tenantId)
             $secret = ConvertTo-SecureString -String ($endpoint.Auth.parameters.clientSecret) -AsPlainText -Force

diff --git a/deploy-aas-db/v1/task.json b/deploy-aas-db/v1/task.json
@@ -20,7 +20,7 @@
     "version": {
         "Major": "1",
         "Minor": "5",
-        "Patch": "10"
+        "Patch": "11"
     },
     "minimumAgentVersion": "2.115.0",
     "groups": [

diff --git a/execute-aas-tmsl/v1/VstsAzureRestHelperExtra_.psm1 b/execute-aas-tmsl/v1/VstsAzureRestHelperExtra_.psm1
@@ -32,7 +32,7 @@ function Get-AzureRmAnalysisServicesResourceId {
 
     Write-Verbose "Get Resource Groups"
     $method = "GET"
-    $uri = "$($endpoint.Url)/subscriptions/$subscriptionId/resources?api-version=$apiVersion"
+    $uri = "$($endpoint.Url)/subscriptions/$subscriptionId/resources?api-version=$apiVersion&$filter=resourceType eq '$serverType'"
     $headers = @{Authorization = ("{0} {1}" -f $accessToken.token_type, $accessToken.access_token) }
 
     do {

diff --git a/execute-aas-tmsl/v1/assemblies/Microsoft.AnalysisServices.AdomdClient.dll b/execute-aas-tmsl/v1/assemblies/Microsoft.AnalysisServices.AdomdClient.dll
diff --git a/execute-aas-tmsl/v1/assemblies/Microsoft.AnalysisServices.Core.dll b/execute-aas-tmsl/v1/assemblies/Microsoft.AnalysisServices.Core.dll
diff --git a/execute-aas-tmsl/v1/assemblies/Microsoft.AnalysisServices.SPClient.Interfaces.dll b/execute-aas-tmsl/v1/assemblies/Microsoft.AnalysisServices.SPClient.Interfaces.dll
diff --git a/execute-aas-tmsl/v1/assemblies/Microsoft.AnalysisServices.Tabular.Json.dll b/execute-aas-tmsl/v1/assemblies/Microsoft.AnalysisServices.Tabular.Json.dll
diff --git a/execute-aas-tmsl/v1/assemblies/Microsoft.AnalysisServices.Tabular.dll b/execute-aas-tmsl/v1/assemblies/Microsoft.AnalysisServices.Tabular.dll
diff --git a/execute-aas-tmsl/v1/assemblies/Microsoft.AnalysisServices.dll b/execute-aas-tmsl/v1/assemblies/Microsoft.AnalysisServices.dll
diff --git a/execute-aas-tmsl/v1/assemblies/Microsoft.Identity.Client.dll b/execute-aas-tmsl/v1/assemblies/Microsoft.Identity.Client.dll
diff --git a/execute-aas-tmsl/v1/task.json b/execute-aas-tmsl/v1/task.json
@@ -16,7 +16,7 @@
     "version": {
         "Major": "1",
         "Minor": "5",
-        "Patch": "10"
+        "Patch": "11"
     },
     "minimumAgentVersion": "2.115.0",
     "groups": [

diff --git a/vss-extension-preview.json b/vss-extension-preview.json
@@ -1,7 +1,7 @@
 {
     "manifestVersion": 1,
     "id": "vsts-release-aas-preview",
-    "version": "1.5.10",
+    "version": "1.5.11",
     "name": "Analysis Service (Preview)",
     "publisher": "liprec",
     "public": false,

diff --git a/vss-extension.json b/vss-extension.json
@@ -1,7 +1,7 @@
 {
     "manifestVersion": 1,
     "id": "vsts-release-aas",
-    "version": "1.5.10",
+    "version": "1.5.11",
     "name": "Azure Analysis Service",
     "publisher": "liprec",
     "public": true,