File tree Expand file tree Collapse file tree 7 files changed +10
-25
lines changed
Java.Interop.Localization
Java.Interop.Tools.Diagnostics
Java.Interop.Tools.JavaCallableWrappers Expand file tree Collapse file tree 7 files changed +10
-25
lines changed Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" utf-8" ?>
22<Project >
33
4+ <!-- Automatically add NRT attribute support for netstandard2.0 projects using NRT -->
5+ <ItemGroup Condition =" '$(TargetFramework)' == 'netstandard2.0' AND '$(Nullable)' == 'enable' " >
6+ <Compile Include =" $(MSBuildThisFileDirectory)src\utils\NullableAttributes.cs" Visible =" false" />
7+ </ItemGroup >
8+
9+ <PropertyGroup Condition =" '$(TargetFramework)' == 'netstandard2.0' AND '$(Nullable)' == 'enable' " >
10+ <DefineConstants >$(DefineConstants);INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants >
11+ </PropertyGroup >
12+
413 <!-- Add Roslyn analyzers NuGet to all projects -->
514 <ItemGroup Condition =" '$(DisableRoslynAnalyzers)' != 'True' " >
615 <PackageReference Include =" Microsoft.CodeAnalysis.FxCopAnalyzers" Version =" 3.3.0" >
Original file line number Diff line number Diff line change 44 <TargetFramework >netstandard2.0</TargetFramework >
55 <LangVersion >8.0</LangVersion >
66 <Nullable >enable</Nullable >
7- <DefineConstants >INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants >
87 <NeutralLanguage >en</NeutralLanguage >
98 <SignAssembly >true</SignAssembly >
109 <AssemblyOriginatorKeyFile >..\..\product.snk</AssemblyOriginatorKeyFile >
2019 </Compile >
2120 </ItemGroup >
2221
23- <ItemGroup >
24- <Compile Include =" ..\utils\NullableAttributes.cs" />
25- </ItemGroup >
26-
2722 <ItemGroup >
2823 <EmbeddedResource Update =" Resources.resx" >
2924 <Generator >PublicResXFileCodeGenerator</Generator >
Original file line number Diff line number Diff line change 44 <TargetFramework >netstandard2.0</TargetFramework >
55 <LangVersion >8.0</LangVersion >
66 <Nullable >enable</Nullable >
7- <DefineConstants >INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants >
87 <SignAssembly >true</SignAssembly >
98 <AssemblyOriginatorKeyFile >..\..\product.snk</AssemblyOriginatorKeyFile >
109 </PropertyGroup >
1716
1817 <Import Project =" ..\..\build-tools\scripts\cecil.projitems" />
1918
20- <ItemGroup >
21- <Compile Include =" ..\utils\NullableAttributes.cs" />
22- </ItemGroup >
23-
2419 <ItemGroup >
2520 <ProjectReference Include =" ..\Java.Interop.Localization\Java.Interop.Localization.csproj" />
2621 <ProjectReference Include =" ..\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
Original file line number Diff line number Diff line change 44 <TargetFramework >netstandard2.0</TargetFramework >
55 <LangVersion >8.0</LangVersion >
66 <Nullable >enable</Nullable >
7- <DefineConstants >INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants >
87 <SignAssembly >true</SignAssembly >
98 <AssemblyOriginatorKeyFile >..\..\product.snk</AssemblyOriginatorKeyFile >
109 </PropertyGroup >
1716
1817 <Import Project =" ..\..\build-tools\scripts\cecil.projitems" />
1918
20- <ItemGroup >
21- <Compile Include =" ..\utils\NullableAttributes.cs" />
22- </ItemGroup >
23-
2419 <ItemGroup >
2520 <PackageReference Include =" Microsoft.SourceLink.GitHub" PrivateAssets =" All" />
2621 </ItemGroup >
Original file line number Diff line number Diff line change 2323 <Compile Include =" ..\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings\JavaNativeTypeManager.cs" >
2424 <Link >JavaNativeTypeManager.cs</Link >
2525 </Compile >
26- <Compile Include =" ..\utils\NullableAttributes.cs" >
27- <Link >NullableAttributes.cs</Link >
28- </Compile >
2926 </ItemGroup >
3027
3128 <ItemGroup >
Original file line number Diff line number Diff line change 44 <TargetFramework >netstandard2.0</TargetFramework >
55 <LangVersion >11.0</LangVersion >
66 <Nullable >enable</Nullable >
7- <DefineConstants >INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants >
87 <Nullable >enable</Nullable >
98 <SignAssembly >true</SignAssembly >
109 <AssemblyOriginatorKeyFile >..\..\product.snk</AssemblyOriginatorKeyFile >
1615 <OutputPath >$(UtilityOutputFullPath)</OutputPath >
1716 </PropertyGroup >
1817
19- <ItemGroup >
20- <Compile Include =" ..\utils\NullableAttributes.cs" />
21- </ItemGroup >
22-
2318 <ItemGroup >
2419 <PackageReference Include =" Microsoft.SourceLink.GitHub" PrivateAssets =" All" />
2520 </ItemGroup >
Original file line number Diff line number Diff line change 2424 </PropertyGroup >
2525 <Import Project =" ..\..\TargetFrameworkDependentValues.props" />
2626 <PropertyGroup >
27- <DefineConstants >INTEROP;FEATURE_JNIOBJECTREFERENCE_INTPTRS;INTERNAL_NULLABLE_ATTRIBUTES; $(JavaInteropDefineConstants)</DefineConstants >
27+ <DefineConstants >INTEROP;FEATURE_JNIOBJECTREFERENCE_INTPTRS;$(JavaInteropDefineConstants)</DefineConstants >
2828 <IntermediateOutputPath >$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework.ToLowerInvariant())\</IntermediateOutputPath >
2929 <OutputPath >$(ToolOutputFullPath)</OutputPath >
3030 <DocumentationFile >$(ToolOutputFullPath)Java.Interop.xml</DocumentationFile >
4242 <DefineConstants >FEATURE_JNIENVIRONMENT_JI_PINVOKES;$(DefineConstants)</DefineConstants >
4343 </PropertyGroup >
4444 <ItemGroup >
45- <Compile Condition =" '$(TargetFramework)' == 'netstandard2.0' " Include =" ..\utils\NullableAttributes.cs" />
4645 <Compile Remove =" Java.Interop\JniLocationException.cs" />
4746 </ItemGroup >
4847 <PropertyGroup >
You can’t perform that action at this time.
0 commit comments