diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 02ee7aa..e1c7ee2 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -106,6 +106,8 @@ namespace AppData { private StatusDecodeDataTable tableStatusDecode; + private UpdManDataTable tableUpdMan; + private global::System.Data.DataRelation relationFK_ItemList_Materials1; private global::System.Data.DataRelation relationFK_OffOrd2Item_OfflineOrderList; @@ -281,6 +283,9 @@ namespace AppData { if ((ds.Tables["StatusDecode"] != null)) { base.Tables.Add(new StatusDecodeDataTable(ds.Tables["StatusDecode"])); } + if ((ds.Tables["UpdMan"] != null)) { + base.Tables.Add(new UpdManDataTable(ds.Tables["UpdMan"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -709,6 +714,16 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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 UpdManDataTable UpdMan { + get { + return this.tableUpdMan; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -899,6 +914,9 @@ namespace AppData { if ((ds.Tables["StatusDecode"] != null)) { base.Tables.Add(new StatusDecodeDataTable(ds.Tables["StatusDecode"])); } + if ((ds.Tables["UpdMan"] != null)) { + base.Tables.Add(new UpdManDataTable(ds.Tables["UpdMan"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -1178,6 +1196,12 @@ namespace AppData { this.tableStatusDecode.InitVars(); } } + this.tableUpdMan = ((UpdManDataTable)(base.Tables["UpdMan"])); + if ((initTable == true)) { + if ((this.tableUpdMan != null)) { + this.tableUpdMan.InitVars(); + } + } this.relationFK_ItemList_Materials1 = this.Relations["FK_ItemList_Materials1"]; this.relationFK_OffOrd2Item_OfflineOrderList = this.Relations["FK_OffOrd2Item_OfflineOrderList"]; this.relationFK_ItemList_KitList = this.Relations["FK_ItemList_KitList"]; @@ -1282,6 +1306,8 @@ namespace AppData { base.Tables.Add(this.tableStatusLog); this.tableStatusDecode = new StatusDecodeDataTable(); base.Tables.Add(this.tableStatusDecode); + this.tableUpdMan = new UpdManDataTable(); + base.Tables.Add(this.tableUpdMan); this.relationFK_ItemList_Materials1 = new global::System.Data.DataRelation("FK_ItemList_Materials1", new global::System.Data.DataColumn[] { this.tableMaterials.MatIDColumn}, new global::System.Data.DataColumn[] { this.tableItemList.MatIDColumn}, false); @@ -1578,6 +1604,12 @@ namespace AppData { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private bool ShouldSerializeUpdMan() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -1756,6 +1788,9 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void StatusDecodeRowChangeEventHandler(object sender, StatusDecodeRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public delegate void UpdManRowChangeEventHandler(object sender, UpdManRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -18332,6 +18367,328 @@ namespace AppData { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class UpdManDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnAppName; + + private global::System.Data.DataColumn columnManifestUrl; + + private global::System.Data.DataColumn columnIsAuth; + + private global::System.Data.DataColumn columnLocalRepo; + + private global::System.Data.DataColumn columnPackName; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public UpdManDataTable() { + this.TableName = "UpdMan"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal UpdManDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected UpdManDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn AppNameColumn { + get { + return this.columnAppName; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ManifestUrlColumn { + get { + return this.columnManifestUrl; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn IsAuthColumn { + get { + return this.columnIsAuth; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn LocalRepoColumn { + get { + return this.columnLocalRepo; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn PackNameColumn { + get { + return this.columnPackName; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public UpdManRow this[int index] { + get { + return ((UpdManRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event UpdManRowChangeEventHandler UpdManRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event UpdManRowChangeEventHandler UpdManRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event UpdManRowChangeEventHandler UpdManRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event UpdManRowChangeEventHandler UpdManRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void AddUpdManRow(UpdManRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public UpdManRow AddUpdManRow(string AppName, string ManifestUrl, bool IsAuth, string LocalRepo, string PackName) { + UpdManRow rowUpdManRow = ((UpdManRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + AppName, + ManifestUrl, + IsAuth, + LocalRepo, + PackName}; + rowUpdManRow.ItemArray = columnValuesArray; + this.Rows.Add(rowUpdManRow); + return rowUpdManRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public UpdManRow FindByAppName(string AppName) { + return ((UpdManRow)(this.Rows.Find(new object[] { + AppName}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public override global::System.Data.DataTable Clone() { + UpdManDataTable cln = ((UpdManDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new UpdManDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal void InitVars() { + this.columnAppName = base.Columns["AppName"]; + this.columnManifestUrl = base.Columns["ManifestUrl"]; + this.columnIsAuth = base.Columns["IsAuth"]; + this.columnLocalRepo = base.Columns["LocalRepo"]; + this.columnPackName = base.Columns["PackName"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitClass() { + this.columnAppName = new global::System.Data.DataColumn("AppName", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnAppName); + this.columnManifestUrl = new global::System.Data.DataColumn("ManifestUrl", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnManifestUrl); + this.columnIsAuth = new global::System.Data.DataColumn("IsAuth", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnIsAuth); + this.columnLocalRepo = new global::System.Data.DataColumn("LocalRepo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnLocalRepo); + this.columnPackName = new global::System.Data.DataColumn("PackName", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnPackName); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnAppName}, true)); + this.columnAppName.AllowDBNull = false; + this.columnAppName.Unique = true; + this.columnAppName.MaxLength = 50; + this.columnManifestUrl.AllowDBNull = false; + this.columnManifestUrl.MaxLength = 250; + this.columnIsAuth.AllowDBNull = false; + this.columnLocalRepo.AllowDBNull = false; + this.columnLocalRepo.MaxLength = 250; + this.columnPackName.AllowDBNull = false; + this.columnPackName.MaxLength = 50; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public UpdManRow NewUpdManRow() { + return ((UpdManRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new UpdManRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(UpdManRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.UpdManRowChanged != null)) { + this.UpdManRowChanged(this, new UpdManRowChangeEvent(((UpdManRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.UpdManRowChanging != null)) { + this.UpdManRowChanging(this, new UpdManRowChangeEvent(((UpdManRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.UpdManRowDeleted != null)) { + this.UpdManRowDeleted(this, new UpdManRowChangeEvent(((UpdManRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.UpdManRowDeleting != null)) { + this.UpdManRowDeleting(this, new UpdManRowChangeEvent(((UpdManRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void RemoveUpdManRow(UpdManRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + DS_App ds = new DS_App(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "UpdManDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -26313,6 +26670,76 @@ namespace AppData { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class UpdManRow : global::System.Data.DataRow { + + private UpdManDataTable tableUpdMan; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal UpdManRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableUpdMan = ((UpdManDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string AppName { + get { + return ((string)(this[this.tableUpdMan.AppNameColumn])); + } + set { + this[this.tableUpdMan.AppNameColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string ManifestUrl { + get { + return ((string)(this[this.tableUpdMan.ManifestUrlColumn])); + } + set { + this[this.tableUpdMan.ManifestUrlColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsAuth { + get { + return ((bool)(this[this.tableUpdMan.IsAuthColumn])); + } + set { + this[this.tableUpdMan.IsAuthColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string LocalRepo { + get { + return ((string)(this[this.tableUpdMan.LocalRepoColumn])); + } + set { + this[this.tableUpdMan.LocalRepoColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string PackName { + get { + return ((string)(this[this.tableUpdMan.PackNameColumn])); + } + set { + this[this.tableUpdMan.PackNameColumn] = value; + } + } + } + /// ///Row event argument class /// @@ -27706,6 +28133,40 @@ namespace AppData { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public class UpdManRowChangeEvent : global::System.EventArgs { + + private UpdManRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public UpdManRowChangeEvent(UpdManRow 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", "16.0.0.0")] + public UpdManRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace AppData.DS_AppTableAdapters { @@ -41950,6 +42411,234 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class UpdManTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public UpdManTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "UpdMan"; + tableMapping.ColumnMappings.Add("AppName", "AppName"); + tableMapping.ColumnMappings.Add("ManifestUrl", "ManifestUrl"); + tableMapping.ColumnMappings.Add("IsAuth", "IsAuth"); + tableMapping.ColumnMappings.Add("LocalRepo", "LocalRepo"); + tableMapping.ColumnMappings.Add("PackName", "PackName"); + this._adapter.TableMappings.Add(tableMapping); + this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.DeleteCommand.Connection = this.Connection; + this._adapter.DeleteCommand.CommandText = "DELETE FROM [UpdateMan] WHERE (([AppName] = @Original_AppName))"; + this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_AppName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "AppName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.InsertCommand.Connection = this.Connection; + this._adapter.InsertCommand.CommandText = "INSERT INTO [UpdateMan] ([AppName], [ManifestUrl], [IsAuth], [LocalRepo], [PackNa" + + "me]) VALUES (@AppName, @ManifestUrl, @IsAuth, @LocalRepo, @PackName);\r\nSELECT Ap" + + "pName, ManifestUrl, IsAuth, LocalRepo, PackName FROM UpdateMan WHERE (AppName = " + + "@AppName)"; + this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AppName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "AppName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ManifestUrl", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ManifestUrl", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsAuth", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IsAuth", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LocalRepo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "LocalRepo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PackName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "PackName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.UpdateCommand.Connection = this.Connection; + this._adapter.UpdateCommand.CommandText = @"UPDATE [UpdateMan] SET [AppName] = @AppName, [ManifestUrl] = @ManifestUrl, [IsAuth] = @IsAuth, [LocalRepo] = @LocalRepo, [PackName] = @PackName WHERE (([AppName] = @Original_AppName)); +SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName FROM UpdateMan WHERE (AppName = @AppName)"; + this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AppName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "AppName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ManifestUrl", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ManifestUrl", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsAuth", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IsAuth", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LocalRepo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "LocalRepo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PackName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "PackName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_AppName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "AppName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::AppData.Properties.Settings.Default.Sauder_NKCConnectionString; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "SELECT * FROM UpdateMan"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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(DS_App.UpdManDataTable dataTable) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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 DS_App.UpdManDataTable GetData() { + this.Adapter.SelectCommand = this.CommandCollection[0]; + DS_App.UpdManDataTable dataTable = new DS_App.UpdManDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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(DS_App.UpdManDataTable dataTable) { + return this.Adapter.Update(dataTable); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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(DS_App dataSet) { + return this.Adapter.Update(dataSet, "UpdMan"); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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[] { + dataRow}); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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); + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// @@ -41992,6 +42681,8 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( private StatusDecodeTableAdapter _statusDecodeTableAdapter; + private UpdManTableAdapter _updManTableAdapter; + private bool _backupDataSetBeforeUpdate; private global::System.Data.IDbConnection _connection; @@ -42217,6 +42908,20 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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")] + public UpdManTableAdapter UpdManTableAdapter { + get { + return this._updManTableAdapter; + } + set { + this._updManTableAdapter = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool BackupDataSetBeforeUpdate { @@ -42296,6 +43001,10 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( && (this._statusDecodeTableAdapter.Connection != null))) { return this._statusDecodeTableAdapter.Connection; } + if (((this._updManTableAdapter != null) + && (this._updManTableAdapter.Connection != null))) { + return this._updManTableAdapter.Connection; + } return null; } set { @@ -42354,6 +43063,9 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( if ((this._statusDecodeTableAdapter != null)) { count = (count + 1); } + if ((this._updManTableAdapter != null)) { + count = (count + 1); + } return count; } } @@ -42419,57 +43131,12 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( allChangedRows.AddRange(updatedRows); } } - if ((this._remnantsTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._offOrd2ItemTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._remnantsTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._itemValidationTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.ItemValidation.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._itemValidationTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._errorsLogTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._errorsLogTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._countersTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._countersTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._order2FinalKitTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._order2FinalKitTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._binListTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.BinList.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._binListTableAdapter.Update(updatedRows)); + result = (result + this._offOrd2ItemTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -42482,12 +43149,39 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( allChangedRows.AddRange(updatedRows); } } - if ((this._offOrd2ItemTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._binListTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.BinList.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._offOrd2ItemTableAdapter.Update(updatedRows)); + result = (result + this._binListTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._order2FinalKitTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._order2FinalKitTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._errorsLogTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._errorsLogTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._itemValidationTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.ItemValidation.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._itemValidationTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -42500,6 +43194,33 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( allChangedRows.AddRange(updatedRows); } } + if ((this._remnantsTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._remnantsTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._countersTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._countersTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._updManTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._updManTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } return result; } @@ -42558,51 +43279,11 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( allAddedRows.AddRange(addedRows); } } - if ((this._remnantsTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._offOrd2ItemTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._remnantsTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._itemValidationTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.ItemValidation.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._itemValidationTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._errorsLogTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._errorsLogTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._countersTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._countersTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._order2FinalKitTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._order2FinalKitTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._binListTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.BinList.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._binListTableAdapter.Update(addedRows)); + result = (result + this._offOrd2ItemTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -42614,11 +43295,35 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( allAddedRows.AddRange(addedRows); } } - if ((this._offOrd2ItemTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._binListTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.BinList.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._offOrd2ItemTableAdapter.Update(addedRows)); + result = (result + this._binListTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._order2FinalKitTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._order2FinalKitTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._errorsLogTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._errorsLogTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._itemValidationTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.ItemValidation.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._itemValidationTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -42630,6 +43335,30 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( allAddedRows.AddRange(addedRows); } } + if ((this._remnantsTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._remnantsTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._countersTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._countersTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._updManTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._updManTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } return result; } @@ -42640,43 +43369,11 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private int UpdateDeletedRows(DS_App dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; - if ((this._statusDecodeTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._updManTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._statusDecodeTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._offOrd2ItemTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._offOrd2ItemTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._nestingTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Nesting.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._nestingTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._binListTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.BinList.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._binListTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._order2FinalKitTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._order2FinalKitTableAdapter.Update(deletedRows)); + result = (result + this._updManTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -42688,11 +43385,19 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( allChangedRows.AddRange(deletedRows); } } - if ((this._errorsLogTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._remnantsTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._errorsLogTableAdapter.Update(deletedRows)); + result = (result + this._remnantsTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._statusDecodeTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._statusDecodeTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -42704,11 +43409,43 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( allChangedRows.AddRange(deletedRows); } } - if ((this._remnantsTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._errorsLogTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._remnantsTableAdapter.Update(deletedRows)); + result = (result + this._errorsLogTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._order2FinalKitTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._order2FinalKitTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._binListTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.BinList.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._binListTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._nestingTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Nesting.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._nestingTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._offOrd2ItemTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._offOrd2ItemTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -42874,6 +43611,11 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + "tring."); } + if (((this._updManTableAdapter != null) + && (this.MatchTableAdapterConnection(this._updManTableAdapter.Connection) == false))) { + throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + + "tring."); + } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { throw new global::System.ApplicationException("TableAdapterManager contains no connection information. Set each TableAdapterMana" + @@ -43041,6 +43783,15 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( adaptersWithAcceptChangesDuringUpdate.Add(this._statusDecodeTableAdapter.Adapter); } } + if ((this._updManTableAdapter != null)) { + revertConnections.Add(this._updManTableAdapter, this._updManTableAdapter.Connection); + this._updManTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); + this._updManTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); + if (this._updManTableAdapter.Adapter.AcceptChangesDuringUpdate) { + this._updManTableAdapter.Adapter.AcceptChangesDuringUpdate = false; + adaptersWithAcceptChangesDuringUpdate.Add(this._updManTableAdapter.Adapter); + } + } // //---- Perform updates ----------- // @@ -43159,6 +43910,10 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( this._statusDecodeTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._statusDecodeTableAdapter])); this._statusDecodeTableAdapter.Transaction = null; } + if ((this._updManTableAdapter != null)) { + this._updManTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._updManTableAdapter])); + this._updManTableAdapter.Transaction = null; + } if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) { global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count]; adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters); diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 1378851..74fb08a 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -322,7 +322,7 @@ FROM v_BatchList - + dbo.stp_Batch_updatePlaceCod @@ -334,7 +334,7 @@ FROM v_BatchList - + dbo.stp_Batch_updateSchedPrior @@ -346,7 +346,7 @@ FROM v_BatchList - + dbo.stp_Batch_updateStatus @@ -3567,6 +3567,61 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( + + + + + + DELETE FROM [UpdateMan] WHERE (([AppName] = @Original_AppName)) + + + + + + + + INSERT INTO [UpdateMan] ([AppName], [ManifestUrl], [IsAuth], [LocalRepo], [PackName]) VALUES (@AppName, @ManifestUrl, @IsAuth, @LocalRepo, @PackName); +SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName FROM UpdateMan WHERE (AppName = @AppName) + + + + + + + + + + + + SELECT * FROM UpdateMan + + + + + + UPDATE [UpdateMan] SET [AppName] = @AppName, [ManifestUrl] = @ManifestUrl, [IsAuth] = @IsAuth, [LocalRepo] = @LocalRepo, [PackName] = @PackName WHERE (([AppName] = @Original_AppName)); +SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName FROM UpdateMan WHERE (AppName = @AppName) + + + + + + + + + + + + + + + + + + + + + @@ -3575,7 +3630,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -3633,7 +3688,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -3658,7 +3713,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -3713,7 +3768,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -3786,7 +3841,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -3855,7 +3910,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -3888,7 +3943,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -3960,7 +4015,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -3979,7 +4034,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4010,7 +4065,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4018,7 +4073,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4035,7 +4090,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4044,7 +4099,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4075,7 +4130,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4083,7 +4138,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4099,7 +4154,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4107,7 +4162,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4135,7 +4190,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4171,7 +4226,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4187,7 +4242,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4197,7 +4252,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4214,7 +4269,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4227,7 +4282,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4276,7 +4331,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4305,7 +4360,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4347,7 +4402,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4458,7 +4513,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4521,7 +4576,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4566,7 +4621,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4592,7 +4647,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4685,7 +4740,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4748,7 +4803,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4807,7 +4862,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4856,7 +4911,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4895,7 +4950,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4948,7 +5003,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4965,7 +5020,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -4978,7 +5033,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -5000,7 +5055,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -5028,7 +5083,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -5065,7 +5120,7 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( - + @@ -5099,6 +5154,41 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5262,21 +5352,25 @@ SELECT Station, Code, Descript, Css FROM StatusDecode WHERE (Code = @Code) AND ( + + + + - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index a0815bd..515d865 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,12 +11,9 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=410']) { - // env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) - env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') - env.versionNumberBeta = VersionNumber(versionNumberString : '1.3.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') - env.APP_NAME = 'NKC' - } + env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + env.versionNumberdevelop = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}-develop.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + env.APP_NAME = 'NKC' } script { currentBuild.displayName = "${env.versionNumber}" @@ -47,7 +44,7 @@ pipeline { parallel ( NKC_SITE: { sleep 0 - bat "\"${tool 'MSBuild-16.0'}\" NKC_WF/NKC_WF.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" + bat "\"${tool 'MSBuild-16.0'}\" NKC_WF/NKC_WF.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /p:verbosity=minimal /m" }, failFast: false) } @@ -74,7 +71,7 @@ pipeline { { sleep 1 // SITE - bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=16.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj" + bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=16.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=minimal NKC_WF/NKC_WF.csproj" sleep 3 } }, @@ -87,7 +84,7 @@ pipeline { { sleep 3 // SITE - bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:VisualStudioVersion=16.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj" + bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:VisualStudioVersion=16.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=minimal NKC_WF/NKC_WF.csproj" sleep 1 } }, @@ -112,51 +109,69 @@ pipeline { } // ora mi occupo delle operazioni di compressione e copia... script { - /* compilo installers SOLO stable / beta */ - if (env.BRANCH_NAME == "stable" || env.BRANCH_NAME.contains("beta") ) { - // calcolo il config... - if (env.BRANCH_NAME == "beta") { - env.config = "Debug" - env.classifier = "unstable" - } - else if (env.BRANCH_NAME == "stable") { - env.config = "Release" - env.classifier = "" - } - + /* compilo installers SOLO master / develop */ + if (env.BRANCH_NAME == "master" || env.BRANCH_NAME.contains("develop") ) { + parallel ( - SITE_NKC: { + NKC_UPLOAD: { sleep 0 // SITE - bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=16.0 /p:RunCodeAnalysis=false /p:AutoParameterizationWebConfigConnectionStrings=False /p:PackageLocation=Releases/${env.BRANCH_NAME}/NKC.zip /p:DeployIisAppPath=\"Default Web Site/NKC\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj" - // pubblico su server deploy! + bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=16.0 /p:RunCodeAnalysis=false /p:AutoParameterizationWebConfigConnectionStrings=False /p:PackageLocation=Releases/${env.BRANCH_NAME}/NKC.zip /p:DeployIisAppPath=\"Default Web Site/NKC\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:verbosity=minimal NKC_WF/NKC_WF.csproj" + setManifestFile("NKC_WF\\", "NKC") + + // ---------- Upload versione 0 ---------- + nexusArtifactUploader ( + artifacts: [ + [ + artifactId: 'NKC', + classifier: '', + file: "NKC_WF\\Resources\\manifest.xml", + type: 'xml' + ], + [ + artifactId: 'NKC', + classifier: '', + file: "NKC_WF\\Resources\\ChangeLog.html", + type: 'html' + ] + ] + ,credentialsId: 'bc9d8e92-4302-3266-817f-7b58501d12d5' + ,nexusUrl: 'nexus.steamware.net' + ,nexusVersion: 'nexus3' + ,protocol: 'http' + ,repository: 'SWS' + ,groupId: "NKC.${env.BRANCH_NAME}.LAST" + ,version: "" + ) + + // ---------- Upload versione effettiva ---------- publishToDeployServer("NKC_WF\\", "c:\\inetpub\\wwwroot\\SWS\\", "NKC") nexusArtifactUploader ( artifacts: [ [ artifactId: 'NKC', - classifier: "${env.classifier}", + classifier: '', file: "NKC_WF\\Releases\\${env.BRANCH_NAME}\\NKC.zip", type: 'zip' ] - ], - credentialsId: 'bc9d8e92-4302-3266-817f-7b58501d12d5', - //groupId: 'MP', - nexusUrl: 'nexus.steamware.net', - nexusVersion: 'nexus3', - protocol: 'http', - repository: 'SWS', - version: "${env.versionNumber}" + ] + ,credentialsId: 'bc9d8e92-4302-3266-817f-7b58501d12d5' + ,nexusUrl: 'nexus.steamware.net' + ,nexusVersion: 'nexus3' + ,protocol: 'http' + ,repository: 'SWS' + ,groupId: "NKC.${env.BRANCH_NAME}.ARCHIVE" + ,version: "${env.versionNumber}" ) }, failFast: false) } - /* preparo nuget pkg dell'SDK ma solo x branch SDK / beta */ - else if (env.BRANCH_NAME == "SDK" || env.BRANCH_NAME.contains("beta") ) { + /* preparo nuget pkg dell'SDK ma solo x branch SDK / develop */ + else if (env.BRANCH_NAME == "SDK" || env.BRANCH_NAME.contains("develop") ) { // calcolo il config... - if (env.BRANCH_NAME == "beta") { + if (env.BRANCH_NAME == "develop") { env.config = "Debug" - env.packVers = env.versionNumberBeta + env.packVers = env.versionNumberdevelop } else if (env.BRANCH_NAME == "SDK") { env.config = "Release" @@ -166,7 +181,7 @@ pipeline { bat "del /f /q *.nupkg" // BUILD! bat "\"${tool 'MSBuild-16.0'}\" NKC_SDK\\NKC_SDK.csproj -target:Build /p:Configuration=${env.config} /p:Platform=\"Any CPU\" /p:OutputPath=bin/${env.config} /m" - // creo package NuGet... con version in modo da fare ANCHE le beta + // creo package NuGet... con version in modo da fare ANCHE le develop(beta) bat "e:\\nuget.exe pack ${WORKSPACE}\\NKC_SDK\\NKC_SDK.csproj -properties Configuration=${env.config} -Version ${env.packVers}" // lancio upload con nuget! @@ -198,26 +213,31 @@ pipeline { } } -// Funzione x pubblicazione su server IIS di deploy -def publishToDeployServer(prjPath, iisPath, packName) { - echo "Richiesto esecuzione publishToDeployServer con parametri: " + prjPath + " | " + iisPath + " | " + packName +// Funzione sistemazione file PRIMA del deploy nexus/IIS +def setManifestFile(prjPath, packName) { + echo "Richiesto esecuzione setManifestFile con parametri: " + prjPath + " | " + packName // inizio copiando files di base da area VersGen... - bat "xcopy /y VersGen\\ChangeLog.html " + prjPath + "Resources\\ChangeLog.html " - bat "xcopy /y VersGen\\logoSteamware.png " + prjPath + "Resources\\logoSteamware.png " - bat "xcopy /y VersGen\\manifest.xml " + prjPath + "Resources\\manifest.xml " + bat "xcopy /y VersGen\\ChangeLog.html " + prjPath + "Resources\\ChangeLog.html " + bat "xcopy /y VersGen\\logoSteamware.png " + prjPath + "Resources\\logoSteamware.png " + bat "xcopy /y VersGen\\manifest.xml " + prjPath + "Resources\\manifest.xml " // manifest.xml: aggiorno versNumber ed URL del branch di update... - bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml 0.0.0.0 ${env.versionNumber} || EXIT /B 0" + bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml {{VERS}} ${env.versionNumber} || EXIT /B 0" bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml {{BRANCHNAME}} ${env.BRANCH_NAME} || EXIT /B 0" bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml {{PACKNAME}} " + packName + " || EXIT /B 0" bat "e:\\fart.exe " + prjPath + "Resources\\ChangeLog.html {{CURRENT-REL}} ${env.versionNumber} || EXIT /B 0" writeFile file: prjPath + 'changeLog.log', text: "${getChangeString()}" powershell '(Get-Content ' + prjPath + 'Resources\\ChangeLog.html) | ForEach-Object { $_ -replace \"{{LAST-CHANGES}}\", \"${getChangeString()}\" } | Set-Content ' + prjPath + 'Resources\\ChangeLog.html' + // salvo copia della versione... + bat "xcopy /y " + prjPath + "\\Releases\\${env.BRANCH_NAME}\\* E:\\Staging\\byProd\\MP\\${env.BRANCH_NAME}\\" + packName + "\\${env.versionNumber}\\ " +} + +// Funzione x pubblicazione su server IIS di deploy +def publishToDeployServer(prjPath, iisPath, packName) { + echo "Richiesto esecuzione publishToDeployServer con parametri: " + prjPath + " | " + iisPath + " | " + packName // copio ed esporto in IIS02 i vari files .xml, .html, .zip bat "xcopy /y " + prjPath + "Resources\\manifest.xml " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " bat "xcopy /y " + prjPath + "Resources\\ChangeLog.html " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " - bat "xcopy /y " + prjPath + "Resources\\logoSteamware.png " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " - // salvo copia della versione... - bat "xcopy /y " + prjPath + "\\Releases\\${env.BRANCH_NAME}\\* E:\\Staging\\byProd\\MP\\${env.BRANCH_NAME}\\" + packName + "\\${env.versionNumber}\\ " + bat "xcopy /y " + prjPath + "Resources\\logoSteamware.png " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " // copio x AutoUpdate deploy bat "xcopy /y " + prjPath + "\\Releases\\${env.BRANCH_NAME}\\" + packName + ".zip " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " } @@ -255,18 +275,6 @@ def sendSlack(status, colorCode) { ) } -// // Funzione x invio slack -// def sendGitlab(status) { -// gitlabCommitStatus( -// builds: status, -// [[connection: gitLabConnection('Gitlab'), -// projectId: '1', -// revisionHash: '']] -// ){ -// // some block -// } -// } - // funzione x fix pacchetti nuget da NOSTRO repo Nexus con proxy def fixNuget(solutionFile) { // bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-group" diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index 9944203..251c577 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -62,7 +62,8 @@ - + + diff --git a/NKC_WF/site/UpdMan.aspx b/NKC_WF/site/UpdMan.aspx index 0c3509a..5ad75d1 100644 --- a/NKC_WF/site/UpdMan.aspx +++ b/NKC_WF/site/UpdMan.aspx @@ -31,7 +31,7 @@

NKC

- <%: Version("NKC") %> + <%: Version("NKC", true) %>
@@ -41,7 +41,7 @@

ZCode

- <%: Version("ZCODE") %> + <%: Version("ZCODE", true) %>
@@ -61,7 +61,7 @@
- <%: traduci("TaskRunning") %> + <%: traduci("TaskRunning") %>
diff --git a/NKC_WF/site/UpdMan.aspx.cs b/NKC_WF/site/UpdMan.aspx.cs index 9e9e474..97b1e6d 100644 --- a/NKC_WF/site/UpdMan.aspx.cs +++ b/NKC_WF/site/UpdMan.aspx.cs @@ -54,8 +54,12 @@ namespace NKC_WF.site { int done = 0; // scarico TUTTI... - done += UpdateMan.obj.downloadLatest(updateUrl("NKC"), localDownloadPath("NKC"), "NKC"); + done += updManAuth.downloadLatest(updateUrlAuth("NKC"), localDownloadPath("NKC"), "NKC"); done += UpdateMan.obj.downloadLatest(updateUrl("ZCODE"), localDownloadPath("ZCODE"), "ZCODE"); + + // versione IIS + //done += UpdateMan.obj.downloadLatest(updateUrl("NKC"), localDownloadPath("NKC"), "NKC"); + //done += UpdateMan.obj.downloadLatest(updateUrl("ZCODE"), localDownloadPath("ZCODE"), "ZCODE"); stopWatch.Stop(); // calcolo elapsed time come TimeSpan value. TimeSpan ts = stopWatch.Elapsed; @@ -74,12 +78,15 @@ namespace NKC_WF.site lblOut.Text = resultsMsg; } - public string Version(object package) + public string Version(object package, object authUrl) { - string answ = "a.b.c.d"; UpdateInfoEventArgs updArgs = new UpdateInfoEventArgs(); - // Recupero info ADM... - updArgs = UpdateMan.obj.getUpdateInfo(updateUrl(package.ToString())); + string answ = "a.b.c.d"; + bool isAuth = false; + bool.TryParse($"{authUrl}", out isAuth); + string remoteUrl = isAuth ? updateUrlAuth($"{package}") : updateUrl($"{package}"); + // Recupero info... + updArgs = UpdateMan.obj.getUpdateInfo(remoteUrl); if (updArgs.IsUpdateAvailable) { answ = updArgs.CurrentVersion.ToString(); @@ -87,6 +94,11 @@ namespace NKC_WF.site return answ; } + /// + /// Controller versioni e download autenticato + /// + protected UpdateMan updManAuth = new UpdateMan("SWDownloader", "viaD@nte16"); + /// /// URLK stringa di UPDATE... /// @@ -94,7 +106,13 @@ namespace NKC_WF.site { return string.Format("http://seriate.steamware.net:8083/SWS/{0}/{1}/manifest.xml", package, memLayer.ML.CRS("appVers")); } - + /// + /// URL stringa di UPDATE su area che richiede Auth (nexus.steamware.net)... + /// + protected string updateUrlAuth(string package) + { + return string.Format("http://nexus.steamware.net/repository/SWS/{0}/{1}/LAST/{0}/{0}-.xml", package, memLayer.ML.CRS("appVers")); + } /// /// Path locale dove scaricare gli installer /// diff --git a/NKC_WF/site/UpdMan.aspx.designer.cs b/NKC_WF/site/UpdMan.aspx.designer.cs index 9a21335..2163659 100644 --- a/NKC_WF/site/UpdMan.aspx.designer.cs +++ b/NKC_WF/site/UpdMan.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace NKC_WF.site @@ -15,56 +15,56 @@ namespace NKC_WF.site { /// - /// Controllo lbtDownloadAll. + /// lbtDownloadAll control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtDownloadAll; /// - /// Controllo lbtDownloadNKC. + /// lbtDownloadNKC control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtDownloadNKC; /// - /// Controllo lbtDownloadZCode. + /// lbtDownloadZCode control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtDownloadZCode; /// - /// Controllo hlLPA. + /// hlLPA control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink hlLPA; /// - /// Controllo UpdateProgressDisplay. + /// UpdateProgressDisplay control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.UpdateProgress UpdateProgressDisplay; /// - /// Controllo lblOut. + /// lblOut control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblOut; } diff --git a/VersGen/ChangeLog.html b/VersGen/ChangeLog.html index 94bdf5b..4446dbf 100644 --- a/VersGen/ChangeLog.html +++ b/VersGen/ChangeLog.html @@ -8,6 +8,24 @@ Last Changes:
    {{LAST-CHANGES}}
+
  • + v.2.0.* → +
      +
    • Multi machine setup (NE01/NE02)
      • +
    +
    • +
  • + v.1.3.* → +
      +
    • DXF Testing
      • +
    +
    • +
  • + v.1.0.* → +
      +
    • Production Ready
      • +
    +
  • v.11.* →
      diff --git a/VersGen/VersGen.csproj b/VersGen/VersGen.csproj index 6e3dd62..fbd53ea 100644 --- a/VersGen/VersGen.csproj +++ b/VersGen/VersGen.csproj @@ -55,6 +55,9 @@ Always + + Always + Always diff --git a/VersGen/manifest.IIS.xml b/VersGen/manifest.IIS.xml new file mode 100644 index 0000000..dd7eb83 --- /dev/null +++ b/VersGen/manifest.IIS.xml @@ -0,0 +1,7 @@ + + + 0.0.0.0 + http://seriate.steamware.net:8083/SWS/NKC/{{BRANCHNAME}}/{{PACKNAME}}.zip + http://seriate.steamware.net:8083/SWS/NKC/{{BRANCHNAME}}/ChangeLog.html + false + \ No newline at end of file diff --git a/VersGen/manifest.xml b/VersGen/manifest.xml index dd7eb83..a37b079 100644 --- a/VersGen/manifest.xml +++ b/VersGen/manifest.xml @@ -1,7 +1,7 @@ - 0.0.0.0 - http://seriate.steamware.net:8083/SWS/NKC/{{BRANCHNAME}}/{{PACKNAME}}.zip - http://seriate.steamware.net:8083/SWS/NKC/{{BRANCHNAME}}/ChangeLog.html + {{VERS}} + http://nexus.steamware.net/repository/SWS/NKC/{{BRANCHNAME}}/ARCHIVE/{{PACKNAME}}/{{VERS}}/{{PACKNAME}}-{{VERS}}.zip + http://nexus.steamware.net/repository/SWS/NKC/{{BRANCHNAME}}/LAST/{{PACKNAME}}/{{PACKNAME}}-.html false \ No newline at end of file