From af6cbb0615fece186b9bea3970c76f298e81d962 Mon Sep 17 00:00:00 2001 From: Boris Balaban Date: Thu, 12 Nov 2020 12:20:33 +0300 Subject: [PATCH 1/2] Update project to v20.1.8 --- .gitignore | 1 + .../MinimalisticReportPreviewDemo.csproj | 60 +- .../Properties/Resources.Designer.cs | 4 +- .../Properties/Settings.Designer.cs | 4 +- CS/MinimalisticReportPreviewDemo/app.config | 20 +- .../nwindDataSet.Designer.cs | 256 +-- VB/MinimalisticReportPreviewDemo.sln | 19 - .../Application.xaml | 5 - .../Application.xaml.vb | 16 - .../MainWindow.xaml | 8 - .../MainWindow.xaml.vb | 26 - .../MinimalisticReportPreviewDemo.vbproj | 206 -- .../My Project/AssemblyInfo.vb | 52 - .../My Project/Resources.Designer.vb | 63 - .../My Project/Resources.resx | 117 -- .../My Project/Settings.Designer.vb | 33 - .../My Project/Settings.settings | 14 - .../MyDocumentPreviewControl.vb | 48 - VB/MinimalisticReportPreviewDemo/Report.resx | 126 -- VB/MinimalisticReportPreviewDemo/Report.vb | 110 - VB/MinimalisticReportPreviewDemo/app.config | 10 - VB/MinimalisticReportPreviewDemo/nwind.mdb | Bin 1150976 -> 0 bytes .../nwindDataSet.Designer.vb | 1808 ----------------- .../nwindDataSet.xsc | 1 - .../nwindDataSet.xsd | 169 -- .../nwindDataSet.xss | 1 - config.json | 2 +- 27 files changed, 188 insertions(+), 2991 deletions(-) delete mode 100644 VB/MinimalisticReportPreviewDemo.sln delete mode 100644 VB/MinimalisticReportPreviewDemo/Application.xaml delete mode 100644 VB/MinimalisticReportPreviewDemo/Application.xaml.vb delete mode 100644 VB/MinimalisticReportPreviewDemo/MainWindow.xaml delete mode 100644 VB/MinimalisticReportPreviewDemo/MainWindow.xaml.vb delete mode 100644 VB/MinimalisticReportPreviewDemo/MinimalisticReportPreviewDemo.vbproj delete mode 100644 VB/MinimalisticReportPreviewDemo/My Project/AssemblyInfo.vb delete mode 100644 VB/MinimalisticReportPreviewDemo/My Project/Resources.Designer.vb delete mode 100644 VB/MinimalisticReportPreviewDemo/My Project/Resources.resx delete mode 100644 VB/MinimalisticReportPreviewDemo/My Project/Settings.Designer.vb delete mode 100644 VB/MinimalisticReportPreviewDemo/My Project/Settings.settings delete mode 100644 VB/MinimalisticReportPreviewDemo/MyDocumentPreviewControl.vb delete mode 100644 VB/MinimalisticReportPreviewDemo/Report.resx delete mode 100644 VB/MinimalisticReportPreviewDemo/Report.vb delete mode 100644 VB/MinimalisticReportPreviewDemo/app.config delete mode 100644 VB/MinimalisticReportPreviewDemo/nwind.mdb delete mode 100644 VB/MinimalisticReportPreviewDemo/nwindDataSet.Designer.vb delete mode 100644 VB/MinimalisticReportPreviewDemo/nwindDataSet.xsc delete mode 100644 VB/MinimalisticReportPreviewDemo/nwindDataSet.xsd delete mode 100644 VB/MinimalisticReportPreviewDemo/nwindDataSet.xss diff --git a/.gitignore b/.gitignore index 456cdfa..b866a8d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ *.user *.userosscache *.sln.docstates +*.bak # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs diff --git a/CS/MinimalisticReportPreviewDemo/MinimalisticReportPreviewDemo.csproj b/CS/MinimalisticReportPreviewDemo/MinimalisticReportPreviewDemo.csproj index 22444f5..91670ed 100644 --- a/CS/MinimalisticReportPreviewDemo/MinimalisticReportPreviewDemo.csproj +++ b/CS/MinimalisticReportPreviewDemo/MinimalisticReportPreviewDemo.csproj @@ -1,5 +1,5 @@ - - + + Debug x86 @@ -10,8 +10,9 @@ Properties MinimalisticReportPreviewDemo MinimalisticReportPreviewDemo - v4.0 - + v4.5.2 + + 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -26,6 +27,7 @@ prompt 4 true + false x86 @@ -35,52 +37,68 @@ TRACE prompt 4 + false - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - - + False - + False - + False - + + False + + + False + + + + False + + + False + + + False + + False @@ -178,4 +196,4 @@ --> - + \ No newline at end of file diff --git a/CS/MinimalisticReportPreviewDemo/Properties/Resources.Designer.cs b/CS/MinimalisticReportPreviewDemo/Properties/Resources.Designer.cs index 6525c2f..0a4e302 100644 --- a/CS/MinimalisticReportPreviewDemo/Properties/Resources.Designer.cs +++ b/CS/MinimalisticReportPreviewDemo/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace MinimalisticReportPreviewDemo.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/CS/MinimalisticReportPreviewDemo/Properties/Settings.Designer.cs b/CS/MinimalisticReportPreviewDemo/Properties/Settings.Designer.cs index 6338ee0..044daee 100644 --- a/CS/MinimalisticReportPreviewDemo/Properties/Settings.Designer.cs +++ b/CS/MinimalisticReportPreviewDemo/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace MinimalisticReportPreviewDemo.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/CS/MinimalisticReportPreviewDemo/app.config b/CS/MinimalisticReportPreviewDemo/app.config index 27970f0..17bb15f 100644 --- a/CS/MinimalisticReportPreviewDemo/app.config +++ b/CS/MinimalisticReportPreviewDemo/app.config @@ -1,10 +1,20 @@ - + + +
+ + - + - + + + + + Office2016White + + + + diff --git a/CS/MinimalisticReportPreviewDemo/nwindDataSet.Designer.cs b/CS/MinimalisticReportPreviewDemo/nwindDataSet.Designer.cs index c161207..df13045 100644 --- a/CS/MinimalisticReportPreviewDemo/nwindDataSet.Designer.cs +++ b/CS/MinimalisticReportPreviewDemo/nwindDataSet.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -29,7 +29,7 @@ public partial class nwindDataSet : global::System.Data.DataSet { private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public nwindDataSet() { this.BeginInit(); this.InitClass(); @@ -40,7 +40,7 @@ public nwindDataSet() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] protected nwindDataSet(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context, false) { if ((this.IsBinarySerialized(info, context) == true)) { @@ -76,7 +76,7 @@ protected nwindDataSet(global::System.Runtime.Serialization.SerializationInfo in } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] public ProductsDataTable Products { @@ -86,7 +86,7 @@ public ProductsDataTable Products { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)] public override global::System.Data.SchemaSerializationMode SchemaSerializationMode { @@ -99,7 +99,7 @@ public ProductsDataTable Products { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)] public new global::System.Data.DataTableCollection Tables { get { @@ -108,7 +108,7 @@ public ProductsDataTable Products { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)] public new global::System.Data.DataRelationCollection Relations { get { @@ -117,7 +117,7 @@ public ProductsDataTable Products { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] protected override void InitializeDerivedDataSet() { this.BeginInit(); this.InitClass(); @@ -125,7 +125,7 @@ protected override void InitializeDerivedDataSet() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public override global::System.Data.DataSet Clone() { nwindDataSet cln = ((nwindDataSet)(base.Clone())); cln.InitVars(); @@ -134,19 +134,19 @@ protected override void InitializeDerivedDataSet() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] protected override bool ShouldSerializeTables() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] protected override bool ShouldSerializeRelations() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) { if ((this.DetermineSchemaSerializationMode(reader) == global::System.Data.SchemaSerializationMode.IncludeSchema)) { this.Reset(); @@ -171,7 +171,7 @@ protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] protected override global::System.Xml.Schema.XmlSchema GetSchemaSerializable() { global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(); this.WriteXmlSchema(new global::System.Xml.XmlTextWriter(stream, null)); @@ -180,13 +180,13 @@ protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] internal void InitVars() { this.InitVars(true); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] internal void InitVars(bool initTable) { this.tableProducts = ((ProductsDataTable)(base.Tables["Products"])); if ((initTable == true)) { @@ -197,7 +197,7 @@ internal void InitVars(bool initTable) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitClass() { this.DataSetName = "nwindDataSet"; this.Prefix = ""; @@ -209,13 +209,13 @@ private void InitClass() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private bool ShouldSerializeProducts() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) { this.InitVars(); @@ -223,7 +223,7 @@ private void SchemaChanged(object sender, global::System.ComponentModel.Collecti } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedDataSetSchema(global::System.Xml.Schema.XmlSchemaSet xs) { nwindDataSet ds = new nwindDataSet(); global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); @@ -269,7 +269,7 @@ private void SchemaChanged(object sender, global::System.ComponentModel.Collecti return type; } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void ProductsRowChangeEventHandler(object sender, ProductsRowChangeEvent e); /// @@ -302,7 +302,7 @@ public partial class ProductsDataTable : global::System.Data.TypedTableBase ///Row event argument class /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public class ProductsRowChangeEvent : global::System.EventArgs { private ProductsRow eventRow; @@ -993,14 +993,14 @@ public class ProductsRowChangeEvent : global::System.EventArgs { private global::System.Data.DataRowAction eventAction; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ProductsRowChangeEvent(ProductsRow row, global::System.Data.DataRowAction action) { this.eventRow = row; this.eventAction = action; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ProductsRow Row { get { return this.eventRow; @@ -1008,7 +1008,7 @@ public ProductsRow Row { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataRowAction Action { get { return this.eventAction; @@ -1042,13 +1042,13 @@ public partial class ProductsTableAdapter : global::System.ComponentModel.Compon private bool _clearBeforeFill; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ProductsTableAdapter() { this.ClearBeforeFill = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] protected internal global::System.Data.OleDb.OleDbDataAdapter Adapter { get { if ((this._adapter == null)) { @@ -1059,7 +1059,7 @@ public ProductsTableAdapter() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] internal global::System.Data.OleDb.OleDbConnection Connection { get { if ((this._connection == null)) { @@ -1087,7 +1087,7 @@ public ProductsTableAdapter() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] internal global::System.Data.OleDb.OleDbTransaction Transaction { get { return this._transaction; @@ -1113,7 +1113,7 @@ public ProductsTableAdapter() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] protected global::System.Data.OleDb.OleDbCommand[] CommandCollection { get { if ((this._commandCollection == null)) { @@ -1124,7 +1124,7 @@ public ProductsTableAdapter() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool ClearBeforeFill { get { return this._clearBeforeFill; @@ -1135,7 +1135,7 @@ public bool ClearBeforeFill { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitAdapter() { this._adapter = new global::System.Data.OleDb.OleDbDataAdapter(); global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); @@ -1232,14 +1232,14 @@ private void InitAdapter() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.OleDb.OleDbConnection(); - this._connection.ConnectionString = global::MinimalisticReportPreviewDemo.Properties.Settings.Default.nwindConnectionString; + this._connection.ConnectionString = global::MinimalisticReportPreviewDemo.Properties.Settings.Default.nwindConnectionString1; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { this._commandCollection = new global::System.Data.OleDb.OleDbCommand[1]; this._commandCollection[0] = new global::System.Data.OleDb.OleDbCommand(); @@ -1250,7 +1250,7 @@ private void InitCommandCollection() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] public virtual int Fill(nwindDataSet.ProductsDataTable dataTable) { @@ -1263,7 +1263,7 @@ public virtual int Fill(nwindDataSet.ProductsDataTable dataTable) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] public virtual nwindDataSet.ProductsDataTable GetData() { @@ -1274,21 +1274,21 @@ public virtual nwindDataSet.ProductsDataTable GetData() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(nwindDataSet.ProductsDataTable dataTable) { return this.Adapter.Update(dataTable); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(nwindDataSet dataSet) { return this.Adapter.Update(dataSet, "Products"); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(global::System.Data.DataRow dataRow) { return this.Adapter.Update(new global::System.Data.DataRow[] { @@ -1296,14 +1296,14 @@ public virtual int Update(global::System.Data.DataRow dataRow) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(global::System.Data.DataRow[] dataRows) { return this.Adapter.Update(dataRows); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] public virtual int Delete(int Original_ProductID, string Original_ProductName, global::System.Nullable Original_SupplierID, global::System.Nullable Original_CategoryID, string Original_QuantityPerUnit, global::System.Nullable Original_UnitPrice, global::System.Nullable Original_UnitsInStock, global::System.Nullable Original_UnitsOnOrder, global::System.Nullable Original_ReorderLevel, bool Original_Discontinued, string Original_EAN13) { @@ -1398,7 +1398,7 @@ public virtual int Delete(int Original_ProductID, string Original_ProductName, g } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] public virtual int Insert(string ProductName, global::System.Nullable SupplierID, global::System.Nullable CategoryID, string QuantityPerUnit, global::System.Nullable UnitPrice, global::System.Nullable UnitsInStock, global::System.Nullable UnitsOnOrder, global::System.Nullable ReorderLevel, bool Discontinued, string EAN13) { @@ -1474,7 +1474,7 @@ public virtual int Insert(string ProductName, global::System.Nullable Suppl } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] public virtual int Update( @@ -1664,7 +1664,7 @@ public partial class TableAdapterManager : global::System.ComponentModel.Compone private global::System.Data.IDbConnection _connection; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public UpdateOrderOption UpdateOrder { get { return this._updateOrder; @@ -1675,7 +1675,7 @@ public UpdateOrderOption UpdateOrder { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + "a", "System.Drawing.Design.UITypeEditor")] @@ -1689,7 +1689,7 @@ public ProductsTableAdapter ProductsTableAdapter { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool BackupDataSetBeforeUpdate { get { return this._backupDataSetBeforeUpdate; @@ -1700,7 +1700,7 @@ public bool BackupDataSetBeforeUpdate { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] public global::System.Data.IDbConnection Connection { get { @@ -1719,7 +1719,7 @@ public bool BackupDataSetBeforeUpdate { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] public int TableAdapterInstanceCount { get { @@ -1735,7 +1735,7 @@ public int TableAdapterInstanceCount { ///Update rows in top-down order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private int UpdateUpdatedRows(nwindDataSet dataSet, global::System.Collections.Generic.List allChangedRows, global::System.Collections.Generic.List allAddedRows) { int result = 0; if ((this._productsTableAdapter != null)) { @@ -1754,7 +1754,7 @@ private int UpdateUpdatedRows(nwindDataSet dataSet, global::System.Collections.G ///Insert rows in top-down order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private int UpdateInsertedRows(nwindDataSet dataSet, global::System.Collections.Generic.List allAddedRows) { int result = 0; if ((this._productsTableAdapter != null)) { @@ -1772,7 +1772,7 @@ private int UpdateInsertedRows(nwindDataSet dataSet, global::System.Collections. ///Delete rows in bottom-up order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private int UpdateDeletedRows(nwindDataSet dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; if ((this._productsTableAdapter != null)) { @@ -1790,7 +1790,7 @@ private int UpdateDeletedRows(nwindDataSet dataSet, global::System.Collections.G ///Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private global::System.Data.DataRow[] GetRealUpdatedRows(global::System.Data.DataRow[] updatedRows, global::System.Collections.Generic.List allAddedRows) { if (((updatedRows == null) || (updatedRows.Length < 1))) { @@ -1814,7 +1814,7 @@ private int UpdateDeletedRows(nwindDataSet dataSet, global::System.Collections.G ///Update all changes to the dataset. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public virtual int UpdateAll(nwindDataSet dataSet) { if ((dataSet == null)) { throw new global::System.ArgumentNullException("dataSet"); @@ -1943,13 +1943,13 @@ public virtual int UpdateAll(nwindDataSet dataSet) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] protected virtual void SortSelfReferenceRows(global::System.Data.DataRow[] rows, global::System.Data.DataRelation relation, bool childFirst) { global::System.Array.Sort(rows, new SelfReferenceComparer(relation, childFirst)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] protected virtual bool MatchTableAdapterConnection(global::System.Data.IDbConnection inputConnection) { if ((this._connection != null)) { return true; @@ -1967,7 +1967,7 @@ protected virtual bool MatchTableAdapterConnection(global::System.Data.IDbConnec /// ///Update Order Option /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public enum UpdateOrderOption { InsertUpdateDelete = 0, @@ -1978,7 +1978,7 @@ public enum UpdateOrderOption { /// ///Used to sort self-referenced table's rows /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private class SelfReferenceComparer : object, global::System.Collections.Generic.IComparer { private global::System.Data.DataRelation _relation; @@ -1986,7 +1986,7 @@ private class SelfReferenceComparer : object, global::System.Collections.Generic private int _childFirst; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] internal SelfReferenceComparer(global::System.Data.DataRelation relation, bool childFirst) { this._relation = relation; if (childFirst) { @@ -1998,7 +1998,7 @@ internal SelfReferenceComparer(global::System.Data.DataRelation relation, bool c } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private global::System.Data.DataRow GetRoot(global::System.Data.DataRow row, out int distance) { global::System.Diagnostics.Debug.Assert((row != null)); global::System.Data.DataRow root = row; @@ -2037,7 +2037,7 @@ internal SelfReferenceComparer(global::System.Data.DataRelation relation, bool c } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int Compare(global::System.Data.DataRow row1, global::System.Data.DataRow row2) { if (object.ReferenceEquals(row1, row2)) { return 0; diff --git a/VB/MinimalisticReportPreviewDemo.sln b/VB/MinimalisticReportPreviewDemo.sln deleted file mode 100644 index 76c4a9d..0000000 --- a/VB/MinimalisticReportPreviewDemo.sln +++ /dev/null @@ -1,19 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MinimalisticReportPreviewDemo", "MinimalisticReportPreviewDemo\MinimalisticReportPreviewDemo.vbproj", "{03842F9F-5A5D-4B93-9165-A9B9D325709C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {03842F9F-5A5D-4B93-9165-A9B9D325709C}.Debug|x86.ActiveCfg = Debug|x86 - {03842F9F-5A5D-4B93-9165-A9B9D325709C}.Debug|x86.Build.0 = Debug|x86 - {03842F9F-5A5D-4B93-9165-A9B9D325709C}.Release|x86.ActiveCfg = Release|x86 - {03842F9F-5A5D-4B93-9165-A9B9D325709C}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/VB/MinimalisticReportPreviewDemo/Application.xaml b/VB/MinimalisticReportPreviewDemo/Application.xaml deleted file mode 100644 index f753f03..0000000 --- a/VB/MinimalisticReportPreviewDemo/Application.xaml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/VB/MinimalisticReportPreviewDemo/Application.xaml.vb b/VB/MinimalisticReportPreviewDemo/Application.xaml.vb deleted file mode 100644 index 3ca405c..0000000 --- a/VB/MinimalisticReportPreviewDemo/Application.xaml.vb +++ /dev/null @@ -1,16 +0,0 @@ -Imports System -Imports System.Collections.Generic -Imports System.Configuration -Imports System.Data -Imports System.Linq -Imports System.Windows - -Namespace MinimalisticReportPreviewDemo - ''' - ''' Interaction logic for App.xaml - ''' - Partial Public Class App - Inherits Application - - End Class -End Namespace diff --git a/VB/MinimalisticReportPreviewDemo/MainWindow.xaml b/VB/MinimalisticReportPreviewDemo/MainWindow.xaml deleted file mode 100644 index 71147ee..0000000 --- a/VB/MinimalisticReportPreviewDemo/MainWindow.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - -