Address review feedback

mattico · mattico · commit 84d11fdb0b7c · 2023-07-12T20:50:01.000-05:00
- Update github actions versions
 - Add .NET 7.0 targets
 - Don't overwrite NoWarn
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -32,7 +32,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: | 
           3.1.x
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -12,12 +12,14 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: | 
+          6.0.x
+          7.0.x
     
     - name: Build
       run: dotnet build Source/OxyPlot.CI.sln --configuration Release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
 - Remove support for .NET Core 3.1, as it is end-of-life soon (#1937)
 - Move example projects to .NET Framework 4.6.2 and .NET 6.0 (#1937)
 - Run tests on both .NET Framework 4.6.2 and .NET 6.0 (#1937)
+- Add support for .NET 7.0 (#1937)
 
 ### Removed
 - Support for .NET Framework 4.0 and 4.5 (#1839)
diff --git a/Source/Examples/ExampleGenerator/ExampleGenerator.csproj b/Source/Examples/ExampleGenerator/ExampleGenerator.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0-windows</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows;net7.0-windows</TargetFrameworks>
         <!--<UseWindowsForms>true</UseWindowsForms>-->
         <OutputType>Exe</OutputType>
         <ApplicationIcon />
diff --git a/Source/Examples/ExampleLibrary/ExampleLibrary.csproj b/Source/Examples/ExampleLibrary/ExampleLibrary.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462;net6.0;net7.0</TargetFrameworks>
     <PackageId>OxyPlot.ExampleLibrary</PackageId>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Description>Example models for OxyPlot.</Description>
diff --git a/Source/Examples/PerformanceTest/PerformanceTest.csproj b/Source/Examples/PerformanceTest/PerformanceTest.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+        <TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
         <OutputType>Exe</OutputType>
         <ApplicationIcon />
         <StartupObject />
diff --git a/Source/Examples/WPF/ExampleBrowser/ExampleBrowser.WPF.csproj b/Source/Examples/WPF/ExampleBrowser/ExampleBrowser.WPF.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+        <TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
         <UseWPF>true</UseWPF>
         <OutputType>WinExe</OutputType>
         <ApplicationManifest>app.manifest</ApplicationManifest>
diff --git a/Source/Examples/WPF/WpfExamples/WpfExamples.csproj b/Source/Examples/WPF/WpfExamples/WpfExamples.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-      <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+      <TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
       <UseWPF>true</UseWPF>
       <UseWindowsForms>true</UseWindowsForms>
       <OutputType>WinExe</OutputType>
diff --git a/Source/Examples/WindowsForms/ExampleBrowser/ExampleBrowser.WindowsForms.csproj b/Source/Examples/WindowsForms/ExampleBrowser/ExampleBrowser.WindowsForms.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <OutputType>WinExe</OutputType>
   </PropertyGroup>
diff --git a/Source/OxyPlot.ImageSharp.Tests/OxyPlot.ImageSharp.Tests.csproj b/Source/OxyPlot.ImageSharp.Tests/OxyPlot.ImageSharp.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net462;net6.0</TargetFrameworks>
+        <TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <Description>OxyPlot ImageSharp unit tests</Description>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/Source/OxyPlot.ImageSharp/OxyPlot.ImageSharp.csproj b/Source/OxyPlot.ImageSharp/OxyPlot.ImageSharp.csproj
@@ -7,7 +7,7 @@
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <GenerateDocumentationFile>True</GenerateDocumentationFile>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NoWarn>NU5104</NoWarn>
+        <NoWarn>$(NoWarn),NU5104</NoWarn>
         <WarningsAsErrors />
     </PropertyGroup>
     <ItemGroup>
diff --git a/Source/OxyPlot.Pdf.Tests/OxyPlot.Pdf.Tests.csproj b/Source/OxyPlot.Pdf.Tests/OxyPlot.Pdf.Tests.csproj
@@ -4,7 +4,7 @@
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <Description>OxyPlot Pdf unit tests</Description>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NoWarn>CS0618,NU1701</NoWarn>
+        <NoWarn>$(NoWarn),CS0618,NU1701</NoWarn>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\Examples\ExampleLibrary\ExampleLibrary.csproj" />
diff --git a/Source/OxyPlot.Pdf/OxyPlot.Pdf.csproj b/Source/OxyPlot.Pdf/OxyPlot.Pdf.csproj
@@ -9,7 +9,7 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>OxyPlot.Pdf.snk</AssemblyOriginatorKeyFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>NU1701</NoWarn>
+    <NoWarn>$(NoWarn),NU1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/Source/OxyPlot.SkiaSharp.Tests/OxyPlot.SkiaSharp.Tests.csproj b/Source/OxyPlot.SkiaSharp.Tests/OxyPlot.SkiaSharp.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net462;net6.0</TargetFrameworks>
+        <TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <Description>OxyPlot SkiaSharp unit tests</Description>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/Source/OxyPlot.SkiaSharp.Wpf/OxyPlot.SkiaSharp.Wpf.csproj b/Source/OxyPlot.SkiaSharp.Wpf/OxyPlot.SkiaSharp.Wpf.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <Description>OxyPlot is a plotting library for .NET. This package targets WPF applications and uses the SkiaSharp renderer.</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
diff --git a/Source/OxyPlot.Tests/OxyPlot.Tests.csproj b/Source/OxyPlot.Tests/OxyPlot.Tests.csproj
@@ -1,10 +1,10 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net462;net6.0</TargetFrameworks>
+        <TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <Description>OxyPlot unit tests</Description>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NoWarn>CS0618</NoWarn>
+        <NoWarn>$(NoWarn),CS0618</NoWarn>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\Examples\ExampleLibrary\ExampleLibrary.csproj" />
diff --git a/Source/OxyPlot.WindowsForms/OxyPlot.WindowsForms.csproj b/Source/OxyPlot.WindowsForms/OxyPlot.WindowsForms.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+        <TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
         <UseWindowsForms>true</UseWindowsForms>
         <Description>OxyPlot is a plotting library for .NET. This package targets Windows Forms applications.</Description>
         <PackageTags>plotting plot charting chart</PackageTags>
diff --git a/Source/OxyPlot.Wpf.Shared/OxyPlot.Wpf.Shared.csproj b/Source/OxyPlot.Wpf.Shared/OxyPlot.Wpf.Shared.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <LangVersion>8</LangVersion>
     <Description>OxyPlot is a plotting library for .NET. This package is the base for WPF PlotView implementations.</Description>
diff --git a/Source/OxyPlot.Wpf.Tests/OxyPlot.Wpf.Tests.csproj b/Source/OxyPlot.Wpf.Tests/OxyPlot.Wpf.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+        <TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
         <UseWPF>true</UseWPF>
         <Description>OxyPlot WPF unit tests</Description>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/Source/OxyPlot.Wpf/OxyPlot.Wpf.csproj b/Source/OxyPlot.Wpf/OxyPlot.Wpf.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <AssemblyOriginatorKeyFile>OxyPlot.Wpf.snk</AssemblyOriginatorKeyFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
diff --git a/Source/OxyPlot/OxyPlot.csproj b/Source/OxyPlot/OxyPlot.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net462;net6.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net462;net6.0;net7.0</TargetFrameworks>
         <PackageId>OxyPlot.Core</PackageId>
         <Description>OxyPlot is a plotting library for .NET. This is the core library including the foundation classes and plot model. To display the plots, you also need to add a platform-specific OxyPlot package that contains a PlotView component.</Description>
         <PackageTags>plotting plot charting chart</PackageTags>
@@ -10,7 +10,7 @@
         <AssemblyOriginatorKeyFile>OxyPlot.snk</AssemblyOriginatorKeyFile>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <LangVersion>8</LangVersion>
-        <NoWarn>CS0618,CS8767</NoWarn>
+        <NoWarn>$(NoWarn),CS0618,CS8767</NoWarn>
     </PropertyGroup>
     <ItemGroup>
         <None Include="OxyPlot.snk" />
