From b3f29814ce616709ff9e618668a8518c5308e155 Mon Sep 17 00:00:00 2001 From: Ashot Hambardzumyan <81231604+AshotHambardzumyan@users.noreply.github.com> Date: Mon, 14 Nov 2022 11:29:30 +0400 Subject: [PATCH] Name changed from DataMigrationUtility to DataMigrationUsingFetchXml. (#6) * Name changed from DataMigrationUtility to DataMigrationUsingFetchXml. * Added Author name. --- ...lity.sln => DataMigrationUsingFetchXml.sln | 2 +- .../DataMigrationUsingFetchXml.cs | 12 +-- .../DataMigrationUsingFetchXml.csproj | 22 ++--- .../DataMigrationUsingFetchXmlControl.cs | 76 +++++++++------- ...aMigrationUsingFetchXmlControl.designer.cs | 84 +++++++++--------- .../DataMigrationUsingFetchXmlControl.resx | 12 +++ .../Forms/Popup/Popup.Designer.cs | 2 +- .../Forms/Popup/Popup.cs | 2 +- .../Forms/Popup/Popup.resx | 0 .../Model/ConnectionDetails.cs | 2 +- .../Model/FetchXmlData.cs | 2 +- .../Model/ResultItem.cs | 2 +- .../Properties/AssemblyInfo.cs | 10 +-- ...singFetchXml.Model.FetchXmlData.datasource | 2 +- .../Properties/Resources.Designer.cs | 24 ++--- .../Properties/Resources.resx | 10 +-- .../Resources/Edit.png | Bin .../Resources/Remove.png | Bin .../Resources/clearLogs.jpg | Bin 0 -> 1366 bytes .../Resources/iconPlus30.png | Bin .../Resources/loading.gif | Bin .../Resources/stopMigration.jpg | Bin 0 -> 1703 bytes .../Services/ConfigReader.cs | 2 +- .../Implementations/DataverseService.cs | 6 +- .../Services/Implementations/Logger.cs | 10 ++- .../Implementations/TransferOperation.cs | 6 +- .../Services/Interfaces/IDataverseService.cs | 2 +- .../Services/Interfaces/ILogger.cs | 2 +- .../Services/Interfaces/ITransferOperation.cs | 4 +- .../Settings.cs | 2 +- .../UnityConfig.cs | 8 +- .../app.config | 0 .../packages.config | 0 .../Resources/recycle-bin.png | Bin 944 -> 0 bytes DataMigrationUtility/Resources/stop.png | Bin 664 -> 0 bytes 35 files changed, 167 insertions(+), 139 deletions(-) rename XrmMigrationUtility.sln => DataMigrationUsingFetchXml.sln (87%) rename DataMigrationUtility/DataMigrationUtility.cs => DataMigrationUsingFetchXml/DataMigrationUsingFetchXml.cs (97%) rename DataMigrationUtility/XrmMigrationUtility.csproj => DataMigrationUsingFetchXml/DataMigrationUsingFetchXml.csproj (97%) rename DataMigrationUtility/DataMigrationUtilityControl.cs => DataMigrationUsingFetchXml/DataMigrationUsingFetchXmlControl.cs (84%) rename DataMigrationUtility/DataMigrationUtilityControl.designer.cs => DataMigrationUsingFetchXml/DataMigrationUsingFetchXmlControl.designer.cs (93%) rename DataMigrationUtility/DataMigrationUtilityControl.resx => DataMigrationUsingFetchXml/DataMigrationUsingFetchXmlControl.resx (91%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Forms/Popup/Popup.Designer.cs (99%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Forms/Popup/Popup.cs (99%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Forms/Popup/Popup.resx (100%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Model/ConnectionDetails.cs (87%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Model/FetchXmlData.cs (76%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Model/ResultItem.cs (86%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Properties/AssemblyInfo.cs (83%) rename DataMigrationUtility/Properties/DataSources/XrmMigrationUtility.Model.FetchXmlData.datasource => DataMigrationUsingFetchXml/Properties/DataSources/DataMigrationUsingFetchXml.Model.FetchXmlData.datasource (75%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Properties/Resources.Designer.cs (90%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Properties/Resources.resx (93%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Resources/Edit.png (100%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Resources/Remove.png (100%) create mode 100644 DataMigrationUsingFetchXml/Resources/clearLogs.jpg rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Resources/iconPlus30.png (100%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Resources/loading.gif (100%) create mode 100644 DataMigrationUsingFetchXml/Resources/stopMigration.jpg rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Services/ConfigReader.cs (97%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Services/Implementations/DataverseService.cs (96%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Services/Implementations/Logger.cs (82%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Services/Implementations/TransferOperation.cs (97%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Services/Interfaces/IDataverseService.cs (89%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Services/Interfaces/ILogger.cs (80%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Services/Interfaces/ITransferOperation.cs (84%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/Settings.cs (91%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/UnityConfig.cs (58%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/app.config (100%) rename {DataMigrationUtility => DataMigrationUsingFetchXml}/packages.config (100%) delete mode 100644 DataMigrationUtility/Resources/recycle-bin.png delete mode 100644 DataMigrationUtility/Resources/stop.png diff --git a/XrmMigrationUtility.sln b/DataMigrationUsingFetchXml.sln similarity index 87% rename from XrmMigrationUtility.sln rename to DataMigrationUsingFetchXml.sln index 95d493f..843d598 100644 --- a/XrmMigrationUtility.sln +++ b/DataMigrationUsingFetchXml.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.32630.194 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XrmMigrationUtility", "DataMigrationUtility\XrmMigrationUtility.csproj", "{5FF0A4C5-C5DB-4EBB-B090-4DB274096002}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataMigrationUsingFetchXml", "DataMigrationUsingFetchXml\DataMigrationUsingFetchXml.csproj", "{5FF0A4C5-C5DB-4EBB-B090-4DB274096002}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/DataMigrationUtility/DataMigrationUtility.cs b/DataMigrationUsingFetchXml/DataMigrationUsingFetchXml.cs similarity index 97% rename from DataMigrationUtility/DataMigrationUtility.cs rename to DataMigrationUsingFetchXml/DataMigrationUsingFetchXml.cs index 5e2f124..ecc5b84 100644 --- a/DataMigrationUtility/DataMigrationUtility.cs +++ b/DataMigrationUsingFetchXml/DataMigrationUsingFetchXml.cs @@ -8,13 +8,13 @@ using System.ComponentModel.Composition; using XrmToolBox.Extensibility.Interfaces; -namespace XrmMigrationUtility +namespace DataMigrationUsingFetchXml { // Do not forget to update version number and author (company attribute) in AssemblyInfo.cs class // To generate Base64 string for Images below, you can use https://www.base64-image.de/ [Export(typeof(IXrmToolBoxPlugin)), - ExportMetadata("Name", "Data Migration Utility"), - ExportMetadata("Description", "Data Migration Utility helps migrating data between environments."), + ExportMetadata("Name", "Data Migration using FetchXml"), + ExportMetadata("Description", "Tool helps to transfer entity records between environments by using FetchXml queries."), // Please specify the base64 content of a 32x32 pixels image ExportMetadata("SmallImageBase64", "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"), // Please specify the base64 content of a 80x80 pixels image @@ -22,7 +22,7 @@ namespace XrmMigrationUtility ExportMetadata("BackgroundColor", "Lavender"), ExportMetadata("PrimaryFontColor", "Black"), ExportMetadata("SecondaryFontColor", "Gray")] - public class DataMigrationUtility : PluginBase + public class DataMigrationUsingFetchXml : PluginBase { private readonly IUnityContainer _unityContainer; @@ -30,13 +30,13 @@ public override IXrmToolBoxPluginControl GetControl() { UnityConfig.RegisterTypes(_unityContainer); - return _unityContainer.Resolve(); + return _unityContainer.Resolve(); } /// /// Constructor /// - public DataMigrationUtility() + public DataMigrationUsingFetchXml() { _unityContainer = new UnityContainer(); // If you have external assemblies that you need to load, uncomment the following to diff --git a/DataMigrationUtility/XrmMigrationUtility.csproj b/DataMigrationUsingFetchXml/DataMigrationUsingFetchXml.csproj similarity index 97% rename from DataMigrationUtility/XrmMigrationUtility.csproj rename to DataMigrationUsingFetchXml/DataMigrationUsingFetchXml.csproj index 4cf9755..2aa3e59 100644 --- a/DataMigrationUtility/XrmMigrationUtility.csproj +++ b/DataMigrationUsingFetchXml/DataMigrationUsingFetchXml.csproj @@ -8,8 +8,8 @@ {5FF0A4C5-C5DB-4EBB-B090-4DB274096002} Library Properties - XrmMigrationUtility - DataMigrationUtility + DataMigrationUsingFetchXml + DataMigrationUsingFetchXml v4.6.2 512 @@ -334,12 +334,12 @@ - - + + UserControl - - DataMigrationUtilityControl.cs + + DataMigrationUsingFetchXmlControl.cs @@ -351,11 +351,11 @@ - + - - DataMigrationUtilityControl.cs + + DataMigrationUsingFetchXmlControl.cs Designer @@ -380,10 +380,10 @@ - + - + diff --git a/DataMigrationUtility/DataMigrationUtilityControl.cs b/DataMigrationUsingFetchXml/DataMigrationUsingFetchXmlControl.cs similarity index 84% rename from DataMigrationUtility/DataMigrationUtilityControl.cs rename to DataMigrationUsingFetchXml/DataMigrationUsingFetchXmlControl.cs index a5943c6..f8468b8 100644 --- a/DataMigrationUtility/DataMigrationUtilityControl.cs +++ b/DataMigrationUsingFetchXml/DataMigrationUsingFetchXmlControl.cs @@ -5,17 +5,17 @@ using System.Windows.Forms; using McTools.Xrm.Connection; using XrmToolBox.Extensibility; -using XrmMigrationUtility.Model; using System.Collections.Generic; using System.Collections.Specialized; -using XrmMigrationUtility.Forms.Popup; +using DataMigrationUsingFetchXml.Model; +using DataMigrationUsingFetchXml.Forms.Popup; using Microsoft.WindowsAPICodePack.Dialogs; -using XrmMigrationUtility.Services.Interfaces; -using XrmMigrationUtility.Services.Implementations; +using DataMigrationUsingFetchXml.Services.Interfaces; +using DataMigrationUsingFetchXml.Services.Implementations; -namespace XrmMigrationUtility +namespace DataMigrationUsingFetchXml { - internal partial class DataMigrationUtilityControl : MultipleConnectionsPluginControlBase + internal partial class DataMigrationUsingFetchXmlControl : MultipleConnectionsPluginControlBase { private string _logsPath; @@ -37,7 +37,7 @@ internal partial class DataMigrationUtilityControl : MultipleConnectionsPluginCo private readonly string _defaultPath = Environment.CurrentDirectory; - public DataMigrationUtilityControl(ILogger logger, ITransferOperation transferOperation) + public DataMigrationUsingFetchXmlControl(ILogger logger, ITransferOperation transferOperation) { InitializeComponent(); _logger = logger; @@ -46,7 +46,7 @@ public DataMigrationUtilityControl(ILogger logger, ITransferOperation transferOp _displayNames = new List(); } - private void DataMigrationUtilityControl_Load(object sender, EventArgs e) + private void DataMigrationUsingFetchXmlControl_Load(object sender, EventArgs e) { // Loads or creates the settings for the plugin if (!SettingsManager.Instance.TryLoad(GetType(), out _mySettings)) @@ -68,7 +68,7 @@ private void DataMigrationUtilityControl_Load(object sender, EventArgs e) /// /// /// - private void DataMigrationUtilityControl_OnCloseTool(object sender, EventArgs e) + private void DataMigrationUsingFetchXmlControl_OnCloseTool(object sender, EventArgs e) { // Before leaving, save the settings SettingsManager.Instance.Save(GetType(), _mySettings); @@ -241,7 +241,7 @@ private void BtnTransferData_Click(object sender, EventArgs e) } else { - MessageBox.Show("Select Entity For Data Transfering. ", "Error Message", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Select at least one row from FetchXML table for data transfer. ", "Error Message", MessageBoxButtons.OK, MessageBoxIcon.Error); } } else @@ -284,6 +284,7 @@ private void InitializeLog() private void ChangeToolsState(bool state) { + pictureBoxRecBin.Enabled = state; TxtLogsPath.Enabled = state; BtnBrowseLogs.Enabled = state; BtnTransferData.Enabled = state; @@ -310,34 +311,45 @@ private void PopupDialog(int rowIndex = -1) { if (_popup.ShowDialog() == DialogResult.OK) { - _dataverseService = new DataverseService(Service); - string fetch = _popup.TextBoxFetch.Text; - - if (rowIndex != -1 && fetch == _popup.FetchXmls[rowIndex]) + try { - return; - } - string displayName = _dataverseService.GetDisplayName(fetch); - string logicalName = _dataverseService.GetLogicalName(fetch); + _dataverseService = new DataverseService(Service); + string fetch = _popup.TextBoxFetch.Text; - if (rowIndex != -1) - { - _popup.FetchXmls[rowIndex] = fetch; - fetchXmlDataBindingSource[rowIndex] = new FetchXmlData() + if (rowIndex != -1 && fetch == _popup.FetchXmls[rowIndex]) + { + return; + } + string displayName = _dataverseService.GetDisplayName(fetch); + string logicalName = _dataverseService.GetLogicalName(fetch); + + if (rowIndex != -1) { - DisplayName = displayName, - SchemaName = logicalName - }; - _displayNames[rowIndex] = displayName; + _popup.FetchXmls[rowIndex] = fetch; + fetchXmlDataBindingSource[rowIndex] = new FetchXmlData() + { + DisplayName = displayName, + SchemaName = logicalName + }; + _displayNames[rowIndex] = displayName; + } + else + { + _displayNames.Add(displayName); + fetchXmlDataBindingSource.Add(new FetchXmlData() + { + DisplayName = displayName, + SchemaName = logicalName + }); + } } - else + catch (Exception ex) { - _displayNames.Add(displayName); - fetchXmlDataBindingSource.Add(new FetchXmlData() + if (rowIndex == -1) { - DisplayName = displayName, - SchemaName = logicalName - }); + _popup.FetchXmls.RemoveAt(_popup.FetchXmls.Count - 1); + } + MessageBox.Show($"{ex.Message}.", "Error Message", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } diff --git a/DataMigrationUtility/DataMigrationUtilityControl.designer.cs b/DataMigrationUsingFetchXml/DataMigrationUsingFetchXmlControl.designer.cs similarity index 93% rename from DataMigrationUtility/DataMigrationUtilityControl.designer.cs rename to DataMigrationUsingFetchXml/DataMigrationUsingFetchXmlControl.designer.cs index 7543851..33eaac1 100644 --- a/DataMigrationUtility/DataMigrationUtilityControl.designer.cs +++ b/DataMigrationUsingFetchXml/DataMigrationUsingFetchXmlControl.designer.cs @@ -1,7 +1,7 @@  -namespace XrmMigrationUtility +namespace DataMigrationUsingFetchXml { - partial class DataMigrationUtilityControl + partial class DataMigrationUsingFetchXmlControl { /// /// Variable nécessaire au concepteur. @@ -30,7 +30,7 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DataMigrationUtilityControl)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DataMigrationUsingFetchXmlControl)); this.TxtLogsPath = new System.Windows.Forms.TextBox(); this.BtnBrowseLogs = new System.Windows.Forms.Button(); this.LblLogsPath = new System.Windows.Forms.Label(); @@ -73,11 +73,11 @@ private void InitializeComponent() this.TxtLogsPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TxtLogsPath.BackColor = System.Drawing.SystemColors.InactiveBorder; this.TxtLogsPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TxtLogsPath.Location = new System.Drawing.Point(867, 129); + this.TxtLogsPath.Location = new System.Drawing.Point(1096, 130); this.TxtLogsPath.MaxLength = 500; this.TxtLogsPath.Multiline = true; this.TxtLogsPath.Name = "TxtLogsPath"; - this.TxtLogsPath.Size = new System.Drawing.Size(474, 25); + this.TxtLogsPath.Size = new System.Drawing.Size(439, 25); this.TxtLogsPath.TabIndex = 5; this.TxtLogsPath.Leave += new System.EventHandler(this.TxtLogsPathLeave); // @@ -86,7 +86,7 @@ private void InitializeComponent() this.BtnBrowseLogs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.BtnBrowseLogs.Cursor = System.Windows.Forms.Cursors.Hand; this.BtnBrowseLogs.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.BtnBrowseLogs.Location = new System.Drawing.Point(786, 129); + this.BtnBrowseLogs.Location = new System.Drawing.Point(1015, 129); this.BtnBrowseLogs.Name = "BtnBrowseLogs"; this.BtnBrowseLogs.Size = new System.Drawing.Size(75, 25); this.BtnBrowseLogs.TabIndex = 6; @@ -99,7 +99,7 @@ private void InitializeComponent() this.LblLogsPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.LblLogsPath.AutoSize = true; this.LblLogsPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LblLogsPath.Location = new System.Drawing.Point(884, 110); + this.LblLogsPath.Location = new System.Drawing.Point(1093, 111); this.LblLogsPath.Name = "LblLogsPath"; this.LblLogsPath.Size = new System.Drawing.Size(77, 16); this.LblLogsPath.TabIndex = 7; @@ -108,7 +108,7 @@ private void InitializeComponent() // vScrollBar1 // this.vScrollBar1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.vScrollBar1.Location = new System.Drawing.Point(1364, 1); + this.vScrollBar1.Location = new System.Drawing.Point(1558, 1); this.vScrollBar1.Name = "vScrollBar1"; this.vScrollBar1.Size = new System.Drawing.Size(17, 720); this.vScrollBar1.TabIndex = 9; @@ -118,7 +118,7 @@ private void InitializeComponent() this.BtnSelectTargetInstance.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.BtnSelectTargetInstance.Cursor = System.Windows.Forms.Cursors.Hand; this.BtnSelectTargetInstance.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.BtnSelectTargetInstance.Location = new System.Drawing.Point(959, 9); + this.BtnSelectTargetInstance.Location = new System.Drawing.Point(1153, 9); this.BtnSelectTargetInstance.Name = "BtnSelectTargetInstance"; this.BtnSelectTargetInstance.Size = new System.Drawing.Size(150, 30); this.BtnSelectTargetInstance.TabIndex = 10; @@ -129,7 +129,7 @@ private void InitializeComponent() // hScrollBar1 // this.hScrollBar1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.hScrollBar1.Location = new System.Drawing.Point(0, 723); + this.hScrollBar1.Location = new System.Drawing.Point(0, 782); this.hScrollBar1.Name = "hScrollBar1"; this.hScrollBar1.Size = new System.Drawing.Size(1361, 10); this.hScrollBar1.TabIndex = 16; @@ -140,7 +140,7 @@ private void InitializeComponent() this.BtnTransferData.BackColor = System.Drawing.SystemColors.ControlLight; this.BtnTransferData.Cursor = System.Windows.Forms.Cursors.Hand; this.BtnTransferData.Font = new System.Drawing.Font("Microsoft YaHei", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.BtnTransferData.Location = new System.Drawing.Point(622, 20); + this.BtnTransferData.Location = new System.Drawing.Point(719, 20); this.BtnTransferData.Name = "BtnTransferData"; this.BtnTransferData.Size = new System.Drawing.Size(120, 48); this.BtnTransferData.TabIndex = 18; @@ -152,7 +152,7 @@ private void InitializeComponent() // this.LblTarget.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.LblTarget.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LblTarget.Location = new System.Drawing.Point(1115, 9); + this.LblTarget.Location = new System.Drawing.Point(1309, 9); this.LblTarget.Name = "LblTarget"; this.LblTarget.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); this.LblTarget.Size = new System.Drawing.Size(83, 27); @@ -164,7 +164,7 @@ private void InitializeComponent() // this.LblTargetText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.LblTargetText.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LblTargetText.Location = new System.Drawing.Point(1204, 9); + this.LblTargetText.Location = new System.Drawing.Point(1398, 9); this.LblTargetText.Name = "LblTargetText"; this.LblTargetText.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); this.LblTargetText.Size = new System.Drawing.Size(137, 94); @@ -228,7 +228,7 @@ private void InitializeComponent() this.FetchDataGridView.DataSource = this.fetchXmlDataBindingSource; this.FetchDataGridView.Location = new System.Drawing.Point(23, 129); this.FetchDataGridView.Name = "FetchDataGridView"; - this.FetchDataGridView.Size = new System.Drawing.Size(563, 178); + this.FetchDataGridView.Size = new System.Drawing.Size(518, 178); this.FetchDataGridView.TabIndex = 30; this.FetchDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.FetchDataGridView_CellContentClick); // @@ -237,12 +237,12 @@ private void InitializeComponent() this.CheckBox.Frozen = true; this.CheckBox.HeaderText = ""; this.CheckBox.Name = "CheckBox"; - this.CheckBox.Width = 30; + this.CheckBox.Width = 25; // // Edit // this.Edit.HeaderText = ""; - this.Edit.Image = global::XrmMigrationUtility.Properties.Resources.Edit; + this.Edit.Image = global::DataMigrationUsingFetchXml.Properties.Resources.Edit; this.Edit.Name = "Edit"; this.Edit.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.Edit.Width = 25; @@ -250,7 +250,7 @@ private void InitializeComponent() // Remove // this.Remove.HeaderText = ""; - this.Remove.Image = global::XrmMigrationUtility.Properties.Resources.Remove; + this.Remove.Image = global::DataMigrationUsingFetchXml.Properties.Resources.Remove; this.Remove.Name = "Remove"; this.Remove.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.Remove.Width = 25; @@ -266,7 +266,7 @@ private void InitializeComponent() this.richTextBoxLogs.Location = new System.Drawing.Point(23, 432); this.richTextBoxLogs.Name = "richTextBoxLogs"; this.richTextBoxLogs.ReadOnly = true; - this.richTextBoxLogs.Size = new System.Drawing.Size(1318, 276); + this.richTextBoxLogs.Size = new System.Drawing.Size(1512, 391); this.richTextBoxLogs.TabIndex = 31; this.richTextBoxLogs.Text = ""; this.richTextBoxLogs.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.RichTextBoxLogs_LinkClicked); @@ -277,9 +277,9 @@ private void InitializeComponent() this.LblInfo.Anchor = System.Windows.Forms.AnchorStyles.Top; this.LblInfo.BackColor = System.Drawing.SystemColors.Window; this.LblInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LblInfo.Location = new System.Drawing.Point(601, 343); + this.LblInfo.Location = new System.Drawing.Point(675, 343); this.LblInfo.Name = "LblInfo"; - this.LblInfo.Size = new System.Drawing.Size(260, 50); + this.LblInfo.Size = new System.Drawing.Size(207, 50); this.LblInfo.TabIndex = 34; this.LblInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.LblInfo.Visible = false; @@ -289,9 +289,9 @@ private void InitializeComponent() this.LblTitle.Anchor = System.Windows.Forms.AnchorStyles.Top; this.LblTitle.BackColor = System.Drawing.SystemColors.Window; this.LblTitle.Font = new System.Drawing.Font("Microsoft YaHei", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LblTitle.Location = new System.Drawing.Point(600, 289); + this.LblTitle.Location = new System.Drawing.Point(641, 289); this.LblTitle.Name = "LblTitle"; - this.LblTitle.Size = new System.Drawing.Size(261, 53); + this.LblTitle.Size = new System.Drawing.Size(275, 53); this.LblTitle.TabIndex = 35; this.LblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.LblTitle.Visible = false; @@ -301,9 +301,9 @@ private void InitializeComponent() this.LblErrorText.Anchor = System.Windows.Forms.AnchorStyles.Top; this.LblErrorText.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LblErrorText.ForeColor = System.Drawing.Color.Red; - this.LblErrorText.Location = new System.Drawing.Point(601, 397); + this.LblErrorText.Location = new System.Drawing.Point(675, 397); this.LblErrorText.Name = "LblErrorText"; - this.LblErrorText.Size = new System.Drawing.Size(260, 28); + this.LblErrorText.Size = new System.Drawing.Size(207, 28); this.LblErrorText.TabIndex = 37; this.LblErrorText.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.LblErrorText.Visible = false; @@ -328,9 +328,9 @@ private void InitializeComponent() // this.LblLoading.Anchor = System.Windows.Forms.AnchorStyles.Top; this.LblLoading.BackColor = System.Drawing.SystemColors.Window; - this.LblLoading.Image = global::XrmMigrationUtility.Properties.Resources.loading; + this.LblLoading.Image = global::DataMigrationUsingFetchXml.Properties.Resources.loading; this.LblLoading.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.LblLoading.Location = new System.Drawing.Point(545, 343); + this.LblLoading.Location = new System.Drawing.Point(589, 343); this.LblLoading.Name = "LblLoading"; this.LblLoading.Size = new System.Drawing.Size(50, 50); this.LblLoading.TabIndex = 33; @@ -341,10 +341,10 @@ private void InitializeComponent() // this.pictureBoxStop.Anchor = System.Windows.Forms.AnchorStyles.Top; this.pictureBoxStop.Cursor = System.Windows.Forms.Cursors.Hand; - this.pictureBoxStop.Image = global::XrmMigrationUtility.Properties.Resources.stop; - this.pictureBoxStop.Location = new System.Drawing.Point(867, 352); + this.pictureBoxStop.Image = global::DataMigrationUsingFetchXml.Properties.Resources.stopMigration; + this.pictureBoxStop.Location = new System.Drawing.Point(883, 378); this.pictureBoxStop.Name = "pictureBoxStop"; - this.pictureBoxStop.Size = new System.Drawing.Size(33, 32); + this.pictureBoxStop.Size = new System.Drawing.Size(32, 32); this.pictureBoxStop.TabIndex = 28; this.pictureBoxStop.TabStop = false; this.pictureBoxStop.Visible = false; @@ -353,8 +353,8 @@ private void InitializeComponent() // pictureBoxRecBin // this.pictureBoxRecBin.Cursor = System.Windows.Forms.Cursors.Hand; - this.pictureBoxRecBin.Image = global::XrmMigrationUtility.Properties.Resources.recycle_bin; - this.pictureBoxRecBin.Location = new System.Drawing.Point(73, 401); + this.pictureBoxRecBin.Image = global::DataMigrationUsingFetchXml.Properties.Resources.clearLogs; + this.pictureBoxRecBin.Location = new System.Drawing.Point(61, 403); this.pictureBoxRecBin.Name = "pictureBoxRecBin"; this.pictureBoxRecBin.Size = new System.Drawing.Size(35, 29); this.pictureBoxRecBin.TabIndex = 28; @@ -364,7 +364,7 @@ private void InitializeComponent() // pictureBoxAdd // this.pictureBoxAdd.Cursor = System.Windows.Forms.Cursors.Hand; - this.pictureBoxAdd.Image = global::XrmMigrationUtility.Properties.Resources.iconPlus30; + this.pictureBoxAdd.Image = global::DataMigrationUsingFetchXml.Properties.Resources.iconPlus30; this.pictureBoxAdd.Location = new System.Drawing.Point(23, 97); this.pictureBoxAdd.Name = "pictureBoxAdd"; this.pictureBoxAdd.Size = new System.Drawing.Size(35, 35); @@ -378,7 +378,7 @@ private void InitializeComponent() this.displayNameDataGridViewTextBoxColumn.HeaderText = "DisplayName"; this.displayNameDataGridViewTextBoxColumn.Name = "displayNameDataGridViewTextBoxColumn"; this.displayNameDataGridViewTextBoxColumn.ReadOnly = true; - this.displayNameDataGridViewTextBoxColumn.Width = 220; + this.displayNameDataGridViewTextBoxColumn.Width = 200; // // schemaNameDataGridViewTextBoxColumn // @@ -386,13 +386,13 @@ private void InitializeComponent() this.schemaNameDataGridViewTextBoxColumn.HeaderText = "SchemaName"; this.schemaNameDataGridViewTextBoxColumn.Name = "schemaNameDataGridViewTextBoxColumn"; this.schemaNameDataGridViewTextBoxColumn.ReadOnly = true; - this.schemaNameDataGridViewTextBoxColumn.Width = 220; + this.schemaNameDataGridViewTextBoxColumn.Width = 200; // // fetchXmlDataBindingSource // - this.fetchXmlDataBindingSource.DataSource = typeof(XrmMigrationUtility.Model.FetchXmlData); + this.fetchXmlDataBindingSource.DataSource = typeof(global::DataMigrationUsingFetchXml.Model.FetchXmlData); // - // DataMigrationUtilityControl + // DataMigrationUsingFetchXmlControl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -420,9 +420,9 @@ private void InitializeComponent() this.Controls.Add(this.LblLogsPath); this.Controls.Add(this.BtnBrowseLogs); this.Controls.Add(this.TxtLogsPath); - this.Name = "DataMigrationUtilityControl"; - this.Size = new System.Drawing.Size(1364, 722); - this.Load += new System.EventHandler(this.DataMigrationUtilityControl_Load); + this.Name = "DataMigrationUsingFetchXmlControl"; + this.Size = new System.Drawing.Size(1558, 725); + this.Load += new System.EventHandler(this.DataMigrationUsingFetchXmlControl_Load); ((System.ComponentModel.ISupportInitialize)(this.FetchDataGridView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxStop)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRecBin)).EndInit(); @@ -456,13 +456,13 @@ private void InitializeComponent() private System.Windows.Forms.Label LblTitle; private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1; private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn2; + private System.Windows.Forms.Label LblErrorText; + private System.Windows.Forms.PictureBox pictureBoxRecBin; + private System.Windows.Forms.PictureBox pictureBoxStop; private System.Windows.Forms.DataGridViewCheckBoxColumn CheckBox; private System.Windows.Forms.DataGridViewTextBoxColumn displayNameDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn schemaNameDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewImageColumn Edit; private System.Windows.Forms.DataGridViewImageColumn Remove; - private System.Windows.Forms.Label LblErrorText; - private System.Windows.Forms.PictureBox pictureBoxRecBin; - private System.Windows.Forms.PictureBox pictureBoxStop; } } \ No newline at end of file diff --git a/DataMigrationUtility/DataMigrationUtilityControl.resx b/DataMigrationUsingFetchXml/DataMigrationUsingFetchXmlControl.resx similarity index 91% rename from DataMigrationUtility/DataMigrationUtilityControl.resx rename to DataMigrationUsingFetchXml/DataMigrationUsingFetchXmlControl.resx index 8797011..226715c 100644 --- a/DataMigrationUtility/DataMigrationUtilityControl.resx +++ b/DataMigrationUsingFetchXml/DataMigrationUsingFetchXmlControl.resx @@ -129,6 +129,15 @@ 17, 17 + + True + + + True + + + True + @@ -153,6 +162,9 @@ 1z44yHf2vpJfJ7sYy8L0esmOa7u2wkGd2oK2azmaTdLKMvxTjcYv+h87rN852tcAAAAASUVORK5CYII= + + 17, 17 + 34 diff --git a/DataMigrationUtility/Forms/Popup/Popup.Designer.cs b/DataMigrationUsingFetchXml/Forms/Popup/Popup.Designer.cs similarity index 99% rename from DataMigrationUtility/Forms/Popup/Popup.Designer.cs rename to DataMigrationUsingFetchXml/Forms/Popup/Popup.Designer.cs index c099ffa..8588d00 100644 --- a/DataMigrationUtility/Forms/Popup/Popup.Designer.cs +++ b/DataMigrationUsingFetchXml/Forms/Popup/Popup.Designer.cs @@ -1,5 +1,5 @@  -namespace XrmMigrationUtility.Forms.Popup +namespace DataMigrationUsingFetchXml.Forms.Popup { partial class Popup { diff --git a/DataMigrationUtility/Forms/Popup/Popup.cs b/DataMigrationUsingFetchXml/Forms/Popup/Popup.cs similarity index 99% rename from DataMigrationUtility/Forms/Popup/Popup.cs rename to DataMigrationUsingFetchXml/Forms/Popup/Popup.cs index 633ce5b..306bf39 100644 --- a/DataMigrationUtility/Forms/Popup/Popup.cs +++ b/DataMigrationUsingFetchXml/Forms/Popup/Popup.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using System.Collections.Generic; -namespace XrmMigrationUtility.Forms.Popup +namespace DataMigrationUsingFetchXml.Forms.Popup { internal partial class Popup : Form { diff --git a/DataMigrationUtility/Forms/Popup/Popup.resx b/DataMigrationUsingFetchXml/Forms/Popup/Popup.resx similarity index 100% rename from DataMigrationUtility/Forms/Popup/Popup.resx rename to DataMigrationUsingFetchXml/Forms/Popup/Popup.resx diff --git a/DataMigrationUtility/Model/ConnectionDetails.cs b/DataMigrationUsingFetchXml/Model/ConnectionDetails.cs similarity index 87% rename from DataMigrationUtility/Model/ConnectionDetails.cs rename to DataMigrationUsingFetchXml/Model/ConnectionDetails.cs index 947848b..e1f8c74 100644 --- a/DataMigrationUtility/Model/ConnectionDetails.cs +++ b/DataMigrationUsingFetchXml/Model/ConnectionDetails.cs @@ -2,7 +2,7 @@ using McTools.Xrm.Connection; using System.Collections.ObjectModel; -namespace XrmMigrationUtility.Model +namespace DataMigrationUsingFetchXml.Model { internal sealed class ConnectionDetails { diff --git a/DataMigrationUtility/Model/FetchXmlData.cs b/DataMigrationUsingFetchXml/Model/FetchXmlData.cs similarity index 76% rename from DataMigrationUtility/Model/FetchXmlData.cs rename to DataMigrationUsingFetchXml/Model/FetchXmlData.cs index b0c9a6e..8458448 100644 --- a/DataMigrationUtility/Model/FetchXmlData.cs +++ b/DataMigrationUsingFetchXml/Model/FetchXmlData.cs @@ -1,4 +1,4 @@ -namespace XrmMigrationUtility.Model +namespace DataMigrationUsingFetchXml.Model { internal sealed class FetchXmlData { diff --git a/DataMigrationUtility/Model/ResultItem.cs b/DataMigrationUsingFetchXml/Model/ResultItem.cs similarity index 86% rename from DataMigrationUtility/Model/ResultItem.cs rename to DataMigrationUsingFetchXml/Model/ResultItem.cs index b9e6443..0c210f8 100644 --- a/DataMigrationUtility/Model/ResultItem.cs +++ b/DataMigrationUsingFetchXml/Model/ResultItem.cs @@ -1,4 +1,4 @@ -namespace XrmMigrationUtility.Model +namespace DataMigrationUsingFetchXml.Model { internal sealed class ResultItem { diff --git a/DataMigrationUtility/Properties/AssemblyInfo.cs b/DataMigrationUsingFetchXml/Properties/AssemblyInfo.cs similarity index 83% rename from DataMigrationUtility/Properties/AssemblyInfo.cs rename to DataMigrationUsingFetchXml/Properties/AssemblyInfo.cs index 23c6423..8ef2267 100644 --- a/DataMigrationUtility/Properties/AssemblyInfo.cs +++ b/DataMigrationUsingFetchXml/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("DataMigrationUtility")] +[assembly: AssemblyTitle("DataMigrationUsingFetchXml")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DataMigrationUtility")] +[assembly: AssemblyCompany("Bever")] +[assembly: AssemblyProduct("DataMigrationUsingFetchXml")] [assembly: AssemblyCopyright("Copyright © 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.1")] -[assembly: AssemblyFileVersion("1.0.0.1")] +[assembly: AssemblyVersion("1.0.0.2")] +[assembly: AssemblyFileVersion("1.0.0.2")] diff --git a/DataMigrationUtility/Properties/DataSources/XrmMigrationUtility.Model.FetchXmlData.datasource b/DataMigrationUsingFetchXml/Properties/DataSources/DataMigrationUsingFetchXml.Model.FetchXmlData.datasource similarity index 75% rename from DataMigrationUtility/Properties/DataSources/XrmMigrationUtility.Model.FetchXmlData.datasource rename to DataMigrationUsingFetchXml/Properties/DataSources/DataMigrationUsingFetchXml.Model.FetchXmlData.datasource index 83942e9..98a4594 100644 --- a/DataMigrationUtility/Properties/DataSources/XrmMigrationUtility.Model.FetchXmlData.datasource +++ b/DataMigrationUsingFetchXml/Properties/DataSources/DataMigrationUsingFetchXml.Model.FetchXmlData.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - XrmMigrationUtility.Model.FetchXmlData, DataMigrationUtility, Version=1.0.0.1, Culture=neutral, PublicKeyToken=null + DataMigrationUsingFetchXml.Model.FetchXmlData, DataMigrationUsingFetchXml, Version=1.0.0.1, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/DataMigrationUtility/Properties/Resources.Designer.cs b/DataMigrationUsingFetchXml/Properties/Resources.Designer.cs similarity index 90% rename from DataMigrationUtility/Properties/Resources.Designer.cs rename to DataMigrationUsingFetchXml/Properties/Resources.Designer.cs index 4df67c3..32c80eb 100644 --- a/DataMigrationUtility/Properties/Resources.Designer.cs +++ b/DataMigrationUsingFetchXml/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace XrmMigrationUtility.Properties { +namespace DataMigrationUsingFetchXml.Properties { using System; @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("XrmMigrationUtility.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DataMigrationUsingFetchXml.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -63,9 +63,9 @@ internal Resources() { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Edit { + internal static System.Drawing.Bitmap clearLogs { get { - object obj = ResourceManager.GetObject("Edit", resourceCulture); + object obj = ResourceManager.GetObject("clearLogs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -73,9 +73,9 @@ internal static System.Drawing.Bitmap Edit { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap iconPlus30 { + internal static System.Drawing.Bitmap Edit { get { - object obj = ResourceManager.GetObject("iconPlus30", resourceCulture); + object obj = ResourceManager.GetObject("Edit", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -83,9 +83,9 @@ internal static System.Drawing.Bitmap iconPlus30 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap loading { + internal static System.Drawing.Bitmap iconPlus30 { get { - object obj = ResourceManager.GetObject("loading", resourceCulture); + object obj = ResourceManager.GetObject("iconPlus30", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -93,9 +93,9 @@ internal static System.Drawing.Bitmap loading { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap recycle_bin { + internal static System.Drawing.Bitmap loading { get { - object obj = ResourceManager.GetObject("recycle_bin", resourceCulture); + object obj = ResourceManager.GetObject("loading", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -113,9 +113,9 @@ internal static System.Drawing.Bitmap Remove { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap stop { + internal static System.Drawing.Bitmap stopMigration { get { - object obj = ResourceManager.GetObject("stop", resourceCulture); + object obj = ResourceManager.GetObject("stopMigration", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/DataMigrationUtility/Properties/Resources.resx b/DataMigrationUsingFetchXml/Properties/Resources.resx similarity index 93% rename from DataMigrationUtility/Properties/Resources.resx rename to DataMigrationUsingFetchXml/Properties/Resources.resx index ebe2898..3a51da5 100644 --- a/DataMigrationUtility/Properties/Resources.resx +++ b/DataMigrationUsingFetchXml/Properties/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\clearLogs.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -127,13 +130,10 @@ ..\Resources\loading.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\recycle-bin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Remove.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\stopMigration.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/DataMigrationUtility/Resources/Edit.png b/DataMigrationUsingFetchXml/Resources/Edit.png similarity index 100% rename from DataMigrationUtility/Resources/Edit.png rename to DataMigrationUsingFetchXml/Resources/Edit.png diff --git a/DataMigrationUtility/Resources/Remove.png b/DataMigrationUsingFetchXml/Resources/Remove.png similarity index 100% rename from DataMigrationUtility/Resources/Remove.png rename to DataMigrationUsingFetchXml/Resources/Remove.png diff --git a/DataMigrationUsingFetchXml/Resources/clearLogs.jpg b/DataMigrationUsingFetchXml/Resources/clearLogs.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9f855b0b4de740f2349b63e702b810145900044b GIT binary patch literal 1366 zcmex=2i4CUqJdYO6I#mR{Use1WE=|GcjGdMFaF*1S> z6fm5FbHxmNHRz=Gb%AK2{JMZGX6ipAP@8jD=-{DK>-DfOw25-Y(OV*aRU`> z6#zP)nVAXbSXLIG#~EvZ@(e73tU`*0j%>n#iR?;+B1Vl97jh^&Z9FI%bn%0VaZ*te zCzqJGgrtbvx}>nyN9P&a7buactm7Wa!P7idPZheaY<=ec|~Pa zb4zPmdq-#2q{&mJPMbbs=B!1Fmn>bje8tLDn>KIRx^4T8ox2VlK63Qf@e?OcUAlbb z>b2`PZr*zM=<$=M&z`?{`Re1R&tJZN`~KtSFOa_&8JHp7g8K~3UxGk?F#+R%g&pKC zMy7HgW)@^&RWxK1atvfoEEHBUYUB`cnz(S|K~81kpbw%+MHjimR7@VKegt_9>@(s# z)lOnKGb1qam<1W^8U9**%=cSU<^Jl)vSu1;0FJCb1k#|dlVn&P6sXyo6%Km3y`SG{? zKSS#N#(Op&kN4L}|Imw$XL{KleciOz>sPGvkrQiopH%wysJJRmeWFjnvxH9`PAhe? zPu2?2*Crp0)4KRBZ_OUtyyL%}kL**L^(cC-FSme; z*7VEgE}!}1K8c}H%3}Tp^GE4_MB1bOF162=m#%U8vG7}e`+kukoL zERw&u|B=c>&s7!SN8(gwADQ+1&{?ZTPZw>tzV@s1Qt#QldLH-KcWm1+>5+GZq+a6m zq|-U}!K8_KD4Ysiu%FOfsVipZdUv57he>`UYL%T-& zKI=d3`<^RnWUtK4wNtP0+v09zdv4~Q?z!x)J6VH%eR?anVAdn14^fULEt~x=y2dBe oA6ocf{$H+tz@&08$NrD6JV*VL$rbVc4vNkHrK-JX74!d_0F~<|ZvX%Q literal 0 HcmV?d00001 diff --git a/DataMigrationUtility/Resources/iconPlus30.png b/DataMigrationUsingFetchXml/Resources/iconPlus30.png similarity index 100% rename from DataMigrationUtility/Resources/iconPlus30.png rename to DataMigrationUsingFetchXml/Resources/iconPlus30.png diff --git a/DataMigrationUtility/Resources/loading.gif b/DataMigrationUsingFetchXml/Resources/loading.gif similarity index 100% rename from DataMigrationUtility/Resources/loading.gif rename to DataMigrationUsingFetchXml/Resources/loading.gif diff --git a/DataMigrationUsingFetchXml/Resources/stopMigration.jpg b/DataMigrationUsingFetchXml/Resources/stopMigration.jpg new file mode 100644 index 0000000000000000000000000000000000000000..736de6a7d5b6256a9a17d4c4566db3cff90965c4 GIT binary patch literal 1703 zcmbV}dora`Qp6}Fxrar@=(ucT60wH~>lP8x z9z>xMqA|8Y%AJ%^Y;NsHF_|&5zuE27Is4b{e&6>w=XuZjJn#8_-bXSlnE;A*HZ&W6 zKp?;gcmW9ym{~Ied;xH90NVfnSO7UG0tB4FB>*@P07{y}0i2Y+=F+od4D1I;1VXw$ z3qnIu$)HdW8Y6?jNCS(L#bL2{ECz#@$Kz$?U}10y>*VDWq`CAFX}h!w-f~zBR$B4j zBzXV`SfB|sA%qq{5)cppA>jZL>>CY}N?|_>frL+C{Cd?58`X4l^|tD7+r7ug z*u>Oq{{d^8gSIrgLx){lkGQ$hy-)f0`uPV0Mx2RcL@}e!CZ11XT}Zx|lF7cDm7ViT zZeB_0wX*Vx>y>peNmd)@GsM%_ zIW}|lsG7&4V2v4rf#ST`clt7}QF)O8e$;TTpD%S&mwUQHOp(x7+&k)-%KOG(OAG&9 z+4Y&#tbwWVr2g8T9Oe4?TPAmtcls{jp0FMoy=HgE&Pm zwh_ZomKP(WF>2FKl$yJ{duNf;ERIP)LZx^}Q(j=m!^WZC(lyy9&Wr^GHRV@Xqsyw( z2v5E>@Z5KGI>y8h>0%YBGhTRTNdhJ;7ZBc+;@%1&hJ#)0NWZ|$v?wx9RH20V+U2tG z`>Fb))i26zHxPF(p;;Ykp492lxu>F`snRir+5)}3OPk%B={r)6oSACo#Zp4+R`qVJ zlq~3$Ejf0+8mXbLrN^IM@MteuFEWmw8lL?%HY(I7e6#pPpJqgAsyWM9E<)>$yU~=! z-jGUiNb0Jx&|L!BLPdsrdtQ7(3{kja`0e2GGGj0&;>F9E?G0)=H!?Oq9~@7n9;H2g zVYeZ9;Fb6N_t7`w(%`lOmJ@|yS@;uDV^k&Jd?+VTsK-%r%njqUDtSC0H}!_N0gk?Q zcOyG+``~=rDHmtFZH7JR&9NGhdgtO9; z&~9`gHa}>88SE%KzRe~MEgmP;8nZs)?tc?a;-U*W{7zj6?o8Tbr(Q&TQ$ChzYPB|c zE*B?vfTEtX=qS+kn@2B_ma7C+lTQgu-<}~ye$USpE%{+pfv5Q+^>g;9gy+;7-Q@P2 z$J!IL)uF5aMN)`BTLNSzm_ly6>W6$wBD1fZVS%UZUGSWi*6B=Dz-7Nuh|Lhi$#^TDlQ>GBlLcY?hfA+D9#%u%~ U|NX3@vlGL0VZ2dy%u+J)Ct /// This class can help you to store settings for your plugin diff --git a/DataMigrationUtility/UnityConfig.cs b/DataMigrationUsingFetchXml/UnityConfig.cs similarity index 58% rename from DataMigrationUtility/UnityConfig.cs rename to DataMigrationUsingFetchXml/UnityConfig.cs index 944dc30..4911b87 100644 --- a/DataMigrationUtility/UnityConfig.cs +++ b/DataMigrationUsingFetchXml/UnityConfig.cs @@ -1,14 +1,14 @@ using Unity; -using XrmMigrationUtility.Services.Interfaces; -using XrmMigrationUtility.Services.Implementations; +using DataMigrationUsingFetchXml.Services.Interfaces; +using DataMigrationUsingFetchXml.Services.Implementations; -namespace XrmMigrationUtility +namespace DataMigrationUsingFetchXml { internal static class UnityConfig { public static void RegisterTypes(IUnityContainer unityContainer) { - unityContainer.RegisterType(TypeLifetime.Singleton); + unityContainer.RegisterType(TypeLifetime.Singleton); unityContainer.RegisterType(TypeLifetime.Singleton); unityContainer.RegisterType(TypeLifetime.Singleton); } diff --git a/DataMigrationUtility/app.config b/DataMigrationUsingFetchXml/app.config similarity index 100% rename from DataMigrationUtility/app.config rename to DataMigrationUsingFetchXml/app.config diff --git a/DataMigrationUtility/packages.config b/DataMigrationUsingFetchXml/packages.config similarity index 100% rename from DataMigrationUtility/packages.config rename to DataMigrationUsingFetchXml/packages.config diff --git a/DataMigrationUtility/Resources/recycle-bin.png b/DataMigrationUtility/Resources/recycle-bin.png deleted file mode 100644 index a4df4c00745f3e6066bf34bc552c30f7807d040d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 944 zcmV;h15f;kP)K~zYI?UqewTvZguf9JjVN`{PS(^M;&>DZKl(nb^nDGJ3BEBHYd zVi&H2LJ{gx5OvW-D_B9dZmhU*Ar-5*QK}$S5wtEEKaxs2Giox^q>@R>q@B6<-Q!}~ z6#z5jb3+_wM8B>eHpJMZVkb6KP|`PY~F6FTtMYZK4sgVV|^5`tqWAwJ#>G=Le;)7tq4IyH*c4Hoh%>v?ZDL ziK0?$1kUdT6u>$}R0{3>4zQr0*RlQU01E>4%n0T7u~@r9MD%pQRvLk3)A3HY4V2Rp|M1har9TyCS1!%o?J2x2 zd73~$qr_sOKi2p=hZ+dL+21W%a`M%jdr@@xj>| zJBH(&I6MYGZWC}Hd^b7IbH^umVQ-dacW((*tiGspoM?z>wNouRB^f>uADz3(%woX# zIm_P*E4QC@%3GgYpj@r<-dBGu`&Gdy3Gvsk$2W8r)^hs#?L9sk2WzR-n@8Z+isjIg zqewi?KqkFX?R5=XIyD>#J~KjD+O&LNXB-+0-aR?NGjIIJ*XJ(t$7REt-z;$S+d8RS zo=10W4s}8R%)YHuZW(+;#EB=D!WHk?kzrph09JgJD{eVJ_70yH_Y5zO8LJ3V7Ll%3 zV8p2gRV^4NBVpfb`|~`qJ;Qv>FqY4-bvVhNRm;YHkDYhLiG|8&H~_sE6+aS;%9L^J z29{qc-xD4i8)}*M`~&Isl>iv0fogXRLqw|q6fM<_n#jafvAV?&q2X1)Qnaq~N8wh@ zIy~{ZYxt&MQ7r~aQrGc1I+_|*TqHPhk1MmqrD~Ih80000LoK~zYI?bb_Z6Hyd^;eXO3M69Txf)q8V8*K#(ih+`1ijN8kiXx)W zjT<+jv|B~63l}a#tSE?x8+9SELKU%8tP)}og`#f6>OyOwR+4JkJZ$W7acz@HCX;Di ztDe=|bMKw+%t__}3sI%etSk~gE>id`ozYHE8z50KER8sE69D#Ef}xKT2eenji-wCp zE#rCN5>QLHAzTKuAf5x45jDkia0Sr3xJ@^`oaPFk0K2Kdo0+hiE?-&)(J;)+K>a%X z+{8G zK7Ul?%t4V@R3sS}d3;Nx1(7cw)Vf4WgNFazym=N5t%j!Uu&vFIFowSm!`F|{bsvUaLeI6_ zHBJ|-^uX{CM1H`}QCPD<%`I`m+D6c9@W=S+X$&XhaKa0rUbyfO+S+s1XjylnNIG|< z6VBa%2Up?kvw6To==EVO_oI6r@{y<+LiuGW;$GBcGsW z6t?V8zo$`jcfhI35cmc!0&1Vd&_6(Y_|bSim#AH)u53D)9xtj@S2`O;w^J+%Q@`|* z(5eL)nA>Jr*6hhL$Jx2mv_6+vlu77Y9U%lfvb1x4(TAPE%tUow5;g44{wk^bYtaDB y3zrGci<-hE;-+XpxJbMpY6*tQeBLfZ)#4u~Qwc8kvtncb0000