Merge pull request #306 from mikerogers123/dotnet6

Use global.json file
justeat · Jul 20, 2023 · a90757c · a90757c
2 parents b9b8f69 + c092850
commit a90757c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,8 +30,6 @@ jobs:
 
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '3.1.x'
 
     - name: Setup NuGet cache
       uses: actions/cache@v3
@@ -67,8 +65,6 @@ jobs:
 
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '3.1.x'
 
     - name: Run Integration tests
       shell: pwsh
@@ -89,8 +85,6 @@ jobs:
 
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '3.1.x'
 
     - name: Push NuGet packages to NuGet.org
       run: dotnet nuget push "*.nupkg" --api-key ${{ secrets.NUGET_TOKEN }} --skip-duplicate --source https://api.nuget.org/v3/index.json
diff --git a/ZendeskApiClient.sln b/ZendeskApiClient.sln
@@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		build.cake = build.cake
 		build.ps1 = build.ps1
 		build.sh = build.sh
+		global.json = global.json
 		icon.png = icon.png
 		License.md = License.md
 		NuGet.config = NuGet.config

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "6.0.412"
+    }
+}