From 00f6b4c3f34e469a81008e1fc69eda245b0f18a8 Mon Sep 17 00:00:00 2001
From: Nehme Bilal <nbilal@microsoft.com>
Date: Fri, 2 Mar 2018 14:41:40 -0800
Subject: [PATCH] Add support for Platform and allow partial success when
 generating stubs

Instead of failing the subs generation when the workspace has errors,
ignore projects that don't open.

Resolves #37
---
 NuGet/SimpleStubs.nuspec                                | 2 +-
 Targets/Etg.SimpleStubs.targets                         | 2 +-
 src/SimpleStubs.CodeGen/CodeGen/SimpleStubsGenerator.cs | 9 ++++++---
 src/SimpleStubs.CodeGen/Program.cs                      | 9 ++++++++-
 test/TestClassLibraryTest/Etg.SimpleStubs.targets       | 2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/NuGet/SimpleStubs.nuspec b/NuGet/SimpleStubs.nuspec
index 09c8a44..a241a69 100644
--- a/NuGet/SimpleStubs.nuspec
+++ b/NuGet/SimpleStubs.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Etg.SimpleStubs</id>
-    <version>2.4.2</version>
+    <version>2.4.3</version>
     <title>SimpleStubs Mocking Framework (C#).</title>
     <authors>Nehme Bilal</authors>
     <owners>Microsoft</owners>
diff --git a/Targets/Etg.SimpleStubs.targets b/Targets/Etg.SimpleStubs.targets
index 2fcbc0f..9da5cf3 100644
--- a/Targets/Etg.SimpleStubs.targets
+++ b/Targets/Etg.SimpleStubs.targets
@@ -15,7 +15,7 @@
       
     <Exec
       WorkingDirectory="$(ProjectDir)"
-      Command="$(MSBuildThisFileDirectory)\..\tools\Etg.SimpleStubs.CodeGen.exe -ProjectPath:&quot;$(ProjectDir)$(ProjectName).csproj&quot; -OutputPath:&quot;$(SimpleStubsCodeGenOutput)&quot; -Configuration:&quot;$(Configuration)&quot;" />
+      Command="$(MSBuildThisFileDirectory)\..\tools\Etg.SimpleStubs.CodeGen.exe -ProjectPath:&quot;$(ProjectDir)$(ProjectName).csproj&quot; -OutputPath:&quot;$(SimpleStubsCodeGenOutput)&quot; -Configuration:&quot;$(Configuration)&quot; -Platform:&quot;$(Platform)&quot;" />
     
     <ItemGroup>
       <Compile Include="$(SimpleStubsCodeGenOutput)" /> 
diff --git a/src/SimpleStubs.CodeGen/CodeGen/SimpleStubsGenerator.cs b/src/SimpleStubs.CodeGen/CodeGen/SimpleStubsGenerator.cs
index c02fadd..bfbf549 100644
--- a/src/SimpleStubs.CodeGen/CodeGen/SimpleStubsGenerator.cs
+++ b/src/SimpleStubs.CodeGen/CodeGen/SimpleStubsGenerator.cs
@@ -25,9 +25,12 @@ namespace Etg.SimpleStubs.CodeGen
             _config = config;
         }
 
-        public async Task<string> GenerateStubs(string testProjectPath, string configuration)
+        public async Task<string> GenerateStubs(string testProjectPath, string configuration, string platform)
         {
-            using (var workspace = MSBuildWorkspace.Create(new Dictionary<string, string> { { "Configuration", configuration } }))
+            using (var workspace = MSBuildWorkspace.Create(new Dictionary<string, string> {
+                { "Configuration", configuration },
+                { "Platform", platform}
+            }))
             {
                 Project currentProject = await workspace.OpenProjectAsync(testProjectPath);
 
@@ -38,7 +41,7 @@ namespace Etg.SimpleStubs.CodeGen
                     {
                         stringBuilder.AppendLine(diagnostic.ToString());
                     }
-                    throw new Exception("Failed to open project, Errors: " + stringBuilder.ToString());
+                    Console.WriteLine("Simplestubs encountered errors when opening the workspace; Stubs will be generated only for projects that successfully opened. Errors: " + stringBuilder.ToString());
                 }
 
                 if (currentProject == null)
diff --git a/src/SimpleStubs.CodeGen/Program.cs b/src/SimpleStubs.CodeGen/Program.cs
index 009727e..8cdc7e0 100644
--- a/src/SimpleStubs.CodeGen/Program.cs
+++ b/src/SimpleStubs.CodeGen/Program.cs
@@ -39,6 +39,13 @@ namespace Etg.SimpleStubs.CodeGen
                 return;
             }
 
+            string platform = parser.Arguments["-Platform"];
+            if (string.IsNullOrEmpty(platform))
+            {
+                Console.WriteLine(DecorateMessage($"Platform cannot be empty"));
+                return;
+            }
+
             DiModule diModule = new DiModule(projectPath, outputPath);
             Directory.CreateDirectory(Path.GetDirectoryName(outputPath));
 
@@ -46,7 +53,7 @@ namespace Etg.SimpleStubs.CodeGen
 
             try
             {
-                string stubsCode = diModule.StubsGenerator.GenerateStubs(projectPath, configuration).Result;
+                string stubsCode = diModule.StubsGenerator.GenerateStubs(projectPath, configuration, platform).Result;
                 Console.WriteLine(DecorateMessage($"Writing stubs to file: {outputPath}"));
                 File.WriteAllText(outputPath, stubsCode);
             }
diff --git a/test/TestClassLibraryTest/Etg.SimpleStubs.targets b/test/TestClassLibraryTest/Etg.SimpleStubs.targets
index fec2e74..3a01b44 100644
--- a/test/TestClassLibraryTest/Etg.SimpleStubs.targets
+++ b/test/TestClassLibraryTest/Etg.SimpleStubs.targets
@@ -15,7 +15,7 @@
       
     <Exec
       WorkingDirectory="$(ProjectDir)"
-      Command="..\..\src\SimpleStubs.CodeGen\bin\$(ConfigurationName)\Etg.SimpleStubs.CodeGen.exe -ProjectPath:&quot;$(ProjectDir)$(ProjectName).csproj'&quot; -OutputPath:&quot;$(SimpleStubsCodeGenOutput)&quot; -Configuration:&quot;$(Configuration)&quot;" />
+      Command="..\..\src\SimpleStubs.CodeGen\bin\$(ConfigurationName)\Etg.SimpleStubs.CodeGen.exe -ProjectPath:&quot;$(ProjectDir)$(ProjectName).csproj'&quot; -OutputPath:&quot;$(SimpleStubsCodeGenOutput)&quot; -Configuration:&quot;$(Configuration)&quot; -Platform:&quot;$(Platform)&quot;" />
     
     <ItemGroup>
       <Compile Include="$(SimpleStubsCodeGenOutput)" />