PR 63: Merge pbi/4893-supportStructureMigrator to master +semver:patch

 - Updated NodeStructuresMigration.cs to support choosing the scructure
 - Added support for Stuctures with #4893
 - Merge branch 'master'
 - Added chocoalty files
 - Added support for TestAssets with #4893
 - Added Chocolatey to the package list
 - Updated
 - Aded download URL

Related work items: #4893

Author: MrHinsh

TfsWitMigrator.Console/Chocolatey/chocolateyInstall.ps1

@@ -0,0 +1,18 @@
+try {
+  $sysDrive = $env:SystemDrive
+  $vstssyncmigrationpath = "$sysDrive\tools\VSTSSyncMigration"
+
+  if(test-path $vstssyncmigrationpath) {
+    write-host "Cleaning out the contents of $vstssyncmigrationpath"
+    Remove-Item "$($vstssyncmigrationpath)\*" -recurse -force
+  }
+  
+  Install-ChocolateyZipPackage 'vstssyncmigration' 'https://github.com/nkdAgility/vsts-sync-migration/releases/download/#{GITVERSION.FULLSEMVER}#/vstsbulkeditor-#{GITVERSION.FULLSEMVER}#.zip' $vstssyncmigrationpath
+  Install-ChocolateyPath $vstssyncmigrationpath
+
+  write-host 'VSTS Sync Migration has been installed. Call `vstssyncmigration` from the command line to see options. You may need to close and reopen the command shell.'
+  Write-ChocolateySuccess 'vstssyncmigration'
+} catch {
+  Write-ChocolateyFailure 'vstssyncmigration' $($_.Exception.Message)
+  throw 
+}

TfsWitMigrator.Console/Chocolatey/vstssyncmigration.nuspec

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <metadata>
+    <id>vstssyncmigrator</id>
+    <title>VSTS Sync Migrator</title>
+    <version>0.0.0</version>
+    <authors>MrHinsh</authors>
+    <owners>nkdAgility, MrHinsh</owners>
+    <summary>VSTS Data Migrator</summary>
+    <description>Visual Studio Team Services Sync &amp; Migration Engine allows you to bulk edit data in Microsoft Team Foundation Server (TFS) and Visual Studio Team Services (VSTS). Supports both migration and bulk update scenarios.</description>
+    <projectUrl>https://github.com/nkdAgility/vsts-sync-migration</projectUrl>
+    <packageSourceUrl>https://github.com/nkdAgility/vsts-sync-migration/releases</packageSourceUrl>
+    <docsUrl>http://vsts-bulk-editor.readthedocs.io</docsUrl>
+    <bugTrackerUrl>https://github.com/nkdAgility/vsts-sync-migration/issues</bugTrackerUrl>
+    <tags>git tfs git-tfs sourceControl</tags>
+    <releaseNotes></releaseNotes>
+    <licenseUrl>https://github.com/nkdAgility/vsts-sync-migration/blob/master/LICENSE</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+  </metadata>
+  <files>
+    <file src="chocolateyInstall.ps1" target="tools\chocolateyInstall.ps1" />
+  </files>
+</package>

TfsWitMigrator.Console/Chocolatey/vstssyncmigrator.0.0.1.nupkg

@@ -261,6 +261,8 @@
   <ItemGroup>
     <None Include="App.config" />
     <None Include="ApplicationInsights.config" />
+    <None Include="Chocolatey\chocolateyInstall.ps1" />
+    <None Include="Chocolatey\vstssyncmigration.nuspec" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

TfsWitMigrator.Console/VSTS.DataBulkEditor.Console.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="chocolatey" version="0.10.3" targetFramework="net45" />
   <package id="CommandLineParser" version="2.0.275-beta" targetFramework="net45" />
   <package id="Microsoft.ApplicationInsights" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.ApplicationInsights.TraceListener" version="2.1.0" targetFramework="net45" />

TfsWitMigrator.Console/packages.config

@@ -98,7 +98,7 @@ public static EngineConfiguration GetDefault()
             ec.Processors.Add(new AttachementImportMigrationConfig() { Enabled = false });
             ec.Processors.Add(new TestVeriablesMigrationConfig() { Enabled = false });
             ec.Processors.Add(new TestConfigurationsMigrationConfig() { Enabled = false });
-            ec.Processors.Add(new TestPlansAndSuitsMigrationConfig() { Enabled = false });
+            ec.Processors.Add(new TestPlansAndSuitsMigrationConfig() { Enabled = false, PrefixProjectToNodes = true });
             ec.Processors.Add(new TestRunsMigrationConfig() { Enabled = false });
             ec.Processors.Add(new ImportProfilePictureConfig() { Enabled = false });
             ec.Processors.Add(new ExportProfilePictureFromADConfig() { Enabled = false });

TfsWitMigrator.Core/Configuration/EngineConfiguration.cs

@@ -9,7 +9,7 @@ namespace VSTS.DataBulkEditor.Engine.Configuration.Processing
     public class TestPlansAndSuitsMigrationConfig : ITfsProcessingConfig
     {
         public bool Enabled { get; set; }
-        public string AreaIterationPath { get; set; }
+        public bool PrefixProjectToNodes { get; set; }
 
         public Type Processor
         {

TfsWitMigrator.Core/Configuration/Processing/TestPlansAndSuitsMigrationConfig.cs

@@ -323,13 +323,16 @@ private ITestPlan CreateNewTestPlanFromSource(ITestPlan sourcePlan,  string newP
             targetPlan.Name = newPlanName;
             targetPlan.StartDate = sourcePlan.StartDate;
             targetPlan.EndDate = sourcePlan.EndDate;
-            if (this.config.AreaIterationPath == null){
-                targetPlan.AreaPath = sourcePlan.AreaPath.Replace(engine.Source.Name, string.Format(@"{0}\{1}", engine.Target.Name, engine.Source.Name));
-                targetPlan.Iteration = sourcePlan.Iteration.Replace(engine.Source.Name, string.Format(@"{0}\{1}", engine.Target.Name, engine.Source.Name));
-            } else
+            if (config.PrefixProjectToNodes)
             {
-                targetPlan.AreaPath = this.config.AreaIterationPath;
-                targetPlan.Iteration = this.config.AreaIterationPath;
+                targetPlan.AreaPath = string.Format(@"{0}\{1}", engine.Target.Name, sourcePlan.AreaPath);
+                targetPlan.Iteration = string.Format(@"{0}\{1}", engine.Target.Name, sourcePlan.Iteration);
+            }
+            else
+            {
+                var regex = new Regex(Regex.Escape(engine.Source.Name));
+                targetPlan.AreaPath = regex.Replace(sourcePlan.AreaPath, engine.Target.Name, 1);
+                targetPlan.Iteration = regex.Replace(sourcePlan.Iteration, engine.Target.Name, 1);
             }
             targetPlan.ManualTestSettingsId = 0;
             return targetPlan;