Target to net 7 and 8 in addition to 6 (#419)

* Target to net 7 and 8 in addition to 6 * Allow prerelease * Add Newtonsoft.Json package to rider * Revert Microsoft.VisualStudio.SDK back to version 15 * Remove includePreviewVersions from build * Remove unnecessary reference to Newtonsoft.Json --------- Co-authored-by: Dave Grochocki <[email protected]>
Xavalon · Jan 31, 2025 · 7496c92 · 7496c92
1 parent f1c3185
commit 7496c92
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/build/pipelines/templates/build-console-public.yaml b/build/pipelines/templates/build-console-public.yaml
@@ -19,7 +19,18 @@ jobs:
     inputs:
       packageType: sdk
       version: 6.0.x
-      installationPath: $(Agent.ToolsDirectory)/dotnet
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET 7 SDK'
+    inputs:
+      packageType: sdk
+      version: 7.0.x
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET 8 SDK'
+    inputs:
+      packageType: sdk
+      version: 8.0.x
 
   # The first task is the dotnet command build, pointing to our csproj file
   - task: DotNetCoreCLI@2

diff --git a/build/pipelines/templates/build-extension-public.yaml b/build/pipelines/templates/build-extension-public.yaml
@@ -20,6 +20,25 @@ jobs:
       arguments: $(major).$(Get-Date -Format "yyMM").$(patch)
       pwsh: true
 
+  - task: UseDotNet@2
+    displayName: 'Use .NET 6 SDK'
+    inputs:
+      packageType: sdk
+      version: 6.0.x
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET 7 SDK'
+    inputs:
+      packageType: sdk
+      version: 7.0.x
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET 8 SDK'
+    inputs:
+      packageType: sdk
+      version: 8.0.x
+      includePreviewVersions: true
+
   - task: NuGetToolInstaller@1
     displayName: 'Install NuGet Tools'
 

diff --git a/src/XamlStyler.Console/XamlStyler.Console.csproj b/src/XamlStyler.Console/XamlStyler.Console.csproj
@@ -13,7 +13,7 @@
     <RepositoryUrl>https://github.com/Xavalon/XamlStyler</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <RootNamespace>Xavalon.XamlStyler.Console</RootNamespace>
     <AssemblyName>xstyler</AssemblyName>
     <PackAsTool>true</PackAsTool>

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