Update ci.yml

sql-bi · Nov 16, 2024 · 77e9f0a · 77e9f0a
1 parent cb3166b
commit 77e9f0a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -40,10 +40,15 @@ steps:
   inputs:
     secureFile: 'DaxFormatter.snk'
 - task: UseDotNet@2
-  displayName: '.NET setup'
+  displayName: 'Install .NET SDK'
   inputs:
     packageType: sdk
-    version: 6.0.x
+    useGlobalJson: true
+- task: UseDotNet@2
+  displayName: 'Install .NET 6.0 runtime'
+  inputs:
+    packageType: runtime
+    version: '6.0.x'
 - task: DotNetCoreCLI@2
   displayName: '.NET restore'
   inputs:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,5 @@
-name: CI
+name: ci
+
 on:
   push:
     branches:
@@ -7,8 +8,7 @@ on:
     branches:
       - master
   workflow_dispatch:
-env:
-  CONFIGURATION: 'Release'
+
 jobs:
   build-and-test:
     name: build-and-test--${{ matrix.os-version }}
@@ -17,18 +17,17 @@ jobs:
       matrix:
         os-version: [windows-latest] #, ubuntu-latest, macos-latest]
     steps:
-      - uses: actions/checkout@v2
-      - name: .NET setup
-        uses: actions/setup-dotnet@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
-      - name: .NET info
-        run: dotnet --info
-      - name: .NET restore
+          dotnet-version: |
+            6.0.x
+          global-json-file: global.json
+      - name: restore
         run: dotnet restore ./src
-      - name: .NET build
-        run: dotnet build ./src/Dax.Formatter.sln --configuration ${{ env.CONFIGURATION }} --no-restore
-      - name: .NET test
-        run: dotnet test ./src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj --configuration ${{ env.CONFIGURATION }} --no-build --verbosity normal
-      - name: .NET pack
-        run: dotnet pack ./src/Dax.Formatter/Dax.Formatter.csproj --configuration ${{ env.CONFIGURATION }} --no-build --no-restore --verbosity normal
+      - name: build
+        run: dotnet build ./src/Dax.Formatter.sln --configuration Release --no-restore
+      - name: test
+        run: dotnet test ./src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj --configuration Release --no-build --verbosity normal
+      - name: pack
+        run: dotnet pack ./src/Dax.Formatter/Dax.Formatter.csproj --configuration Release --no-build --no-restore --verbosity normal