From 6296229e28555526a6af71e1025cae7440ceeae1 Mon Sep 17 00:00:00 2001 From: Peter Gill Date: Sun, 19 Jan 2025 17:09:54 -0330 Subject: [PATCH] Example projects, update resource files and project configurations - Added `Form1.resx` with XML content defining a resource file schema and example data entries. - Removed `RdlEngineConfig.xml` containing various configuration settings. - Updated `RdlEngineConfig.xml` inclusion in multiple project files (`SampleReportViewer.csproj`, `SampleReportApp.vbproj`, `SampleApp2-SetData.csproj`, `HyperLinkExample.csproj`) to use a relative path and preserved `CopyToOutputDirectory` property. - Modified `RdlEngineConfig.xml` to remove ``, ``, and `` sections. - Updated `SampleDesignerControl.csproj` and `SampleDesignerControlWPF.csproj` to link `RdlEngineConfig.xml` from a relative path and set to copy if newer. - Updated `Program.cs` to change the path for the RDL file opened by `ctl.OpenFile`. --- .../Sample-Report-Viewer/Form1.resx | 120 ++++++++++++ .../Sample-Report-Viewer/RdlEngineConfig.xml | 149 --------------- .../SampleReportViewer.csproj | 10 +- .../SampleReportApp/SampleReportApp.vbproj | 9 +- .../SampleApp2-SetData/RdlEngineConfig.xml | 178 ------------------ .../SampleApp2-SetData.csproj | 6 +- .../HyperLinkExample/HyperLinkExample.csproj | 6 + .../SampleDesignerControl/Program.cs | 2 +- .../SampleDesignerControl/RdlEngineConfig.xml | 149 --------------- .../SampleDesignerControl.csproj | 10 +- .../SampleDesignerControlWPF.csproj | 5 + 11 files changed, 151 insertions(+), 493 deletions(-) create mode 100644 Examples/Sample-Report-Viewer/Sample-Report-Viewer/Form1.resx delete mode 100644 Examples/Sample-Report-Viewer/Sample-Report-Viewer/RdlEngineConfig.xml delete mode 100644 Examples/SampleApp2-SetData/SampleApp2-SetData/RdlEngineConfig.xml delete mode 100644 Examples/SampleDesignerControl/SampleDesignerControl/RdlEngineConfig.xml diff --git a/Examples/Sample-Report-Viewer/Sample-Report-Viewer/Form1.resx b/Examples/Sample-Report-Viewer/Sample-Report-Viewer/Form1.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/Examples/Sample-Report-Viewer/Sample-Report-Viewer/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Examples/Sample-Report-Viewer/Sample-Report-Viewer/RdlEngineConfig.xml b/Examples/Sample-Report-Viewer/Sample-Report-Viewer/RdlEngineConfig.xml deleted file mode 100644 index d17e417d..00000000 --- a/Examples/Sample-Report-Viewer/Sample-Report-Viewer/RdlEngineConfig.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - SQL - SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES ORDER BY 2, 1 - SQL - - - ODBC - SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES ORDER BY 2, 1 - SQL - true - - - OLEDB - SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES ORDER BY 2, 1 - SQL - - - Oracle - Oracle.DataAccess.dll - Oracle.DataAccess.Client.OracleConnection - select OWNER || '.' || TABLE_NAME from ALL_TABLES WHERE TABLESPACE_NAME NOT IN ('SYSTEM', 'SYSAUX') - SQL - - - MySQL.NET - MySql.Data.dll - MySql.Data.MySqlClient.MySqlConnection - show tables - SQL - true - - - Firebird.NET - FirebirdSql.Data.Firebird.dll - FirebirdSql.Data.Firebird.FbConnection - SELECT RDB$RELATION_NAME FROM RDB$RELATIONS WHERE RDB$RELATION_NAME NOT LIKE 'RDB$%' ORDER BY 1 - SQL - - - Firebird.NET 2.0 - FirebirdSql.Data.FirebirdClient.dll - FirebirdSql.Data.FirebirdClient.FbConnection - SELECT RDB$RELATION_NAME FROM RDB$RELATIONS WHERE RDB$SYSTEM_FLAG = 0 ORDER BY 1 - SQL - - - SQLite - /usr/lib/mono/4.0/Mono.Data.Sqlite.dll - Mono.Data.Sqlite.SqliteConnection - SELECT name FROM sqlite_master WHERE type = "table" - SQL - - - iAnywhere.NET - iAnywhere.Data.AsaClient.dll - iAnywhere.Data.AsaClient.AsaConnection - select table_name from systable - where table_type = 'BASE' and table_name not like 'SYS%' - and table_name not like 'ix_%' - and table_name not like 'ml_%' - and table_name not like 'ul_%' - and table_name not like 'rl_%' - and table_name not like 'rs_%' - and table_name not like 'migrate_%' - and table_name not like 'spt_%' - and table_name not like 'jdbc_%' - and table_name not in ('DUMMY', 'RowGenerator', 'EXCLUDEOBJECT') - - SQL - - - XML - DataProviders.dll - fyiReporting.Data.XmlConnection - - File - - - WebService - DataProviders.dll - fyiReporting.Data.WebServiceConnection - - WebService - - - WebLog - DataProviders.dll - fyiReporting.Data.LogConnection - - File - - - Text - DataProviders.dll - fyiReporting.Data.TxtConnection - - File - - - iTunes - DataProviders.dll - fyiReporting.Data.iTunesConnection - - File - - - FileDirectory - DataProviders.dll - fyiReporting.Data.FileDirConnection - - File - - - OracleSp - OracleSp.dll - fyiReporting.OracleSp.OracleSpConnection - select OWNER || '.' || TABLE_NAME from ALL_TABLES WHERE TABLESPACE_NAME NOT IN ('SYSTEM', 'SYSAUX') - SQL - - - PostgreSQL - Npgsql.dll - Npgsql.NpgsqlConnection - SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME NOT LIKE 'pg_%' ORDER BY 1 - SQL - - - - ICSharpCode.SharpZipLib.dll - ICSharpCode.SharpZipLib.Zip.Compression.Streams.DeflaterOutputStream - Finish - true - - - - BarCode EAN-13 - RdlCri.dll - fyiReporting.CRI.BarCodeEAN13 - - - BarCode Bookland - RdlCri.dll - fyiReporting.CRI.BarCodeBookland - - - \ No newline at end of file diff --git a/Examples/Sample-Report-Viewer/Sample-Report-Viewer/SampleReportViewer.csproj b/Examples/Sample-Report-Viewer/Sample-Report-Viewer/SampleReportViewer.csproj index 38807385..c5a06752 100644 --- a/Examples/Sample-Report-Viewer/Sample-Report-Viewer/SampleReportViewer.csproj +++ b/Examples/Sample-Report-Viewer/Sample-Report-Viewer/SampleReportViewer.csproj @@ -20,11 +20,11 @@ PreserveNewest - - - PreserveNewest - - + + + PreserveNewest + + diff --git a/Examples/SampleApp/SampleReportApp/SampleReportApp.vbproj b/Examples/SampleApp/SampleReportApp/SampleReportApp.vbproj index f02bc65a..da3e8bc8 100644 --- a/Examples/SampleApp/SampleReportApp/SampleReportApp.vbproj +++ b/Examples/SampleApp/SampleReportApp/SampleReportApp.vbproj @@ -56,10 +56,11 @@ Application.Designer.vb - - - - + + + PreserveNewest + + diff --git a/Examples/SampleApp2-SetData/SampleApp2-SetData/RdlEngineConfig.xml b/Examples/SampleApp2-SetData/SampleApp2-SetData/RdlEngineConfig.xml deleted file mode 100644 index ae4e7c9e..00000000 --- a/Examples/SampleApp2-SetData/SampleApp2-SetData/RdlEngineConfig.xml +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - SQL - SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES ORDER BY 2, 1 - SQL - - - SQLce - C:\Program Files\Microsoft SQL Server Compact Edition\v4.0\Desktop\System.Data.SqlServerCe.dll - System.Data.SqlServerCe.SqlCeConnection - SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES ORDER BY TABLE_NAME, TABLE_TYPE - SQL - - - ODBC - SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES ORDER BY 2, 1 - SQL - true - - - OLEDB - SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES ORDER BY 2, 1 - SQL - - - Oracle - F:\oracle\product\10.2.0\db_2\BIN\Oracle.DataAccess.dll - Oracle.DataAccess.Client.OracleConnection - select OWNER || '.' || TABLE_NAME from ALL_TABLES WHERE TABLESPACE_NAME NOT IN ('SYSTEM', 'SYSAUX') - SQL - - - MySQL.NET - C:\Program Files (x86)\MySQL\MySQL Connector Net 6.3.7\Assemblies\v2.0\MySql.Data.dll - MySql.Data.MySqlClient.MySqlConnection - show tables - SQL - true - - - Firebird.NET - C:\Program Files\FirebirdNETProvider1.7\FirebirdSql.Data.Firebird.dll - FirebirdSql.Data.Firebird.FbConnection - SELECT RDB$RELATION_NAME FROM RDB$RELATIONS WHERE RDB$RELATION_NAME NOT LIKE 'RDB$%' ORDER BY 1 - SQL - - - Firebird.NET 2.0 - FirebirdSql.Data.FirebirdClient.dll - FirebirdSql.Data.FirebirdClient.FbConnection - SELECT RDB$RELATION_NAME FROM RDB$RELATIONS WHERE RDB$SYSTEM_FLAG = 0 ORDER BY 1 - SQL - - - SQLite - System.Data.SQLite.dll - System.Data.SQLite.SQLiteConnection - SELECT name FROM sqlite_master WHERE type = 'table' - SQL - - - iAnywhere.NET - F:\Sybase\SQL Anywhere Studio 9\win32\iAnywhere.Data.AsaClient.dll - iAnywhere.Data.AsaClient.AsaConnection - select table_name from systable - where table_type = 'BASE' and table_name not like 'SYS%' - and table_name not like 'ix_%' - and table_name not like 'ml_%' - and table_name not like 'ul_%' - and table_name not like 'rl_%' - and table_name not like 'rs_%' - and table_name not like 'migrate_%' - and table_name not like 'spt_%' - and table_name not like 'jdbc_%' - and table_name not in ('DUMMY', 'RowGenerator', 'EXCLUDEOBJECT') - SQL - - - XML - DataProviders.dll - fyiReporting.Data.XmlConnection - - File - - - WebService - DataProviders.dll - fyiReporting.Data.WebServiceConnection - - WebService - - - WebLog - DataProviders.dll - fyiReporting.Data.LogConnection - - File - - - Text - DataProviders.dll - fyiReporting.Data.TxtConnection - - File - - - iTunes - DataProviders.dll - fyiReporting.Data.iTunesConnection - - File - - - FileDirectory - DataProviders.dll - fyiReporting.Data.FileDirConnection - - File - - - OracleSp - OracleSp.dll - fyiReporting.OracleSp.OracleSpConnection - select OWNER || '.' || TABLE_NAME from ALL_TABLES WHERE TABLESPACE_NAME NOT IN ('SYSTEM', 'SYSAUX') - SQL - - - PostgreSQL - Npgsql.dll - Npgsql.NpgsqlConnection - SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME NOT LIKE 'pg_%' ORDER BY 1 - SQL - - - - ICSharpCode.SharpZipLib.dll - ICSharpCode.SharpZipLib.Zip.Compression.Streams.DeflaterOutputStream - Finish - true - - - - BarCode EAN-13 - RdlCri.dll - fyiReporting.CRI.BarCodeEAN13 - - - BarCode Bookland - RdlCri.dll - fyiReporting.CRI.BarCodeBookland - - - QR Code - RdlCri.dll - fyiReporting.CRI.QrCode - - - BarCode39 - RdlCri.dll - fyiReporting.CRI.BarCode39 - - - BarCode128 - RdlCri.dll - fyiReporting.CRI.BarCode128 - - - BarCodeEAN8 - RdlCri.dll - fyiReporting.CRI.BarCodeEAN8 - - - - diff --git a/Examples/SampleApp2-SetData/SampleApp2-SetData/SampleApp2-SetData.csproj b/Examples/SampleApp2-SetData/SampleApp2-SetData/SampleApp2-SetData.csproj index 09b80f44..255475d8 100644 --- a/Examples/SampleApp2-SetData/SampleApp2-SetData/SampleApp2-SetData.csproj +++ b/Examples/SampleApp2-SetData/SampleApp2-SetData/SampleApp2-SetData.csproj @@ -29,8 +29,9 @@ - - + + PreserveNewest + @@ -38,5 +39,6 @@ + \ No newline at end of file diff --git a/Examples/SampleAppHyperLinkCustomAction/HyperLinkExample/HyperLinkExample.csproj b/Examples/SampleAppHyperLinkCustomAction/HyperLinkExample/HyperLinkExample.csproj index 2511a33d..2bffd8cd 100644 --- a/Examples/SampleAppHyperLinkCustomAction/HyperLinkExample/HyperLinkExample.csproj +++ b/Examples/SampleAppHyperLinkCustomAction/HyperLinkExample/HyperLinkExample.csproj @@ -14,7 +14,13 @@ bin\x86\Release\ ManagedMinimumRules.ruleset + + + PreserveNewest + + + \ No newline at end of file diff --git a/Examples/SampleDesignerControl/SampleDesignerControl/Program.cs b/Examples/SampleDesignerControl/SampleDesignerControl/Program.cs index 517fb955..a1243bda 100644 --- a/Examples/SampleDesignerControl/SampleDesignerControl/Program.cs +++ b/Examples/SampleDesignerControl/SampleDesignerControl/Program.cs @@ -18,7 +18,7 @@ static void Main() Application.SetCompatibleTextRenderingDefault(false); Form frm = new Form(); fyiReporting.RdlDesign.RdlUserControl ctl = new fyiReporting.RdlDesign.RdlUserControl(); - ctl.OpenFile(@"C:\Users\Peter\Projects\My-FyiReporting\Examples\Examples\FileDirectoryTest.rdl"); + ctl.OpenFile(@"C:\Users\peter\source\repos\My-FyiReporting\Examples\Examples\FileDirectoryTest.rdl"); ctl.Dock = DockStyle.Fill; frm.Controls.Add(ctl); diff --git a/Examples/SampleDesignerControl/SampleDesignerControl/RdlEngineConfig.xml b/Examples/SampleDesignerControl/SampleDesignerControl/RdlEngineConfig.xml deleted file mode 100644 index 624b8f6c..00000000 --- a/Examples/SampleDesignerControl/SampleDesignerControl/RdlEngineConfig.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - SQL - SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES ORDER BY 2, 1 - SQL - - - ODBC - SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES ORDER BY 2, 1 - SQL - true - - - OLEDB - SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES ORDER BY 2, 1 - SQL - - - Oracle - Oracle.DataAccess.dll - Oracle.DataAccess.Client.OracleConnection - select OWNER || '.' || TABLE_NAME from ALL_TABLES WHERE TABLESPACE_NAME NOT IN ('SYSTEM', 'SYSAUX') - SQL - - - MySQL.NET - MySql.Data.dll - MySql.Data.MySqlClient.MySqlConnection - show tables - SQL - true - - - Firebird.NET - FirebirdSql.Data.Firebird.dll - FirebirdSql.Data.Firebird.FbConnection - SELECT RDB$RELATION_NAME FROM RDB$RELATIONS WHERE RDB$RELATION_NAME NOT LIKE 'RDB$%' ORDER BY 1 - SQL - - - Firebird.NET 2.0 - FirebirdSql.Data.FirebirdClient.dll - FirebirdSql.Data.FirebirdClient.FbConnection - SELECT RDB$RELATION_NAME FROM RDB$RELATIONS WHERE RDB$SYSTEM_FLAG = 0 ORDER BY 1 - SQL - - - SQLite - System.Data.SQLite.DLL - System.Data.SQLite.SQLiteConnection - SELECT name FROM sqlite_master WHERE type = "table" - SQL - - - iAnywhere.NET - iAnywhere.Data.AsaClient.dll - iAnywhere.Data.AsaClient.AsaConnection - select table_name from systable - where table_type = 'BASE' and table_name not like 'SYS%' - and table_name not like 'ix_%' - and table_name not like 'ml_%' - and table_name not like 'ul_%' - and table_name not like 'rl_%' - and table_name not like 'rs_%' - and table_name not like 'migrate_%' - and table_name not like 'spt_%' - and table_name not like 'jdbc_%' - and table_name not in ('DUMMY', 'RowGenerator', 'EXCLUDEOBJECT') - - SQL - - - XML - DataProviders.dll - fyiReporting.Data.XmlConnection - - File - - - WebService - DataProviders.dll - fyiReporting.Data.WebServiceConnection - - WebService - - - WebLog - DataProviders.dll - fyiReporting.Data.LogConnection - - File - - - Text - DataProviders.dll - fyiReporting.Data.TxtConnection - - File - - - iTunes - DataProviders.dll - fyiReporting.Data.iTunesConnection - - File - - - FileDirectory - DataProviders.dll - fyiReporting.Data.FileDirConnection - - File - - - OracleSp - OracleSp.dll - fyiReporting.OracleSp.OracleSpConnection - select OWNER || '.' || TABLE_NAME from ALL_TABLES WHERE TABLESPACE_NAME NOT IN ('SYSTEM', 'SYSAUX') - SQL - - - PostgreSQL - Npgsql.dll - Npgsql.NpgsqlConnection - SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME NOT LIKE 'pg_%' ORDER BY 1 - SQL - - - - ICSharpCode.SharpZipLib.dll - ICSharpCode.SharpZipLib.Zip.Compression.Streams.DeflaterOutputStream - Finish - true - - - - BarCode EAN-13 - RdlCri.dll - fyiReporting.CRI.BarCodeEAN13 - - - BarCode Bookland - RdlCri.dll - fyiReporting.CRI.BarCodeBookland - - - \ No newline at end of file diff --git a/Examples/SampleDesignerControl/SampleDesignerControl/SampleDesignerControl.csproj b/Examples/SampleDesignerControl/SampleDesignerControl/SampleDesignerControl.csproj index 690fc5e0..22890734 100644 --- a/Examples/SampleDesignerControl/SampleDesignerControl/SampleDesignerControl.csproj +++ b/Examples/SampleDesignerControl/SampleDesignerControl/SampleDesignerControl.csproj @@ -21,11 +21,11 @@ PreserveNewest - - - PreserveNewest - - + + + PreserveNewest + + diff --git a/Examples/SampleDesignerControl/SampleDesignerControlWPF/SampleDesignerControlWPF.csproj b/Examples/SampleDesignerControl/SampleDesignerControlWPF/SampleDesignerControlWPF.csproj index 02448b5d..d1be2f92 100644 --- a/Examples/SampleDesignerControl/SampleDesignerControlWPF/SampleDesignerControlWPF.csproj +++ b/Examples/SampleDesignerControl/SampleDesignerControlWPF/SampleDesignerControlWPF.csproj @@ -10,6 +10,11 @@ + + + PreserveNewest + +