feature(REPORT-333381): Bold-Reports 5.3 Release Changes

Controllers/demos/ReportDesignerWebApiController.cs

@@ -13,7 +13,6 @@
 using Newtonsoft.Json;
 using BoldReports.Base.Logger;
 using System.Data;
-using ReportServices.Models;
 
 namespace ReportServices.Controllers.demos
 {
@@ -135,13 +134,6 @@ public void OnInitReportOptions(ReportViewerOptions reportOption)
             reportOption.ReportModel.ReportingServer = this.Server;
             reportOption.ReportModel.ReportServerUrl = this.ServerURL;
             reportOption.ReportModel.ReportServerCredential = new NetworkCredential("Sample", "Passwprd");
-            if (reportName == "load-large-data.rdlc")
-            {
-                SqlQuery.getJson();
-                reportOption.ReportModel.ProcessingMode = ProcessingMode.Remote;
-                reportOption.ReportModel.DataSources.Add(new ReportDataSource("SalesOrderDetail", HttpContext.Current.Cache.Get("SalesOrderDetail") as DataTable));
-            }
-
         }
 
         public void OnReportLoaded(ReportViewerOptions reportOption)

Controllers/demos/ReportViewerWebApiController.cs

@@ -17,6 +17,17 @@ namespace ReportServices.Controllers.demos
     [RoutePrefix("")]
     public class ReportViewerWebApiController : ApiController, IReportController, IReportLogger
     {
+        internal ExternalServer Server { get; set; }
+        internal string ServerURL { get; set; }
+
+        public ReportViewerWebApiController()
+        {
+            ExternalServer externalServer = new ExternalServer();
+            this.Server = externalServer;
+            this.ServerURL = "Sample";
+            externalServer.ReportServerUrl = this.ServerURL;
+        }
+
         private string resourceRootLoc = "~/Resources/demos/Report/";
         public object GetResource(string key, string resourcetype, bool isPrint)
         {
@@ -35,18 +46,15 @@ public void LogError(string errorCode, string message, Exception exception, stri
 
         public void OnInitReportOptions(ReportViewerOptions reportOption)
         {
+            reportOption.ReportModel.ReportingServer = this.Server;
+            reportOption.ReportModel.ReportServerUrl = this.ServerURL;
             reportOption.ReportModel.EmbedImageData = true;
             string reportName = reportOption.ReportModel.ReportPath;
             string directoryName = Path.GetDirectoryName(reportName);
             if (directoryName.Length <= 0)
             {
                 reportOption.ReportModel.ReportPath = HttpContext.Current.Server.MapPath(resourceRootLoc + reportName);
             }
-            if (reportName == "load-large-data.rdlc")
-            {
-                SqlQuery.getJson();
-                reportOption.ReportModel.DataSources.Add(new ReportDataSource("SalesOrderDetail", HttpContext.Current.Cache.Get("SalesOrderDetail") as DataTable));
-            }
         }
 
         public void OnReportLoaded(ReportViewerOptions reportOption)

Models/SqlQuery.cs

@@ -10,26 +10,6 @@ namespace ReportServices.Models
 {
     public class SqlQuery
     {
-        public static string getJson()
-        {
-            if (HttpContext.Current.Cache.Get("SalesOrderDetail") == null)
-            {
-                using (SqlConnection connection = new SqlConnection(System.Configuration.ConfigurationManager.AppSettings["ConnectionQuery"] ))
-                {
-                    connection.Open();
-
-                    string queryString = "SELECT SOD.SalesOrderDetailID, SOD.OrderQty, SOD.UnitPrice,CASE WHEN SOD.UnitPriceDiscount IS NULL THEN 0 ELSE SOD.UnitPriceDiscount END AS UnitPriceDiscount, SOD.LineTotal, SOD.CarrierTrackingNumber, SOD.SalesOrderID, P.Name, P.ProductNumber FROM        Sales.SalesOrderDetail SOD INNER JOIN Production.Product P ON SOD.ProductID = P.ProductID INNER JOIN Sales.SalesOrderHeader SOH ON SOD.SalesOrderID = SOH.SalesOrderID";
-                    SqlDataAdapter adapter = new SqlDataAdapter(queryString, connection);
-                    using (DataSet salesOrders = new DataSet()){
-                    adapter.Fill(salesOrders, "Orders");
-                    HttpContext.Current.Cache.Insert("SalesOrderDetail", salesOrders.Tables[0]);
-                    connection.Close();
-                    return "[{\"value\":" + JsonConvert.SerializeObject(HttpContext.Current.Cache.Get("SalesOrderDetail")) + ",\"name\": \"SalesOrderDetail\"}]";
-                    }
-                }
-            }
-            return null;
-        }
           public static string getProductCategory()
         {
 

Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("5.2.26")]
-[assembly: AssemblyFileVersion("5.2.26")]
+[assembly: AssemblyVersion("5.3.8")]
+[assembly: AssemblyFileVersion("5.3.8")]

ReportServices.csproj

@@ -48,32 +48,32 @@
       <HintPath>packages\BarcodeLib.1.3.0.0\lib\net20\BarcodeLib.dll</HintPath>
     </Reference>
     <Reference Include="Bold.Licensing">
-      <HintPath>packages\Bold.Licensing.5.2.26\lib\net45\Bold.Licensing.dll</HintPath>
+      <HintPath>packages\Bold.Licensing.5.3.8\lib\net45\Bold.Licensing.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="BoldReports.CRI.Barcode">
-      <HintPath>packages\BoldReports.CRI.Barcode.5.2.26\lib\net45\BoldReports.CRI.Barcode.dll</HintPath>
+      <HintPath>packages\BoldReports.CRI.Barcode.5.3.8\lib\net45\BoldReports.CRI.Barcode.dll</HintPath>
     </Reference>
     <Reference Include="BoldReports.Data.SSAS">
-      <HintPath>packages\BoldReports.Data.SSAS.5.2.26\lib\net45\BoldReports.Data.SSAS.dll</HintPath>
+      <HintPath>packages\BoldReports.Data.SSAS.5.3.8\lib\net45\BoldReports.Data.SSAS.dll</HintPath>
     </Reference>
     <Reference Include="BoldReports.Data.ElasticSearch">
-      <HintPath>packages\BoldReports.Data.ElasticSearch.5.2.26\lib\net45\BoldReports.Data.ElasticSearch.dll</HintPath>
+      <HintPath>packages\BoldReports.Data.ElasticSearch.5.3.8\lib\net45\BoldReports.Data.ElasticSearch.dll</HintPath>
     </Reference>
     <Reference Include="BoldReports.Web">
-      <HintPath>packages\BoldReports.Web.5.2.26\lib\net45\BoldReports.Web.dll</HintPath>
+      <HintPath>packages\BoldReports.Web.5.3.8\lib\net45\BoldReports.Web.dll</HintPath>
     </Reference>
     <Reference Include="BoldReports.Data.Csv">
-      <HintPath>packages\BoldReports.Data.Csv.5.2.26\lib\net45\BoldReports.Data.Csv.dll</HintPath>
+      <HintPath>packages\BoldReports.Data.Csv.5.3.8\lib\net45\BoldReports.Data.Csv.dll</HintPath>
     </Reference>
     <Reference Include="BoldReports.Data.Excel">
-      <HintPath>packages\BoldReports.Data.Excel.5.2.26\lib\net45\BoldReports.Data.Excel.dll</HintPath>
+      <HintPath>packages\BoldReports.Data.Excel.5.3.8\lib\net45\BoldReports.Data.Excel.dll</HintPath>
     </Reference>
     <Reference Include="KBCsv, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc96fa93a217f7a1, processorArchitecture=MSIL">
       <HintPath>packages\KBCsv.5.0.0\lib\netstandard1.0\KBCsv.dll</HintPath>
     </Reference>
     <Reference Include="BoldReports.Data.WebData">
-      <HintPath>packages\BoldReports.Data.WebData.5.2.26\lib\net45\BoldReports.Data.WebData.dll</HintPath>
+      <HintPath>packages\BoldReports.Data.WebData.5.3.8\lib\net45\BoldReports.Data.WebData.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.9.0">
       <HintPath>packages\log4net.2.0.10\lib\net45\log4net.dll</HintPath>
@@ -104,7 +104,7 @@
       <HintPath>packages\Syncfusion.Presentation.AspNet.20.2.0.36\lib\net45\Syncfusion.Presentation.Base.dll</HintPath>
     </Reference>
     <Reference Include="BoldReports.Base.Logger">
-      <HintPath>packages\BoldReports.Base.Logger.5.2.26\lib\net45\BoldReports.Base.Logger.dll</HintPath>
+      <HintPath>packages\BoldReports.Base.Logger.5.3.8\lib\net45\BoldReports.Base.Logger.dll</HintPath>
     </Reference>
     <Reference Include="Syncfusion.SfBarcode.WPF">
       <HintPath>packages\Syncfusion.SfBarcode.WPF.20.2.0.36\lib\net45\Syncfusion.SfBarcode.WPF.dll</HintPath>
@@ -136,18 +136,18 @@
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="BoldReports.Data.MySQL">
-      <HintPath>packages\BoldReports.Data.MySQL.5.2.26\lib\net45\BoldReports.Data.MySQL.dll</HintPath>
+      <HintPath>packages\BoldReports.Data.MySQL.5.3.8\lib\net45\BoldReports.Data.MySQL.dll</HintPath>
     </Reference>
     <Reference Include="BoldReports.Data.Oracle">
-      <HintPath>packages\BoldReports.Data.Oracle.5.2.26\lib\net45\BoldReports.Data.Oracle.dll</HintPath>
+      <HintPath>packages\BoldReports.Data.Oracle.5.3.8\lib\net45\BoldReports.Data.Oracle.dll</HintPath>
     </Reference>
     <Reference Include="BoldReports.Data.PostgreSQL">
-      <HintPath>packages\BoldReports.Data.PostgreSQL.5.2.26\lib\net45\BoldReports.Data.PostgreSQL.dll</HintPath>
+      <HintPath>packages\BoldReports.Data.PostgreSQL.5.3.8\lib\net45\BoldReports.Data.PostgreSQL.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0">
-      <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.Formatting">
       <HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
@@ -191,14 +191,8 @@
     <Content Include="Resources\docs\side-by-side-main-report.rdl" />
     <Content Include="Resources\docs\side-by-side-sub-report.rdl" />
     <Content Include="Resources\docs\sub-report-detail.rdl" />
-    <Content Include="Scripts\bold-reports\bold.report-designer.min.js" />
-    <Content Include="Scripts\bold-reports\bold.report-viewer.min.js" />
-    <Content Include="Scripts\bold-reports\common\bold.report-designer-widgets.min.js" />
-    <Content Include="Scripts\bold-reports\common\bold.reports.common.min.js" />
-    <Content Include="Scripts\bold-reports\common\bold.reports.widgets.min.js" />
-    <Content Include="Scripts\bold-reports\common\ej.unobtrusive.min.js" />
-    <Content Include="Scripts\bold-reports\data-visualization\ej.bulletgraph.min.js" />
-    <Content Include="Scripts\bold-reports\data-visualization\ej.chart.min.js" />
+    <Content Include="Scripts\bold-reports\v2.0\bold.report-designer.min.js" />
+    <Content Include="Scripts\bold-reports\v2.0\bold.report-viewer.min.js" />
     <Content Include="Scripts\dependent\jquery.min.js" />
     <Content Include="Scripts\ShapeData\africa.js" />
     <Content Include="Scripts\ShapeData\antarctica.js" />
@@ -373,6 +367,7 @@
     <Content Include="Resources\demos\DataSet\PatientDetails.rsd" />
     <Content Include="Resources\demos\DataSource\Northwind.rds" />
     <Content Include="Resources\demos\DataSource\ReportSampleDatabase.rds" />
+    <Content Include="Resources\demos\DataSource\AdventureWorks.rds" />
     <Content Include="Resources\demos\Report\barcode.rdl" />
     <Content Include="Resources\demos\Report\company-sales.rdl" />
     <Content Include="Resources\demos\Report\conditional-row-formatting.rdl" />
@@ -393,12 +388,14 @@
     <Content Include="Resources\demos\Report\website-visitor-analysis.rdl" />
     <Content Include="Resources\demos\Report\product-catalog.rdlc" />
     <Content Include="Resources\demos\Report\sales-by-year.rdlc" />
-    <Content Include="Resources\demos\Report\load-large-data.rdlc" />
+    <Content Include="Resources\demos\Report\load-large-data.rdl" />
     <Content Include="Resources\demos\Report\consolidated-balance-sheet.rdlc" />
     <Content Include="Resources\demos\Report\paystub.rdlc" />
     <Content Include="Resources\demos\Report\dynamic-chart-series.rdl" />
     <Content Include="Resources\demos\Report\dynamic-columns.rdl" />
     <Content Include="Resources\demos\Report\data-bar.rdl" />
+    <Content Include="Resources\demos\Report\sub-report.rdl" />
+    <Content Include="Resources\demos\Report\sub-report-child.rdl" />
     <Content Include="Resources\demos\Report\spark-line.rdlc" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>

Resources/demos/DataSource/AdventureWorks.rds

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DataSourceDefinition xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Extension>SQL</Extension>
+  <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=AdventureWorks;Encrypt=false;TrustServerCertificate=true;</ConnectString>
+  <UseOriginalConnectString>false</UseOriginalConnectString>
+  <OriginalConnectStringExpressionBased>false</OriginalConnectStringExpressionBased>
+  <CredentialRetrieval>Store</CredentialRetrieval>
+  <WindowsCredentials>false</WindowsCredentials>
+  <ImpersonateUser>false</ImpersonateUser>
+  <UserName>demoreadonly@data-platform-demo</UserName>
+  <Password>N@c)=Y8s*1&amp;dh</Password>
+  <Enabled>true</Enabled>
+</DataSourceDefinition>

Resources/demos/DataSource/Northwind.rds

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DataSourceDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Extension>SQL</Extension>
-  <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=Northwind;</ConnectString>
+  <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=Northwind;Encrypt=false;TrustServerCertificate=true;</ConnectString>
   <UseOriginalConnectString>false</UseOriginalConnectString>
   <OriginalConnectStringExpressionBased>false</OriginalConnectStringExpressionBased>
   <CredentialRetrieval>Store</CredentialRetrieval>

Resources/demos/DataSource/ReportSampleDatabase.rds

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DataSourceDefinition xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=SampleDB;</ConnectString>
+  <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=SampleDB;Encrypt=false;TrustServerCertificate=true;</ConnectString>
   <CredentialRetrieval>Store</CredentialRetrieval>
   <Enabled>true</Enabled>
   <Extension>SQL</Extension>

Resources/demos/Report/company-sales.rdl

@@ -612,12 +612,8 @@
   <AutoRefresh>0</AutoRefresh>
   <DataSources>
     <DataSource Name="AdventureWorks">
-      <ConnectionProperties>
-        <DataProvider>SQL</DataProvider>
-        <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=AdventureWorks;User ID=demoreadonly@data-platform-demo;Password=N@c)=Y8s*1&amp;dh;
-</ConnectString>
-      </ConnectionProperties>
-      <rd:ImpersonateUser>false</rd:ImpersonateUser>
+      <rd:SecurityType>None</rd:SecurityType>
+      <DataSourceReference>AdventureWorks</DataSourceReference>
     </DataSource>
   </DataSources>
   <DataSets>

Resources/demos/Report/conditional-row-formatting.rdl

@@ -715,10 +715,7 @@
   <DataSources>
     <DataSource Name="Northwind">
       <rd:SecurityType>None</rd:SecurityType>
-      <ConnectionProperties>
-        <DataProvider>SQL</DataProvider>
-        <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=Northwind;user id=demoreadonly@data-platform-demo;password=N@c)=Y8s*1&amp;dh</ConnectString>
-      </ConnectionProperties>
+      <DataSourceReference>Northwind</DataSourceReference>
     </DataSource>
   </DataSources>
   <DataSets>

Resources/demos/Report/customer-support-analysis.rdl

@@ -2578,10 +2578,7 @@
   <DataSources>
     <DataSource Name="ReportSampleDatabase">
       <rd:SecurityType>None</rd:SecurityType>
-      <ConnectionProperties>
-        <DataProvider>SQL</DataProvider>
-        <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=SampleDB;user id=demoreadonly@data-platform-demo;password=N@c)=Y8s*1&amp;dh</ConnectString>
-      </ConnectionProperties>
+      <DataSourceReference>ReportSampleDatabase</DataSourceReference>
     </DataSource>
   </DataSources>
   <DataSets>

Resources/demos/Report/customer-support-representative-analysis.rdl

@@ -2258,11 +2258,8 @@
   <AutoRefresh>0</AutoRefresh>
   <DataSources>
     <DataSource Name="ReportSampleDatabase">
-      <ConnectionProperties>
-        <DataProvider>SQL</DataProvider>
-        <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=SampleDB;user id=demoreadonly@data-platform-demo;password=N@c)=Y8s*1&amp;dh</ConnectString>
-        <rd:IsDesignState>true</rd:IsDesignState>
-      </ConnectionProperties>
+      <rd:SecurityType>None</rd:SecurityType>
+      <DataSourceReference>ReportSampleDatabase</DataSourceReference>
       <rd:ImpersonateUser>false</rd:ImpersonateUser>
     </DataSource>
   </DataSources>

Resources/demos/Report/data-bar.rdl

@@ -887,11 +887,8 @@
   <AutoRefresh>0</AutoRefresh>
   <DataSources>
     <DataSource Name="AdventureWorks">
-      <ConnectionProperties>
-        <DataProvider>SQL</DataProvider>
-        <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=AdventureWorks;User ID=demoreadonly@data-platform-demo;Password=N@c)=Y8s*1&amp;dh;
-</ConnectString>
-      </ConnectionProperties>
+      <rd:SecurityType>None</rd:SecurityType>
+      <DataSourceReference>AdventureWorks</DataSourceReference>
       <rd:ImpersonateUser>false</rd:ImpersonateUser>
     </DataSource>
   </DataSources>

Resources/demos/Report/dynamic-chart-series.rdl

@@ -1471,10 +1471,8 @@
   <AutoRefresh>0</AutoRefresh>
   <DataSources>
     <DataSource Name="ReportSampleDatabase">
-      <ConnectionProperties>
-        <DataProvider>SQL</DataProvider>
-        <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=SampleDB;user id=demoreadonly@data-platform-demo;password=N@c)=Y8s*1&amp;dh</ConnectString>
-      </ConnectionProperties>
+      <rd:SecurityType>None</rd:SecurityType>
+      <DataSourceReference>ReportSampleDatabase</DataSourceReference>
       <rd:ImpersonateUser>false</rd:ImpersonateUser>
     </DataSource>
   </DataSources>

Resources/demos/Report/dynamic-columns.rdl

@@ -1465,10 +1465,8 @@
   <AutoRefresh>0</AutoRefresh>
   <DataSources>
     <DataSource Name="ReportSampleDatabase">
-      <ConnectionProperties>
-        <DataProvider>SQL</DataProvider>
-        <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=SampleDB;user id=demoreadonly@data-platform-demo;password=N@c)=Y8s*1&amp;dh</ConnectString>
-      </ConnectionProperties>
+      <rd:SecurityType>None</rd:SecurityType>
+      <DataSourceReference>ReportSampleDatabase</DataSourceReference>
       <rd:ImpersonateUser>false</rd:ImpersonateUser>
     </DataSource>
   </DataSources>

Resources/demos/Report/grouping-aggregate.rdl

@@ -821,11 +821,8 @@
   <AutoRefresh>0</AutoRefresh>
   <DataSources>
     <DataSource Name="AdventureWorks">
-      <ConnectionProperties>
-        <DataProvider>SQL</DataProvider>
-        <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=AdventureWorks;user id=demoreadonly@data-platform-demo;password=N@c)=Y8s*1&amp;dh</ConnectString>
-        <rd:IsDesignState>true</rd:IsDesignState>
-      </ConnectionProperties>
+      <rd:SecurityType>None</rd:SecurityType>
+      <DataSourceReference>AdventureWorks</DataSourceReference>
       <rd:ImpersonateUser>false</rd:ImpersonateUser>
     </DataSource>
   </DataSources>

Resources/demos/Report/invoice.rdl

@@ -1827,10 +1827,8 @@
   <AutoRefresh>0</AutoRefresh>
   <DataSources>
     <DataSource Name="NorthWindIO">
-      <ConnectionProperties>
-        <DataProvider>SQL</DataProvider>
-        <ConnectString>Data Source=dataplatformdemodata.syncfusion.com;Initial Catalog=Northwind;User ID=demoreadonly@data-platform-demo;Password=N@c)=Y8s*1&amp;dh</ConnectString>
-      </ConnectionProperties>
+      <rd:SecurityType>None</rd:SecurityType>
+      <DataSourceReference>Northwind</DataSourceReference>
       <rd:ImpersonateUser>false</rd:ImpersonateUser>
     </DataSource>
   </DataSources>