From b99c6b92f2cc18e65669c93e44dd4f31c1119e13 Mon Sep 17 00:00:00 2001
From: Stephen Bonikowsky <stebon@microsoft.com>
Date: Tue, 4 Feb 2020 14:30:57 -0800
Subject: [PATCH] Fix for tool command line syntax issue.

---
 src/svcutilcore/files/dotnet-svcutil.xmlserializer.targets  | 2 +-
 .../src/Microsoft/Tools/ServiceModel/SvcUtil/Options.cs     | 6 +++++-
 .../dotnet-svcutil.xmlserializer.IntegrationTests.csproj    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/svcutilcore/files/dotnet-svcutil.xmlserializer.targets b/src/svcutilcore/files/dotnet-svcutil.xmlserializer.targets
index 997d823bb3c..d6974d0dce0 100644
--- a/src/svcutilcore/files/dotnet-svcutil.xmlserializer.targets
+++ b/src/svcutilcore/files/dotnet-svcutil.xmlserializer.targets
@@ -5,7 +5,7 @@
     <_SerializerDllIntermediateFolder>$(IntermediateOutputPath)$(_SerializationAssemblyName).dll</_SerializerDllIntermediateFolder>
     <_SerializerPdbIntermediateFolder>$(IntermediateOutputPath)$(_SerializationAssemblyName).pdb</_SerializerPdbIntermediateFolder>
     <_SerializerCsIntermediateFolder>$(IntermediateOutputPath)$(_SerializationAssemblyName).cs</_SerializerCsIntermediateFolder>
-    <_SvcUtilWarningText>Warning : Fail to generate the serializer for $(AssemblyName)$(TargetExt).</_SvcUtilWarningText>
+    <_SvcUtilWarningText>Warning : Failed to generate the serializer for $(AssemblyName)$(TargetExt).</_SvcUtilWarningText>
     <_SerializationAssemblyDisabledWarnings>$(NoWarn);219;162;$(SerializationAssemblyDisabledWarnings)</_SerializationAssemblyDisabledWarnings>
   </PropertyGroup>
 
diff --git a/src/svcutilcore/src/Microsoft/Tools/ServiceModel/SvcUtil/Options.cs b/src/svcutilcore/src/Microsoft/Tools/ServiceModel/SvcUtil/Options.cs
index 3e915771786..2766f5ed5df 100644
--- a/src/svcutilcore/src/Microsoft/Tools/ServiceModel/SvcUtil/Options.cs
+++ b/src/svcutilcore/src/Microsoft/Tools/ServiceModel/SvcUtil/Options.cs
@@ -414,8 +414,10 @@ private void AddMscorlib(Dictionary<string, Type> foundCollectionTypes)
 
             private void LoadSMReferenceAssembly()
             {
+                ToolConsole.WriteLine("[Logging] Getting list of referenced assemblies.");
                 string smReferenceArg = _arguments.GetArgument(Options.Cmd.SMReference);
-                IList<string> referencedAssembliesArgs = smReferenceArg.Split(':').ToList();
+                ToolConsole.WriteLine("[Logging] The string of reference assemblies before parsing: " + smReferenceArg);
+                IList<string> referencedAssembliesArgs = smReferenceArg.Split(';').ToList();
                 if (referencedAssembliesArgs != null && referencedAssembliesArgs.Count > 0)
                 {
                     string smassembly = "";
@@ -435,6 +437,8 @@ private void LoadSMReferenceAssembly()
                     }
                     if ((string.IsNullOrEmpty(smassembly)) || (string.IsNullOrEmpty(smpassembly)))
                     {
+                        ToolConsole.WriteLine("The full path found for System.ServiceModel.Primitives.dll is: " + smassembly);
+                        ToolConsole.WriteLine("The full path found for System.Private.ServiceModel.dll is: " + smpassembly);
                         ToolConsole.WriteError("Missing one or both of the paths for System.ServiceModel.Primitives and System.Private.ServiceModel");
                         throw new ArgumentException("Invalid smreference value");
                     }
diff --git a/src/svcutilcore/tests/dotnet-svcutil.xmlserializer.IntegrationTests.csproj b/src/svcutilcore/tests/dotnet-svcutil.xmlserializer.IntegrationTests.csproj
index b66b233e204..ffd45da3b0c 100644
--- a/src/svcutilcore/tests/dotnet-svcutil.xmlserializer.IntegrationTests.csproj
+++ b/src/svcutilcore/tests/dotnet-svcutil.xmlserializer.IntegrationTests.csproj
@@ -85,7 +85,7 @@
     <Message Text="$(ServiceModelPrimitivesAssemblyName) exists in $(ServiceModelPrimitivesOutputPath)" Condition="Exists('$(ServiceModelPrimitivesOutputPath)$(ServiceModelPrimitivesAssemblyName)') == 'true'" Importance="high" />
     <Error Text="$(ServiceModelPrivateAssemblyName) does not exist in $(ServiceModelPrivateOutputPath)" Condition="Exists('$(ServiceModelPrivateOutputPath)$(ServiceModelPrivateAssemblyName)') != 'true'" />
     <Error Text="$(ServiceModelPrimitivesAssemblyName) does not exist in $(ServiceModelPrimitivesOutputPath)" Condition="Exists('$(ServiceModelPrimitivesOutputPath)$(ServiceModelPrimitivesAssemblyName)') != 'true'" />
-    <Exec Command="$(DotNetExe) $(DotnetSvcutilXmlSerializerAssembly) $(InputTestAssembly) --quiet --out:$(OutputGeneratedSource) --smreference:$(ServiceModelPrimitivesAssembly):$(ServiceModelPrivateAssembly) --reference=$(depRef)" />
+    <Exec Command="$(DotNetExe) $(DotnetSvcutilXmlSerializerAssembly) $(InputTestAssembly) --quiet --out:$(OutputGeneratedSource) --smreference:&quot;$(ServiceModelPrimitivesAssembly);$(ServiceModelPrivateAssembly)&quot; --reference=$(depRef)" />
     <Warning Condition="Exists('$(OutputGeneratedSource)') != 'true'" Text="Failed to generate $(OutputGeneratedSource)"/>
     <Csc Condition="Exists('$(OutputGeneratedSource)') == 'true'"
          OutputAssembly="$(CscOutputAssembly)"