enable net48 and net6.0-windows builds of the designer project

majorsilence · Apr 7, 2024 · 2615a45 · 2615a45
1 parent e9e6e6a
commit 2615a45
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -40,5 +40,6 @@
     <PackageVersion Include="System.Data.OleDb" Version="6.0.0" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageVersion Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.0" />
   </ItemGroup>
 </Project>
diff --git a/RdlDesign/CodeCtl.cs b/RdlDesign/CodeCtl.cs
@@ -285,7 +285,7 @@ private void CheckAssembly()
                 }
             }
             else
-                MessageBox.Show(Strings.CodeCtl_Show_NoErrors, Strings.CodeCtl_Show_CodeVerification);
+                MessageBox.Show(Resources.Strings.CodeCtl_Show_NoErrors, Resources.Strings.CodeCtl_Show_CodeVerification);
 
             return ;
         }

diff --git a/RdlDesign/DialogDatabase.cs b/RdlDesign/DialogDatabase.cs
@@ -1533,7 +1533,11 @@ private void buttonSearchSqlServers_Click(object sender, EventArgs e)
         {
             try
             {
+#if NET6_0_OR_GREATER
+                Microsoft.Data.Sql.SqlDataSourceEnumerator instance = Microsoft.Data.Sql.SqlDataSourceEnumerator.Instance;
+#else
                 System.Data.Sql.SqlDataSourceEnumerator instance = System.Data.Sql.SqlDataSourceEnumerator.Instance;
+#endif
                 DataTable dt;
                 dt = instance.GetDataSources();
 

diff --git a/RdlDesign/ReportDesigner.csproj b/RdlDesign/ReportDesigner.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
     <ProjectType>Local</ProjectType>
     <ApplicationIcon>App.ico</ApplicationIcon>
     <AssemblyKeyContainerName></AssemblyKeyContainerName>
@@ -225,12 +225,15 @@
     <PackageReference Include="dotConnect.Express.for.PostgreSQL" />
     <PackageReference Include="jacobslusser.ScintillaNET" />
     <PackageReference Include="Microsoft.Data.Edm" />
-    <PackageReference Include="Microsoft.Data.OData" />
-    <PackageReference Include="Microsoft.Data.Services.Client" />
-    <PackageReference Include="Microsoft.WindowsAzure.ConfigurationManager" />
+    <PackageReference Include="Microsoft.Data.OData" />   
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="System.Spatial" />
-    <PackageReference Include="WindowsAzure.Storage" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net48' ">
+	<PackageReference Include="Microsoft.Data.Services.Client" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'netstandard2.0' ">
+	<PackageReference Include="Microsoft.Data.SqlClient" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="ChartCtl - Copy.cs" />

diff --git a/RdlViewer.Tests/RdlViewer.Tests.csproj b/RdlViewer.Tests/RdlViewer.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>

diff --git a/ReportTests/ReportTests.csproj b/ReportTests/ReportTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
-Original file line number
+Diff line change
@@ Expand Up / @@ -285,7 +285,7 @@ private void CheckAssembly() @@
                     }
                 }
                 else
-                    MessageBox.Show(Strings.CodeCtl_Show_NoErrors, Strings.CodeCtl_Show_CodeVerification);
+                    MessageBox.Show(Resources.Strings.CodeCtl_Show_NoErrors, Resources.Strings.CodeCtl_Show_CodeVerification);
                 return ;
             }
@@ Expand Down @@