diff --git a/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets b/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets
index 6125691e4..fae26f215 100644
--- a/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets
+++ b/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets
@@ -277,9 +277,9 @@ Value = b.ToString();
             <_IkvmCompilerArgs Include="-nologo" />
             <_IkvmCompilerArgs Include="-bootstrap" Condition=" '$(Bootstrap)' == 'true' " />
             <_IkvmCompilerArgs Include="-debug:$(DebugType)" Condition=" '$(DebugType)' != 'none' " />
-            <_IkvmCompilerArgs Include="-nowarn:&quot;$(NoWarn)&quot;" Condition=" '$(NoWarn)' != '' " />
+            <_IkvmCompilerArgs Include="-nowarn:$(NoWarn.Replace(';', ','))" Condition=" '$(NoWarn)' != '' " />
             <_IkvmCompilerArgs Include="-warnaserror" Condition=" '$(TreatWarningsAsErrors)' == 'true' " />
-            <_IkvmCompilerArgs Include="-warnaserror:&quot;$(WarningsAsErrors)&quot;" Condition=" '$(TreatWarningsAsErrors)' != 'true' And '$(WarningsAsErrors)' != '' " />
+            <_IkvmCompilerArgs Include="-warnaserror:$(WarningsAsErrors.Replace(';', ','))" Condition=" '$(TreatWarningsAsErrors)' != 'true' And '$(WarningsAsErrors)' != '' " />
             <_IkvmCompilerArgs Include="-assembly:$(AssemblyName)" />
             <_IkvmCompilerArgs Include="-version:$(AssemblyVersion)" />
             <_IkvmCompilerArgs Include="-runtime:$(IkvmRuntimeAssembly)" />
diff --git a/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.Tasks.targets b/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.Tasks.targets
index 49b6f507f..e0baab8a5 100644
--- a/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.Tasks.targets
+++ b/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.Tasks.targets
@@ -126,9 +126,9 @@
             Platform="$(PlatformTarget.ToLowerInvariant())"
             Main="$(StartupObject)"
             Debug="$(DebugType)"
-            NoWarn="$(NoWarn)"
+            NoWarn="$(NoWarn.Replace(',', ';'))"
             WarnAsError="$(TreatWarningsAsErrors)"
-            WarnAsErrorWarnings="$(WarningsAsErrors)"
+            WarnAsErrorWarnings="$(WarningsAsErrors.Replace(',', ';'))"
             KeyFile="$(KeyOriginatorFile)"
             CompressResources="$(CompressResources)"
             ClassLoader="$(ClassLoader)"