Handle "template:" references lacking "- " prefix

Author: Bruce Haley

ExportPipelineDefinitions/ExportPipelineDefinitions.csproj

@@ -48,12 +48,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Json, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c6752e45808247c2, processorArchitecture=MSIL">
-      <HintPath>..\packages\JSON.1.0.1\lib\net40\Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=(13.0.1,), Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -74,7 +68,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -93,5 +86,13 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="JSON">
+      <Version>1.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

ExportPipelineDefinitions/Program.cs

@@ -523,17 +523,18 @@ private static bool DownloadFileFromGithub(string githubFileUrl, string outputFi
         private static void AddYamlTemplateReferencesFromFile(
             string targetFullFilePath, string currentOffsetFromRootUrl, ref List<string> yamlFileNames)
         {
-            //List<string> references = new List<string>();
-            string match = "- template:";
+            string match = "template:";
 
             var lines = File.ReadLines(targetFullFilePath);
             foreach (string line in lines)
             {
                 if (line.Contains(match))
                 {
-                    string name = line.Replace(match, "").Trim();
-                    int index = name.IndexOf("#");
-                    if (index >= 0) name = name.Remove(index).TrimEnd(); // Remove any comment
+                    string name = line.Trim();
+                    if (name.StartsWith("::")) name = ""; // Delete an inline script comment.
+                    int index = name.IndexOf("#"); // Find and remove any other comment.
+                    if (index >= 0) name = name.Remove(index).TrimEnd();
+                    name = name.TrimStart('-').Replace(match, "").Trim(); // TrimStart() handles the case of "- template:".
                     if (!String.IsNullOrWhiteSpace(name))
                     {
                         // Normalize the relative path.

ExportPipelineDefinitions/Properties/AssemblyInfo.cs

@@ -32,5 +32,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.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]