Merge pull request #2354 from Microsoft/dev

Sync from dev

Author: sibille

README.md

@@ -45,7 +45,6 @@ Once you select the attributes you want your new UWP app to have, you can quickl
 * [Authoring Templates](docs/templates.md)
 
 ## Known issues
-* Issue ([#1753](https://github.com/Microsoft/WindowsTemplateStudio/issues/1753)): Wack tests are currently failing in our build server due to a machine configuration issue. All tests pass correctly if locally executed. We are working on getting them back to green.
 * Issue ([#1629](https://github.com/Microsoft/WindowsTemplateStudio/issues/1629)): the Master-Detail view has an issue if you set the background to Transparent in the MastertDetailControl. We are actively working with the UWPCommunityTookit team to get this solved as soon as possible.
 * Issue ([#1532](https://github.com/Microsoft/WindowsTemplateStudio/issues/1532)): when uninstalling / upgrading where you may get an error of "A value for 'Component' needs to be specified in the catalog."  If you get this error, we need logs to help track this with the help of the Visual Studio team.  We don't know how to reproduce it but we know a few people have hit this scenario.  We have how to capture these logs in the [tracking issue on GitHub.](https://github.com/Microsoft/WindowsTemplateStudio/issues/1532)
 * You can't have side-by-side versions (nightly/pre-release/release) of WindowsTemplateStudio VSPackage into a single instance of Visual Studio.

_build/Extension-SetIdentityAndVersion.ps1

@@ -190,6 +190,27 @@ else
     Write-Warning "No files found to apply version."
 }
 
+
+## APPLY VERSION RelayCommandPackage
+Write-Host
+Write-Host "Applying version to RelayCommandPackage.cs"
+$files = Get-ChildItem -include "RelayCommandPackage.cs" -Recurse |  Where-Object{ $_.FullName -notmatch "\\Templates\\" }
+if($files)
+{
+    Write-Host "Will apply $versionNumber to $($files.count) files."
+
+    foreach ($file in $files) {
+        $filecontent = Get-Content($file)
+        attrib $file -r
+        $filecontent -replace $VersionRegex, $versionNumber | Out-File $file utf8
+        Write-Host "$file - version applied"
+    }
+}
+else
+{
+    Write-Warning "No relaycommandPackage found to apply version."
+}
+
 ## APPLY VERSION TO PROJECT TEMPLATE WIZARD REFERENCE
 if($publicKeyToken){
   Write-Host

code/Nuget.Config

@@ -6,6 +6,6 @@
   </packageRestore>
   <packageSources>
     <add key="dotnet templating package source" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
-	<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
   </packageSources>
 </configuration>

code/src/Core/Core.csproj

@@ -207,7 +207,9 @@
     <Compile Include="Naming\DefaultNamesValidator.cs" />
     <Compile Include="Naming\ReservedNamesValidator.cs" />
     <Compile Include="Packaging\TemplatePackage.cs" />
+    <Compile Include="PostActions\Catalog\Merge\MergeMode.cs" />
     <Compile Include="PostActions\Catalog\Merge\MergeResourceDictionaryPostAction.cs" />
+    <Compile Include="PostActions\Catalog\Merge\PostactionFormatter.cs" />
     <Compile Include="PostActions\Catalog\Merge\ResourceDictionaryWriter.cs" />
     <Compile Include="PostActions\Catalog\SortNamespaces\ListStringExtensions.cs" />
     <Compile Include="PostActions\TemplateDefinedPostAction.cs" />
@@ -234,7 +236,6 @@
     <Compile Include="PostActions\Catalog\Merge\SearchAndReplacePostAction.cs" />
     <Compile Include="PostActions\Catalog\AddContextItemsToProjectPostAction.cs" />
     <Compile Include="PostActions\Catalog\Merge\MergeFailureType.cs" />
-    <Compile Include="PostActions\Catalog\Merge\PostActionFormatter.cs" />
     <Compile Include="PostActions\Catalog\NewItemGeneration\CreateSummaryPostAction.cs" />
     <Compile Include="PostActions\Catalog\Merge\GenerateMergeInfoPostAction.cs" />
     <Compile Include="PostActions\Catalog\Merge\GetMergeFilesFromProjectPostAction.cs" />

code/src/Core/Gen/GenShell.cs

@@ -39,6 +39,8 @@ public abstract class GenShell
 
         public abstract void ShowTaskList();
 
+        public abstract void OpenProjectOverview();
+
         public abstract void ShowModal(Window dialog);
 
         public abstract void CancelWizard(bool back = true);

code/src/Core/Locations/TemplatesContent.cs

@@ -43,7 +43,7 @@ public TemplatesContent(string workingFolder, string sourceId, Version wizardVer
             LoadAvailableContents();
 
             Source = source;
-            SetCurrentContent(tengineCurrentContent);
+            SetCurrentContent(tengineCurrentContent, wizardVersion);
 
             WizardVersion = wizardVersion;
         }
@@ -293,9 +293,17 @@ private TemplatesContentInfo GetLatestContent()
             return All.OrderByDescending(c => c.Version).ThenByDescending(c => c.Date).FirstOrDefault();
         }
 
-        private void SetCurrentContent(string tengineCurrentContent)
+        private void SetCurrentContent(string tengineCurrentContent, Version wizardVersion)
         {
-            Current = All.Where(c => c.Path.Equals(tengineCurrentContent, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+            if (!string.IsNullOrEmpty(tengineCurrentContent))
+            {
+                Current = All.Where(c => c.Path.Equals(tengineCurrentContent, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+            }
+            else
+            {
+                var mainWizardVersion = $"{wizardVersion.Major.ToString()}.{wizardVersion.Minor.ToString()}";
+                Current = All.Where(c => c.MainVersion.Equals(mainWizardVersion, StringComparison.OrdinalIgnoreCase)).OrderByDescending(c => c.Version).ThenByDescending(c => c.Date).FirstOrDefault();
+            }
         }
 
         internal void RefreshContentFolder(string tengineCurrentContent)

code/src/Core/Locations/TemplatesSynchronization.cs

@@ -147,21 +147,29 @@ private async Task<bool> LoadConfigFileAsync(CancellationToken ct)
         {
             bool notifyCheckingforUpdates = false;
 
-            Task[] downloadTasks = new Task[2];
-            downloadTasks[0] = _content.Source.LoadConfigAsync(ct);
-            downloadTasks[1] = Task.Delay(1000);
+            try
+            {
+                Task[] downloadTasks = new Task[2];
+                downloadTasks[0] = _content.Source.LoadConfigAsync(ct);
+                downloadTasks[1] = Task.Delay(1000);
+
+                Task firstFinishedTask = await Task.WhenAny(downloadTasks);
 
-            Task firstFinishedTask = await Task.WhenAny(downloadTasks);
+                if (firstFinishedTask.Id == downloadTasks[1].Id)
+                {
+                    notifyCheckingforUpdates = true;
+                    SyncStatusChanged?.Invoke(this, new SyncStatusEventArgs { Status = SyncStatus.CheckingForUpdates });
+                    await downloadTasks[0];
+                }
 
-            if (firstFinishedTask.Id == downloadTasks[1].Id)
+                return notifyCheckingforUpdates;
+            }
+            catch (Exception ex)
             {
-                notifyCheckingforUpdates = true;
-                SyncStatusChanged?.Invoke(this, new SyncStatusEventArgs { Status = SyncStatus.CheckingForUpdates });
-                await downloadTasks[0];
+                AppHealth.Current.Error.TrackAsync(StringRes.TemplatesSynchronizationErrorDownloadingConfig, ex).FireAndForget();
+                return notifyCheckingforUpdates;
             }
-
-            return notifyCheckingforUpdates;
-        }
+}
 
         private void OnCopyProgress(object sender, ProgressEventArgs eventArgs)
         {

code/src/Core/PostActions/Catalog/Merge/IEnumerableExtensions.cs

@@ -12,14 +12,16 @@ public static class IEnumerableExtensions
     {
         internal const string MacroBeforeMode = "^^";
         internal const string MacroStartGroup = "{[{";
-        internal const string MarcoEndGroup = "}]}";
+        internal const string MacroEndGroup = "}]}";
 
         internal const string MacroStartDocumentation = "{**";
         internal const string MacroEndDocumentation = "**}";
 
         private const string MacroStartDelete = "{--{";
         private const string MacroEndDelete = "}--}";
 
+        private static string[] macros = new string[] { MacroBeforeMode, MacroStartGroup, MacroEndGroup, MacroStartDocumentation, MacroEndDocumentation, MacroStartDelete, MacroEndDelete };
+
         private const string OpeningBrace = "{";
         private const string ClosingBrace = "}";
 
@@ -56,98 +58,133 @@ public static IEnumerable<string> Merge(this IEnumerable<string> source, IEnumer
             errorLine = string.Empty;
             int lastLineIndex = -1;
             var insertionBuffer = new List<string>();
+            var removalBuffer = new List<string>();
 
             bool beforeMode = false;
-            bool isInBlock = false;
-            bool isInDocumentation = false;
+            MergeMode mergeMode = MergeMode.Context;
 
             var diffTrivia = FindDiffLeadingTrivia(source, merge);
             var result = source.ToList();
             var currentLineIndex = -1;
 
             foreach (var mergeLine in merge)
             {
-                if (!isInBlock && !isInDocumentation)
+                // try to find line
+                if (mergeMode == MergeMode.Context)
                 {
                     currentLineIndex = result.SafeIndexOf(mergeLine.WithLeadingTrivia(diffTrivia), lastLineIndex);
                 }
 
+                // if line is found, add buffer if any
                 if (currentLineIndex > -1)
                 {
                     var linesAdded = TryAddBufferContent(insertionBuffer, result, lastLineIndex, currentLineIndex, beforeMode);
+                    var linesRemoved = TryRemoveBufferContent(removalBuffer, result, lastLineIndex, currentLineIndex);
 
-                    if (beforeMode)
+                    if (linesAdded > 0)
                     {
-                        beforeMode = false;
+                        lastLineIndex = currentLineIndex + linesAdded;
                     }
 
-                    lastLineIndex = currentLineIndex + linesAdded;
-                    insertionBuffer.Clear();
-                }
-                else
-                {
-                    if (mergeLine.Contains(MacroBeforeMode))
+                    if (linesRemoved > 0)
                     {
-                        beforeMode = true;
+                        lastLineIndex = currentLineIndex - linesRemoved;
                     }
-                    else if (mergeLine.Contains(MacroStartGroup))
-                    {
-                        isInBlock = true;
-                    }
-                    else if (mergeLine.Contains(MarcoEndGroup))
-                    {
-                        isInBlock = false;
-                    }
-                    else if (!isInDocumentation && (isInBlock || mergeLine == string.Empty))
+
+                    if (beforeMode)
                     {
-                        insertionBuffer.Add(mergeLine.WithLeadingTrivia(diffTrivia));
+                        beforeMode = false;
                     }
-                    else if (mergeLine.Contains(MacroStartDocumentation))
+
+                    if (linesRemoved == 0 && linesAdded == 0)
                     {
-                        isInDocumentation = true;
+                        lastLineIndex = currentLineIndex;
                     }
-                    else if (mergeLine.Contains(MacroEndDocumentation))
+
+                    insertionBuffer.Clear();
+                    removalBuffer.Clear();
+                }
+                else
+                {
+                    // if line is not found check if merge direction, else add to buffer
+                    if (IsMergeDirection(mergeLine))
                     {
-                        isInDocumentation = false;
+                        mergeMode = GetMergeMode(mergeLine, mergeMode);
                     }
-                    else if (!isInDocumentation)
+                    else
                     {
-                        errorLine = mergeLine;
-                        return source;
+                        if (mergeMode == MergeMode.Insert || mergeMode == MergeMode.InsertBefore || mergeLine == string.Empty)
+                        {
+                            if (mergeMode == MergeMode.InsertBefore)
+                            {
+                                beforeMode = true;
+                            }
+
+                            insertionBuffer.Add(mergeLine.WithLeadingTrivia(diffTrivia));
+                        }
+                        else if (mergeMode == MergeMode.Remove)
+                        {
+                            removalBuffer.Add(mergeLine.WithLeadingTrivia(diffTrivia));
+                        }
+                        else if (mergeMode == MergeMode.Context)
+                        {
+                            errorLine = mergeLine;
+                            return source;
+                        }
                     }
                 }
             }
 
             TryAddBufferContent(insertionBuffer, result, lastLineIndex);
+            TryRemoveBufferContent(removalBuffer, result, lastLineIndex);
 
             return result;
         }
 
-        // Removes anything from the target file that should be deleted.
-        public static List<string> HandleRemovals(this IEnumerable<string> source, IEnumerable<string> merge)
+        private static bool IsMergeDirection(string mergeLine)
         {
-            var mergeString = string.Join(Environment.NewLine, merge);
-            var sourceString = string.Join(Environment.NewLine, source);
-
-            var startIndex = mergeString.IndexOf(MacroStartDelete, StringComparison.OrdinalIgnoreCase);
-            var endIndex = mergeString.IndexOf(MacroEndDelete, StringComparison.OrdinalIgnoreCase);
+            return macros.Any(c => mergeLine.Contains(c));
+        }
 
-            while (startIndex > 0 && endIndex > startIndex)
+        private static MergeMode GetMergeMode(string mergeLine, MergeMode current)
+        {
+            if (mergeLine.Contains(MacroBeforeMode))
             {
-                // VB uses a single character (') to start the comment, C# uses two (//)
-                int commentIndicatorLength = mergeString[startIndex - 1] == '\'' ? 1 : 2;
-
-                var toRemove = mergeString.Substring(
-                    (startIndex - commentIndicatorLength) + (MacroStartDelete.Length + commentIndicatorLength),
-                    (endIndex - commentIndicatorLength) - (startIndex - commentIndicatorLength) - (MacroStartDelete.Length + commentIndicatorLength));
-
-                sourceString = sourceString.Replace(toRemove, string.Empty);
-                mergeString = mergeString.Substring(endIndex + MacroEndDelete.Length);
-                startIndex = mergeString.IndexOf(MacroStartDelete, StringComparison.InvariantCultureIgnoreCase);
-                endIndex = mergeString.IndexOf(MacroEndDelete, StringComparison.InvariantCultureIgnoreCase);
+                return MergeMode.InsertBefore;
+            }
+            else if (mergeLine.Contains(MacroStartGroup))
+            {
+                if (current == MergeMode.InsertBefore)
+                {
+                    return MergeMode.InsertBefore;
+                }
+                else
+                {
+                    return MergeMode.Insert;
+                }
+            }
+            else if (mergeLine.Contains(MacroEndGroup))
+            {
+                return MergeMode.Context;
+            }
+            else if (mergeLine.Contains(MacroStartDocumentation))
+            {
+                return MergeMode.Documentation;
+            }
+            else if (mergeLine.Contains(MacroEndDocumentation))
+            {
+                return MergeMode.Context;
+            }
+            else if (mergeLine.Contains(MacroStartDelete))
+            {
+                return MergeMode.Remove;
+            }
+            else if (mergeLine.Contains(MacroEndDelete))
+            {
+                return MergeMode.Context;
             }
 
-            return sourceString.Split(new[] { Environment.NewLine }, StringSplitOptions.None).ToList();
+            return current;
         }
 
         // Remove any comments from the merged file that indicate something should be removed.
@@ -198,6 +235,21 @@ private static int TryAddBufferContent(List<string> insertionBuffer, List<string
             return 0;
         }
 
+        private static int TryRemoveBufferContent(List<string> removalBuffer, List<string> result, int lastLineIndex, int currentLineIndex = 0)
+        {
+            if (removalBuffer.Any() && BlockExists(removalBuffer, result, lastLineIndex) && currentLineIndex > -1)
+            {
+                var index = result.SafeIndexOf(removalBuffer[0], lastLineIndex);
+                if (index <= currentLineIndex)
+                {
+                    result.RemoveRange(index, removalBuffer.Count);
+                    return removalBuffer.Count;
+                }
+            }
+
+            return 0;
+        }
+
         private static void EnsureNoWhiteLinesNextToBraces(List<string> insertionBuffer, List<string> result, int insertIndex)
         {
             if (LastLineIsOpeningBrace(result, insertIndex) && insertionBuffer.First().Trim() == string.Empty)
@@ -242,9 +294,9 @@ private static bool BlockExists(IEnumerable<string> blockBuffer, IEnumerable<str
                         .All(b => target.SafeIndexOf(b, skip) > -1);
         }
 
-        private static int GetInsertLineIndex(int currentLine, int lastLine, bool isBeforeMode)
+        private static int GetInsertLineIndex(int currentLine, int lastLine, bool beforeMode)
         {
-            if (isBeforeMode)
+            if (beforeMode)
             {
                 return currentLine;
             }

code/src/Core/PostActions/Catalog/Merge/MergeMode.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Templates.Core.PostActions.Catalog.Merge
+{
+    public enum MergeMode
+    {
+        InsertBefore,
+        Insert,
+        Remove,
+        Documentation,
+        Context
+    }
+}