File tree 7 files changed +10
-25
lines changed
Java.Interop.Localization
Java.Interop.Tools.Diagnostics
Java.Interop.Tools.JavaCallableWrappers
7 files changed +10
-25
lines changed Original file line number Diff line number Diff line change 1
1
<?xml version =" 1.0" encoding =" utf-8" ?>
2
2
<Project >
3
3
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
+
4
13
<!-- Add Roslyn analyzers NuGet to all projects -->
5
14
<ItemGroup Condition =" '$(DisableRoslynAnalyzers)' != 'True' " >
6
15
<PackageReference Include =" Microsoft.CodeAnalysis.FxCopAnalyzers" Version =" 3.3.0" >
Original file line number Diff line number Diff line change 4
4
<TargetFramework >netstandard2.0</TargetFramework >
5
5
<LangVersion >8.0</LangVersion >
6
6
<Nullable >enable</Nullable >
7
- <DefineConstants >INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants >
8
7
<NeutralLanguage >en</NeutralLanguage >
9
8
<SignAssembly >true</SignAssembly >
10
9
<AssemblyOriginatorKeyFile >..\..\product.snk</AssemblyOriginatorKeyFile >
20
19
</Compile >
21
20
</ItemGroup >
22
21
23
- <ItemGroup >
24
- <Compile Include =" ..\utils\NullableAttributes.cs" />
25
- </ItemGroup >
26
-
27
22
<ItemGroup >
28
23
<EmbeddedResource Update =" Resources.resx" >
29
24
<Generator >PublicResXFileCodeGenerator</Generator >
Original file line number Diff line number Diff line change 4
4
<TargetFramework >netstandard2.0</TargetFramework >
5
5
<LangVersion >8.0</LangVersion >
6
6
<Nullable >enable</Nullable >
7
- <DefineConstants >INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants >
8
7
<SignAssembly >true</SignAssembly >
9
8
<AssemblyOriginatorKeyFile >..\..\product.snk</AssemblyOriginatorKeyFile >
10
9
</PropertyGroup >
17
16
18
17
<Import Project =" ..\..\build-tools\scripts\cecil.projitems" />
19
18
20
- <ItemGroup >
21
- <Compile Include =" ..\utils\NullableAttributes.cs" />
22
- </ItemGroup >
23
-
24
19
<ItemGroup >
25
20
<ProjectReference Include =" ..\Java.Interop.Localization\Java.Interop.Localization.csproj" />
26
21
<ProjectReference Include =" ..\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
Original file line number Diff line number Diff line change 4
4
<TargetFramework >netstandard2.0</TargetFramework >
5
5
<LangVersion >8.0</LangVersion >
6
6
<Nullable >enable</Nullable >
7
- <DefineConstants >INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants >
8
7
<SignAssembly >true</SignAssembly >
9
8
<AssemblyOriginatorKeyFile >..\..\product.snk</AssemblyOriginatorKeyFile >
10
9
</PropertyGroup >
17
16
18
17
<Import Project =" ..\..\build-tools\scripts\cecil.projitems" />
19
18
20
- <ItemGroup >
21
- <Compile Include =" ..\utils\NullableAttributes.cs" />
22
- </ItemGroup >
23
-
24
19
<ItemGroup >
25
20
<PackageReference Include =" Microsoft.SourceLink.GitHub" PrivateAssets =" All" />
26
21
</ItemGroup >
Original file line number Diff line number Diff line change 23
23
<Compile Include =" ..\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings\JavaNativeTypeManager.cs" >
24
24
<Link >JavaNativeTypeManager.cs</Link >
25
25
</Compile >
26
- <Compile Include =" ..\utils\NullableAttributes.cs" >
27
- <Link >NullableAttributes.cs</Link >
28
- </Compile >
29
26
</ItemGroup >
30
27
31
28
<ItemGroup >
Original file line number Diff line number Diff line change 4
4
<TargetFramework >netstandard2.0</TargetFramework >
5
5
<LangVersion >11.0</LangVersion >
6
6
<Nullable >enable</Nullable >
7
- <DefineConstants >INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants >
8
7
<Nullable >enable</Nullable >
9
8
<SignAssembly >true</SignAssembly >
10
9
<AssemblyOriginatorKeyFile >..\..\product.snk</AssemblyOriginatorKeyFile >
16
15
<OutputPath >$(UtilityOutputFullPath)</OutputPath >
17
16
</PropertyGroup >
18
17
19
- <ItemGroup >
20
- <Compile Include =" ..\utils\NullableAttributes.cs" />
21
- </ItemGroup >
22
-
23
18
<ItemGroup >
24
19
<PackageReference Include =" Microsoft.SourceLink.GitHub" PrivateAssets =" All" />
25
20
</ItemGroup >
Original file line number Diff line number Diff line change 24
24
</PropertyGroup >
25
25
<Import Project =" ..\..\TargetFrameworkDependentValues.props" />
26
26
<PropertyGroup >
27
- <DefineConstants >INTEROP;FEATURE_JNIOBJECTREFERENCE_INTPTRS;INTERNAL_NULLABLE_ATTRIBUTES; $(JavaInteropDefineConstants)</DefineConstants >
27
+ <DefineConstants >INTEROP;FEATURE_JNIOBJECTREFERENCE_INTPTRS;$(JavaInteropDefineConstants)</DefineConstants >
28
28
<IntermediateOutputPath >$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework.ToLowerInvariant())\</IntermediateOutputPath >
29
29
<OutputPath >$(ToolOutputFullPath)</OutputPath >
30
30
<DocumentationFile >$(ToolOutputFullPath)Java.Interop.xml</DocumentationFile >
42
42
<DefineConstants >FEATURE_JNIENVIRONMENT_JI_PINVOKES;$(DefineConstants)</DefineConstants >
43
43
</PropertyGroup >
44
44
<ItemGroup >
45
- <Compile Condition =" '$(TargetFramework)' == 'netstandard2.0' " Include =" ..\utils\NullableAttributes.cs" />
46
45
<Compile Remove =" Java.Interop\JniLocationException.cs" />
47
46
</ItemGroup >
48
47
<PropertyGroup >
You can’t perform that action at this time.
0 commit comments