Removed .NET 6 and .NET 7 support

lkosson · Nov 16, 2024 · 115f9b0 · 115f9b0
1 parent 28d4395
commit 115f9b0
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 83 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Upcoming version
+ * Removed .NET 6 and .NET 7 support
+
 # 15.1.24
  * Added .NET 9 version
  * Updated System.IO.Packaging and System.ServiceModel.Http references

diff --git a/Microsoft.ReportViewer.Common/Microsoft.ReportViewer.Common.csproj b/Microsoft.ReportViewer.Common/Microsoft.ReportViewer.Common.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.ReportViewer.Common</AssemblyName>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@@ -122,16 +122,6 @@
       <LogicalName>Microsoft.ReportingServices.ReportProcessing.ReportPublishing.SharedDataSetDefinition.xsd</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.0.0" />
-    <PackageReference Include="System.CodeDom" Version="6.0.0" />
-    <PackageReference Include="System.IO.Packaging" Version="6.0.2" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.4.0" />
-    <PackageReference Include="System.CodeDom" Version="7.0.0" />
-    <PackageReference Include="System.IO.Packaging" Version="7.0.0" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0" />
     <PackageReference Include="System.CodeDom" Version="8.0.0" />

diff --git a/Microsoft.ReportViewer.DataVisualization/Microsoft.ReportViewer.DataVisualization.csproj b/Microsoft.ReportViewer.DataVisualization/Microsoft.ReportViewer.DataVisualization.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.ReportViewer.DataVisualization</AssemblyName>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace></RootNamespace>
   </PropertyGroup>
   <PropertyGroup>
@@ -18,7 +18,7 @@
     <EmbeddedResource Include="**\*.xaml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-    <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
+    <PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
   </ItemGroup>
 </Project>
diff --git a/Microsoft.ReportViewer.NETCore/Microsoft.ReportViewer.NETCore.csproj b/Microsoft.ReportViewer.NETCore/Microsoft.ReportViewer.NETCore.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <AssemblyName>Microsoft.ReportViewer.NETCore</AssemblyName>
     <RootNamespace>Microsoft.ReportViewer.NETCore</RootNamespace>
     <PackageId>ReportViewerCore.NETCore</PackageId>
     <Version>15.1.24</Version>
     <Authors>Microsoft, lkosson</Authors>
     <Company>Microsoft</Company>
     <Product>ReportViewer Core</Product>
-    <Description>SQL Server Reporting Services engine decompiled and recompiled for .NET 6. Based on ReportViewer 15.0.1404.0</Description>
+    <Description>SQL Server Reporting Services engine decompiled and recompiled for .NET 8. Based on ReportViewer 15.0.1404.0</Description>
     <PackageProjectUrl>https://github.com/lkosson/reportviewercore</PackageProjectUrl>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <SignAssembly>True</SignAssembly>
@@ -21,14 +21,6 @@
     <EmbeddedResource Include="Resources\Microsoft.Reporting.NETCore.ReportPreviewStrings.resx" LogicalName="Microsoft.Reporting.NETCore.ReportPreviewStrings.resources" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="6.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="6.0.0" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
     <PackageReference Include="System.ServiceModel.Http" Version="8.1.0" />

diff --git a/Microsoft.ReportViewer.NETCore/ReportViewerCore.NETCore.nuspec b/Microsoft.ReportViewer.NETCore/ReportViewerCore.NETCore.nuspec
@@ -8,27 +8,11 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/lkosson/reportviewercore</projectUrl>
-    <description>SQL Server Reporting Services engine decompiled and recompiled for .NET 6. Based on ReportViewer 15.0.1404.0</description>
+    <description>SQL Server Reporting Services engine decompiled and recompiled for .NET 8. Based on ReportViewer 15.0.1404.0</description>
     <tags>ReportViewer Report Viewer Reporting Services ReportingServices SSRS RDLC RDL Reporting PDF Microsoft .Net Core NetCore AspNetCore</tags>
     <icon>images\icon.png</icon>
     <readme>docs\README.md</readme>
     <dependencies>
-      <group targetFramework="net6.0">
-        <dependency id="Microsoft.CodeAnalysis.VisualBasic" version="4.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.CodeDom" version="6.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.IO.Packaging" version="6.0.2" exclude="Build,Analyzers" />
-        <dependency id="System.Drawing.Common" version="6.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.Resources.Extensions" version="6.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.ServiceModel.Http" version="6.0.0" exclude="Build,Analyzers" />
-      </group>
-      <group targetFramework="net7.0">
-        <dependency id="Microsoft.CodeAnalysis.VisualBasic" version="4.4.0" exclude="Build,Analyzers" />
-        <dependency id="System.CodeDom" version="7.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.IO.Packaging" version="7.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.Drawing.Common" version="7.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.Resources.Extensions" version="6.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.ServiceModel.Http" version="6.0.0" exclude="Build,Analyzers" />
-      </group>
       <group targetFramework="net8.0">
         <dependency id="Microsoft.CodeAnalysis.VisualBasic" version="4.8.0" exclude="Build,Analyzers" />
         <dependency id="System.CodeDom" version="8.0.0" exclude="Build,Analyzers" />
@@ -48,14 +32,6 @@
     </dependencies>
   </metadata>
   <files>
-     <file src="bin\Release\net6.0\Microsoft.ReportViewer.NETCore.dll" target="lib\net6.0"></file>
-     <file src="bin\Release\net6.0\Microsoft.ReportViewer.Common.dll" target="lib\net6.0"></file>
-     <file src="bin\Release\net6.0\Microsoft.ReportViewer.DataVisualization.dll" target="lib\net6.0"></file>
-     <file src="bin\Release\net6.0\Microsoft.ReportViewer.ProcessingObjectModel.dll" target="lib\net6.0"></file>
-     <file src="bin\Release\net7.0\Microsoft.ReportViewer.NETCore.dll" target="lib\net7.0"></file>
-     <file src="bin\Release\net7.0\Microsoft.ReportViewer.Common.dll" target="lib\net7.0"></file>
-     <file src="bin\Release\net7.0\Microsoft.ReportViewer.DataVisualization.dll" target="lib\net7.0"></file>
-     <file src="bin\Release\net7.0\Microsoft.ReportViewer.ProcessingObjectModel.dll" target="lib\net7.0"></file>
      <file src="bin\Release\net8.0\Microsoft.ReportViewer.NETCore.dll" target="lib\net8.0"></file>
      <file src="bin\Release\net8.0\Microsoft.ReportViewer.Common.dll" target="lib\net8.0"></file>
      <file src="bin\Release\net8.0\Microsoft.ReportViewer.DataVisualization.dll" target="lib\net8.0"></file>

diff --git a/...ft.ReportViewer.ProcessingObjectModel/Microsoft.ReportViewer.ProcessingObjectModel.csproj b/...ft.ReportViewer.ProcessingObjectModel/Microsoft.ReportViewer.ProcessingObjectModel.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.ReportViewer.ProcessingObjectModel</AssemblyName>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <LangVersion>8.0</LangVersion>

diff --git a/Microsoft.ReportViewer.WinForms/Microsoft.ReportViewer.WinForms.csproj b/Microsoft.ReportViewer.WinForms/Microsoft.ReportViewer.WinForms.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.ReportViewer.WinForms</AssemblyName>
     <UseWindowsForms>True</UseWindowsForms>
-    <TargetFrameworks>net6.0-windows7;net7.0-windows7;net8.0-windows7;net9.0-windows7</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows7;net9.0-windows7</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <LangVersion>8.0</LangVersion>
@@ -14,7 +14,7 @@
     <Version>15.1.24</Version>
     <Company>Microsoft</Company>
     <Product>ReportViewer Core</Product>
-    <Description>SQL Server Reporting Services WinForms ReportViewer decompiled and recompiled for .NET 6. Based on ReportViewer 15.0.1404.0</Description>
+    <Description>SQL Server Reporting Services WinForms ReportViewer decompiled and recompiled for .NET 8. Based on ReportViewer 15.0.1404.0</Description>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\ReportViewerCore.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
@@ -62,12 +62,6 @@
       <LogicalName>Microsoft.Reporting.WinForms.Resources.SplitterVertExpandHover.png</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows7'">
-    <PackageReference Include="System.ServiceModel.Http" Version="6.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows7'">
-    <PackageReference Include="System.ServiceModel.Http" Version="6.0.0" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows7'">
     <PackageReference Include="System.ServiceModel.Http" Version="8.1.0" />
   </ItemGroup>

diff --git a/Microsoft.ReportViewer.WinForms/ReportViewerCore.WinForms.nuspec b/Microsoft.ReportViewer.WinForms/ReportViewerCore.WinForms.nuspec
@@ -8,27 +8,11 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/lkosson/reportviewercore</projectUrl>
-    <description>SQL Server Reporting Services ReportViewer WinForms control decompiled and recompiled for .NET 6. Based on ReportViewer 15.0.1404.0</description>
+    <description>SQL Server Reporting Services ReportViewer WinForms control decompiled and recompiled for .NET 8. Based on ReportViewer 15.0.1404.0</description>
     <tags>ReportViewer Report Viewer Reporting Services ReportingServices SSRS RDLC RDL Reporting PDF Microsoft .Net Core NetCore AspNetCore WinForms Windows Forms Desktop</tags>
     <icon>images\icon.png</icon>
     <readme>docs\README.md</readme>
     <dependencies>
-      <group targetFramework="net6.0-windows7">
-        <dependency id="Microsoft.CodeAnalysis.VisualBasic" version="4.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.CodeDom" version="6.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.IO.Packaging" version="6.0.2" exclude="Build,Analyzers" />
-        <dependency id="System.Drawing.Common" version="6.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.Resources.Extensions" version="6.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.ServiceModel.Http" version="6.0.0" exclude="Build,Analyzers" />
-      </group>
-      <group targetFramework="net7.0-windows7">
-        <dependency id="Microsoft.CodeAnalysis.VisualBasic" version="4.4.0" exclude="Build,Analyzers" />
-        <dependency id="System.CodeDom" version="7.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.IO.Packaging" version="7.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.Drawing.Common" version="7.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.Resources.Extensions" version="6.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.ServiceModel.Http" version="6.0.0" exclude="Build,Analyzers" />
-      </group>
       <group targetFramework="net8.0-windows7">
         <dependency id="Microsoft.CodeAnalysis.VisualBasic" version="4.8.0" exclude="Build,Analyzers" />
         <dependency id="System.CodeDom" version="8.0.0" exclude="Build,Analyzers" />
@@ -48,14 +32,6 @@
     </dependencies>
   </metadata>
   <files>
-     <file src="bin\Release\net6.0-windows7\Microsoft.ReportViewer.WinForms.dll" target="lib\net6.0-windows7"></file>
-     <file src="bin\Release\net6.0-windows7\Microsoft.ReportViewer.Common.dll" target="lib\net6.0-windows7"></file>
-     <file src="bin\Release\net6.0-windows7\Microsoft.ReportViewer.DataVisualization.dll" target="lib\net6.0-windows7"></file>
-     <file src="bin\Release\net6.0-windows7\Microsoft.ReportViewer.ProcessingObjectModel.dll" target="lib\net6.0-windows7"></file>
-     <file src="bin\Release\net7.0-windows7\Microsoft.ReportViewer.WinForms.dll" target="lib\net7.0-windows7"></file>
-     <file src="bin\Release\net7.0-windows7\Microsoft.ReportViewer.Common.dll" target="lib\net7.0-windows7"></file>
-     <file src="bin\Release\net7.0-windows7\Microsoft.ReportViewer.DataVisualization.dll" target="lib\net7.0-windows7"></file>
-     <file src="bin\Release\net7.0-windows7\Microsoft.ReportViewer.ProcessingObjectModel.dll" target="lib\net7.0-windows7"></file>
      <file src="bin\Release\net8.0-windows7\Microsoft.ReportViewer.WinForms.dll" target="lib\net8.0-windows7"></file>
      <file src="bin\Release\net8.0-windows7\Microsoft.ReportViewer.Common.dll" target="lib\net8.0-windows7"></file>
      <file src="bin\Release\net8.0-windows7\Microsoft.ReportViewer.DataVisualization.dll" target="lib\net8.0-windows7"></file>