diff --git a/Directory.Build.targets b/Directory.Build.targets index 2bf1fe066..9d1bd9a36 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,15 @@ + + + + + + + $(DefineConstants);INTERNAL_NULLABLE_ATTRIBUTES + + diff --git a/src/Java.Interop.Localization/Java.Interop.Localization.csproj b/src/Java.Interop.Localization/Java.Interop.Localization.csproj index c6d6936fa..1186ef2d6 100644 --- a/src/Java.Interop.Localization/Java.Interop.Localization.csproj +++ b/src/Java.Interop.Localization/Java.Interop.Localization.csproj @@ -4,7 +4,6 @@ netstandard2.0 8.0 enable - INTERNAL_NULLABLE_ATTRIBUTES en true ..\..\product.snk @@ -20,10 +19,6 @@ - - - - PublicResXFileCodeGenerator diff --git a/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj index 1edf67fa5..b36defd33 100644 --- a/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj +++ b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj @@ -4,7 +4,6 @@ netstandard2.0 8.0 enable - INTERNAL_NULLABLE_ATTRIBUTES true ..\..\product.snk @@ -17,10 +16,6 @@ - - - - diff --git a/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj b/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj index 7f420d9e4..e4b61663d 100644 --- a/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj +++ b/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj @@ -4,7 +4,6 @@ netstandard2.0 8.0 enable - INTERNAL_NULLABLE_ATTRIBUTES true ..\..\product.snk @@ -17,10 +16,6 @@ - - - - diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj index 8163659f8..63e7835eb 100644 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj +++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj @@ -23,9 +23,6 @@ JavaNativeTypeManager.cs - - NullableAttributes.cs - diff --git a/src/Java.Interop.Tools.Maven/Java.Interop.Tools.Maven.csproj b/src/Java.Interop.Tools.Maven/Java.Interop.Tools.Maven.csproj index fe6539774..2eca9a9a3 100644 --- a/src/Java.Interop.Tools.Maven/Java.Interop.Tools.Maven.csproj +++ b/src/Java.Interop.Tools.Maven/Java.Interop.Tools.Maven.csproj @@ -4,7 +4,6 @@ netstandard2.0 11.0 enable - INTERNAL_NULLABLE_ATTRIBUTES enable true ..\..\product.snk @@ -16,10 +15,6 @@ $(UtilityOutputFullPath) - - - - diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj index 3a7dd4325..1c4f0c681 100644 --- a/src/Java.Interop/Java.Interop.csproj +++ b/src/Java.Interop/Java.Interop.csproj @@ -24,7 +24,7 @@ - INTEROP;FEATURE_JNIOBJECTREFERENCE_INTPTRS;INTERNAL_NULLABLE_ATTRIBUTES;$(JavaInteropDefineConstants) + INTEROP;FEATURE_JNIOBJECTREFERENCE_INTPTRS;$(JavaInteropDefineConstants) $(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework.ToLowerInvariant())\ $(ToolOutputFullPath) $(ToolOutputFullPath)Java.Interop.xml @@ -42,7 +42,6 @@ FEATURE_JNIENVIRONMENT_JI_PINVOKES;$(DefineConstants) -