RavenDB-23015 use global.json

Lwiel · Oct 15, 2024 · 1c3e3bb · 1c3e3bb
1 parent 5005905
commit 1c3e3bb
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 30 deletions.
diff --git a/.github/workflows/FastTests.yml b/.github/workflows/FastTests.yml
@@ -9,10 +9,6 @@ on:
     branches:
         - v5.4
 
-env:
-  DOTNET_VERSION: 8.0.403
-
-
 jobs:
   release:
     runs-on: ${{ matrix.os }}
@@ -26,7 +22,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: ${{ env.DOTNET_VERSION }}
+        global-json-file: global.json
 
     - name: Install dependencies
       run: dotnet restore
@@ -50,7 +46,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: ${{ env.DOTNET_VERSION }}
+        global-json-file: global.json
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.github/workflows/FastTestsARM.yml b/.github/workflows/FastTestsARM.yml
@@ -7,7 +7,6 @@ on:
     - cron: '30 6 * * *'
 
 env:
-  DOTNET_VERSION: 8.0.403
   DOTNET_INSTALL_DIR: "./.dotnet"
 
 jobs:
@@ -23,7 +22,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: ${{ env.DOTNET_VERSION }}
+        global-json-file: global.json
 
     - name: Install dependencies
       run: dotnet restore
@@ -47,7 +46,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: ${{ env.DOTNET_VERSION }}
+        global-json-file: global.json
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.github/workflows/StudioTests.yml b/.github/workflows/StudioTests.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0'
+        global-json-file: global.json
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0'
+        global-json-file: global.json
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -10,19 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Grep .Net version
-        run: |
-          dotnet_version=$(grep '<TargetFramework>' < src/Raven.Server/Raven.Server.csproj | tr -cd [:digit:].)
-          echo "DOTNET_VERSION=${dotnet_version}.x" >> $GITHUB_ENV
-      - name: Install 3.1 sdk
-        if: startsWith( env.DOTNET_VERSION, '3' )
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 3.1.x
-      - name: Setup .NET 8
+      - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          global-json-file: global.json
       - name: Restore
         run: |
           git clean -xfd

diff --git a/.github/workflows/studioConventions.yml b/.github/workflows/studioConventions.yml
@@ -15,16 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-
-    - name: Grep .Net version
-      run: |
-        dotnet_version=$(grep '<TargetFramework>' < src/Raven.Server/Raven.Server.csproj | tr -cd [:digit:].)
-        echo "DOTNET_VERSION=${dotnet_version}" >> $GITHUB_ENV
-
-    - name: Setup .NET Core
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '${{ env.DOTNET_VERSION }}'
+        global-json-file: global.json
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/RavenDB.sln b/RavenDB.sln
@@ -8,6 +8,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7C0225BB-6184-4859-8ED1-2251A492A449}"
 	ProjectSection(SolutionItems) = preProject
 		src\CommonAssemblyInfo.cs = src\CommonAssemblyInfo.cs
+		global.json = global.json
 		RavenDB.ruleset = RavenDB.ruleset
 	EndProjectSection
 EndProject

diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "rollForward": "latestFeature",
+    "version": "8.0.403"
+  }
+}