Merge branch 'bugfix/ikvmc-nowarnerror' into develop

iterate-ch · Jul 25, 2024 · 9340d53 · 9340d53
2 parents 37bb351 + 5edd1d2
commit 9340d53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets b/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets
@@ -277,6 +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="-warnaserror" Condition=" '$(TreatWarningsAsErrors)' == 'true' " />
+            <_IkvmCompilerArgs Include="-warnaserror:&quot;$(WarningsAsErrors)&quot;" 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
@@ -126,6 +126,9 @@
             Platform="$(PlatformTarget.ToLowerInvariant())"
             Main="$(StartupObject)"
             Debug="$(DebugType)"
+            NoWarn="$(NoWarn)"
+            WarnAsError="$(TreatWarningsAsErrors)"
+            WarnAsErrorWarnings="$(WarningsAsErrors)"
             KeyFile="$(KeyOriginatorFile)"
             CompressResources="$(CompressResources)"
             ClassLoader="$(ClassLoader)"