diff --git a/build/DotnetValidation/DotnetValidation.csproj b/build/DotnetValidation/DotnetValidation.csproj
index 99293ddc..3ca03903 100644
--- a/build/DotnetValidation/DotnetValidation.csproj
+++ b/build/DotnetValidation/DotnetValidation.csproj
@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net20;net30;net35;net35-cf;net40;net45;netcoreapp1.1;portable40-net40+sl5+win8+wp8+wpa81</TargetFrameworks>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
     <Antlr4UseCSharpGenerator>True</Antlr4UseCSharpGenerator>
+    <Configurations>Debug;Release;New Config With Space</Configurations>
   </PropertyGroup>
 
   <Choose>
diff --git a/build/DotnetValidation/DotnetValidation.sln b/build/DotnetValidation/DotnetValidation.sln
index 485e8984..71f07fc2 100644
--- a/build/DotnetValidation/DotnetValidation.sln
+++ b/build/DotnetValidation/DotnetValidation.sln
@@ -1,18 +1,21 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26621.2
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.202
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetValidation", "DotnetValidation.csproj", "{E1557B8D-28E5-4D82-AD1F-F483CD8ED931}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		New Config With Space|Any CPU = New Config With Space|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{E1557B8D-28E5-4D82-AD1F-F483CD8ED931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1557B8D-28E5-4D82-AD1F-F483CD8ED931}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1557B8D-28E5-4D82-AD1F-F483CD8ED931}.New Config With Space|Any CPU.ActiveCfg = New Config With Space|Any CPU
+		{E1557B8D-28E5-4D82-AD1F-F483CD8ED931}.New Config With Space|Any CPU.Build.0 = New Config With Space|Any CPU
 		{E1557B8D-28E5-4D82-AD1F-F483CD8ED931}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1557B8D-28E5-4D82-AD1F-F483CD8ED931}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTaskInternal.cs b/runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTaskInternal.cs
index 852d4e8c..de7be23c 100644
--- a/runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTaskInternal.cs
+++ b/runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTaskInternal.cs
@@ -244,8 +244,9 @@ public bool Execute()
                 }
 
                 arguments.Add("-o");
-                arguments.Add(OutputPath);
-
+                // Wrap output path with quotes to work with cmdline
+                arguments.Add("\""+ OutputPath + "\"");
+                    
                 if (!string.IsNullOrEmpty(Encoding))
                 {
                     arguments.Add("-encoding");