Target to net 7 and 8 in addition to 6

Xavalon · Feb 24, 2023 · 307c020 · 307c020
1 parent 030f3ec
commit 307c020
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 33 deletions.
diff --git a/build/pipelines/templates/build-console-public.yaml b/build/pipelines/templates/build-console-public.yaml
@@ -19,7 +19,19 @@ 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
+      includePreviewVersions: true
 
   # 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,13 +13,14 @@
     <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>
     <ToolCommandName>xstyler</ToolCommandName>
     <PackageOutputPath>./nupkg</PackageOutputPath>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\bin\Debug\Console\</OutputPath>
@@ -29,17 +30,13 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser">
-      <Version>2.8.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <Version>2.9.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.3</Version>
+      <Version>13.0.2</Version>
     </PackageReference>
     <PackageReference Include="NuGet.CommandLine">
-      <Version>6.0.2</Version>
+      <Version>6.4.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/XamlStyler.Extension.Windows.VS2019/XamlStyler.Extension.Windows.VS2019.csproj b/src/XamlStyler.Extension.Windows.VS2019/XamlStyler.Extension.Windows.VS2019.csproj
@@ -87,18 +87,18 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CompareNETObjects">
-      <Version>4.77.0</Version>
+      <Version>4.79.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
+      <Version>7.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK">
-      <Version>15.0.1</Version>
+      <Version>17.4.33103.184</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
-      <Version>17.2.2186</Version>
+      <Version>17.5.4065</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/XamlStyler.Extension.Windows.VS2022/XamlStyler.Extension.Windows.VS2022.csproj b/src/XamlStyler.Extension.Windows.VS2022/XamlStyler.Extension.Windows.VS2022.csproj
@@ -87,18 +87,18 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CompareNETObjects">
-      <Version>4.77.0</Version>
+      <Version>4.79.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
+      <Version>7.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK">
-      <Version>17.0.31902.203</Version>
+      <Version>17.4.33103.184</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
-      <Version>17.2.2186</Version>
+      <Version>17.5.4065</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/XamlStyler.UnitTests/XamlStyler.UnitTest.csproj b/src/XamlStyler.UnitTests/XamlStyler.UnitTest.csproj
@@ -6,6 +6,7 @@
     <Copyright>Copyright © Xavalon 2020</Copyright>
     <Company>Xavalon</Company>
     <Configurations>Debug;Release;Debug VS2019;Release VS2019</Configurations>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -24,22 +25,18 @@
     <OutputPath>..\bin\Release\UnitTest</OutputPath>
   </PropertyGroup>
 <ItemGroup>
-    <PackageReference Include="CompareNETObjects" Version="4.77.0">
+    <PackageReference Include="CompareNETObjects" Version="4.79.0">
     </PackageReference>
-    <PackageReference Include="Irony" Version="1.1.0">
+    <PackageReference Include="Irony" Version="1.2.0">
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
     </PackageReference>
     <PackageReference Include="NUnit" Version="3.13.3">
     </PackageReference>
-    <PackageReference Include="NUnit.ConsoleRunner" Version="3.15.0">
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.16.3">
     </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
     </PackageReference>
   </ItemGroup>
 <ItemGroup>

diff --git a/src/XamlStyler/XamlStyler.csproj b/src/XamlStyler/XamlStyler.csproj
@@ -6,6 +6,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <Copyright>Copyright © Xavalon 2020</Copyright>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -24,13 +25,9 @@
     <EmbeddedResource Include="Options\DefaultSettings.json" />
   </ItemGroup>
 <ItemGroup>
-    <PackageReference Include="Irony" Version="1.1.0">
+    <PackageReference Include="Irony" Version="1.2.0">
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1">
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
     </PackageReference>
   </ItemGroup>
 <ItemGroup>