Browse Source

Updated to .NET8

frogsoftware 1 year ago
parent
commit
3cb094eb0c

+ 8 - 4
fastreports.wpf/FastReport.Compat/FastReport.Compat.WPF/FastReport.Compat.WPF.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
 
 
   <PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NETCOREWIN</DefineConstants>
     <DefineConstants>$(DefineConstants);NETCOREWIN</DefineConstants>
     <UseWindowsForms>false</UseWindowsForms>
     <UseWindowsForms>false</UseWindowsForms>
     <AssemblyName>FastReport.Compat</AssemblyName>
     <AssemblyName>FastReport.Compat</AssemblyName>
     <PackageId>FastReport.Compat.WPF</PackageId>
     <PackageId>FastReport.Compat.WPF</PackageId>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <TargetFramework>net8.0-windows</TargetFramework>
   </PropertyGroup>
   </PropertyGroup>
 
 
   <PropertyGroup Condition="'$(Configuration)' == 'Demo'">
   <PropertyGroup Condition="'$(Configuration)' == 'Demo'">
@@ -18,9 +18,7 @@
   <Import Project="$(SlnDir)\UsedPackages.version" />
   <Import Project="$(SlnDir)\UsedPackages.version" />
 
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisCSharpVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVisualBasicVersion)" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>
@@ -33,5 +31,11 @@
       <PrivateAssets>compile</PrivateAssets>
       <PrivateAssets>compile</PrivateAssets>
     </ProjectReference>
     </ProjectReference>
   </ItemGroup>
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.9.2" />
+  </ItemGroup>
 
 
 </Project>
 </Project>

+ 9 - 1
fastreports.wpf/FastReport.Compat/shared/Compiler/VBCodeProvider.cs

@@ -22,7 +22,7 @@ namespace FastReport.Code.VisualBasic
 
 
         protected override Compilation CreateCompilation(SyntaxTree codeTree, ICollection<MetadataReference> references)
         protected override Compilation CreateCompilation(SyntaxTree codeTree, ICollection<MetadataReference> references)
         {
         {
-            VisualBasicCompilationOptions options = new VisualBasicCompilationOptions(
+            var options = new Microsoft.CodeAnalysis.VisualBasic.VisualBasicCompilationOptions(
                 OutputKind.DynamicallyLinkedLibrary,
                 OutputKind.DynamicallyLinkedLibrary,
                 true,
                 true,
                 embedVbCoreRuntime: true,
                 embedVbCoreRuntime: true,
@@ -40,5 +40,13 @@ namespace FastReport.Code.VisualBasic
             => VisualBasicSyntaxTree.ParseText(text,
             => VisualBasicSyntaxTree.ParseText(text,
                 cancellationToken: ct);
                 cancellationToken: ct);
     }
     }
+
+    public class VisualBasicCompilationOptions
+    {
+        public VisualBasicCompilationOptions(OutputKind dynamicallyLinkedLibrary, bool b, bool embedVbCoreRuntime, OptimizationLevel optimizationLevel, ReportDiagnostic generalDiagnosticOption)
+        {
+            throw new NotImplementedException();
+        }
+    }
 }
 }
 #endif
 #endif

+ 2 - 2
fastreports.wpf/FastReport.DataVisualization/FastReport.DataVisualization.WPF/FastReport.DataVisualization.WPF.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
 
 
   <PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <UseWindowsForms>false</UseWindowsForms>
     <UseWindowsForms>false</UseWindowsForms>
     <DefineConstants>$(DefineConstants);NETCOREWIN</DefineConstants>
     <DefineConstants>$(DefineConstants);NETCOREWIN</DefineConstants>
     <AssemblyName>FastReport.DataVisualization</AssemblyName>
     <AssemblyName>FastReport.DataVisualization</AssemblyName>
@@ -10,6 +9,7 @@
 
 
     <FastReportFormsWPFProj>..\..\FastReport.Forms.WPF\FastReport.Forms.WPF.csproj</FastReportFormsWPFProj>
     <FastReportFormsWPFProj>..\..\FastReport.Forms.WPF\FastReport.Forms.WPF.csproj</FastReportFormsWPFProj>
     <FastReportCompatWPFProj>..\..\FastReport.Compat\FastReport.Compat.WPF\FastReport.Compat.WPF.csproj</FastReportCompatWPFProj>
     <FastReportCompatWPFProj>..\..\FastReport.Compat\FastReport.Compat.WPF\FastReport.Compat.WPF.csproj</FastReportCompatWPFProj>
+    <TargetFramework>net8.0-windows</TargetFramework>
   </PropertyGroup>
   </PropertyGroup>
 
 
   <PropertyGroup Condition="'$(Configuration)' == 'Demo'">
   <PropertyGroup Condition="'$(Configuration)' == 'Demo'">
@@ -18,7 +18,7 @@
   </PropertyGroup>
   </PropertyGroup>
 
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>

+ 2 - 2
fastreports.wpf/FastReport.Forms.WPF/FastReport.Forms.WPF.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
 
 
   <PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <UseWindowsForms>false</UseWindowsForms>
     <UseWindowsForms>false</UseWindowsForms>
     <UseWpf>true</UseWpf>
     <UseWpf>true</UseWpf>
     <LangVersion>latest</LangVersion>
     <LangVersion>latest</LangVersion>
@@ -11,6 +10,7 @@
     <Configurations>Debug;Release;Demo</Configurations>
     <Configurations>Debug;Release;Demo</Configurations>
     <BuildProjectReferences>false</BuildProjectReferences>
     <BuildProjectReferences>false</BuildProjectReferences>
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <GenerateDependencyFile>false</GenerateDependencyFile>
+    <TargetFramework>net8.0-windows</TargetFramework>
   </PropertyGroup>
   </PropertyGroup>
 
 
   <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
   <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
@@ -30,7 +30,7 @@
   </PropertyGroup>
   </PropertyGroup>
 
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">

+ 6 - 6
fastreports.wpf/FastReport.WPF/FastReport.WPF.csproj

@@ -18,7 +18,7 @@
     <FastReportFormsWPFProj>..\FastReport.Forms.WPF\FastReport.Forms.WPF.csproj</FastReportFormsWPFProj>
     <FastReportFormsWPFProj>..\FastReport.Forms.WPF\FastReport.Forms.WPF.csproj</FastReportFormsWPFProj>
     <FastReportCompatWPFProj>..\FastReport.Compat\FastReport.Compat.WPF\FastReport.Compat.WPF.csproj</FastReportCompatWPFProj>
     <FastReportCompatWPFProj>..\FastReport.Compat\FastReport.Compat.WPF\FastReport.Compat.WPF.csproj</FastReportCompatWPFProj>
     <FastReportDataVisWPFProj>..\FastReport.DataVisualization\FastReport.DataVisualization.WPF\FastReport.DataVisualization.WPF.csproj</FastReportDataVisWPFProj>
     <FastReportDataVisWPFProj>..\FastReport.DataVisualization\FastReport.DataVisualization.WPF\FastReport.DataVisualization.WPF.csproj</FastReportDataVisWPFProj>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
   </PropertyGroup>
   </PropertyGroup>
 
 
   <PropertyGroup>
   <PropertyGroup>
@@ -143,10 +143,10 @@
   <Import Project="..\UsedPackages.version" />
   <Import Project="..\UsedPackages.version" />
 
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-    <PackageReference Include="System.Data.Odbc" Version="6.0.0" />
-    <PackageReference Include="System.Data.OleDb" Version="6.0.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
+    <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+    <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
@@ -156,7 +156,7 @@
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AvalonEdit" Version="[6.1.3.50,)"> <!-- this is the version also used in RoslynPad -->
+    <PackageReference Include="AvalonEdit" Version="6.3.0.90"> <!-- this is the version also used in RoslynPad -->
       <PrivateAssets>all</PrivateAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     </PackageReference>
   </ItemGroup>
   </ItemGroup>