Skip to content

Commit bf8d78f

Browse files
jpobstjpobst
authored
[build] Clean up obsolete portions of csproj files (#1112)
Context: be2acbc Clean up some things in `.csproj` files that are no longer needed: * The `@(PackageReference)` for `Microsoft.NETFramework.ReferenceAssemblies` was only needed to build `net472`; remove it * `$(LangVersion)` was only needed to use a newer version of C# than older frameworks technically supported. By default, each project uses the version of C# that ships with its `TargetFramework`; remove unnecessary `$(LangVersion)`s. * Remove pre-SDK-style .csproj properties like `$(ProjectGuid)`. * Remove `net472`-based `Condition`s. * Use consistent whitespace.
1 parent 56d30f1 commit bf8d78f

File tree

38 files changed

+54
-102
lines changed

38 files changed

+54
-102
lines changed

‎build-tools/jnienv-gen/jnienv-gen.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,4 @@
1313
<OutputPath>$(BuildToolOutputFullPath)</OutputPath>
1414
</PropertyGroup>
1515

16-
<ItemGroup>
17-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
18-
</ItemGroup>
1916
</Project>

‎samples/Hello-Java.Base/Hello-Java.Base.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
<Nullable>enable</Nullable>
88
<StartupObject>Hello.App</StartupObject>
99
</PropertyGroup>
10-
11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
13-
</ItemGroup>
1410

1511
<ItemGroup>
1612
<ProjectReference Include="..\..\src\Java.Interop\Java.Interop.csproj" />

‎src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
44
<TargetFramework>$(DotNetTargetFramework)</TargetFramework>
5-
<LangVersion>8.0</LangVersion>
6-
<ProjectGuid>{AD4468F8-8883-434B-9D4C-E1801BB3B52A}</ProjectGuid>
75
<Nullable>annotations</Nullable>
86
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
97
<SignAssembly>true</SignAssembly>
108
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
11-
<AssemblyTitle>Java.Interop.Dynamic</AssemblyTitle>
12-
<Version>$(JICoreLibVersion)</Version>
139
</PropertyGroup>
10+
1411
<Import Project="..\..\TargetFrameworkDependentValues.props" />
12+
1513
<PropertyGroup>
1614
<OutputPath>$(ToolOutputFullPath)</OutputPath>
15+
<Version>$(JICoreLibVersion)</Version>
1716
</PropertyGroup>
17+
1818
<ItemGroup>
19-
<ProjectReference Include="..\Java.Interop\Java.Interop.csproj">
20-
<Project>{94BD81F7-B06F-4295-9636-F8A3B6BDC762}</Project>
21-
<Name>Java.Interop</Name>
22-
</ProjectReference>
19+
<ProjectReference Include="..\Java.Interop\Java.Interop.csproj" />
2320
</ItemGroup>
21+
2422
<ItemGroup>
2523
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
2624
</ItemGroup>
25+
2726
</Project>

‎src/Java.Interop.Export/Java.Interop.Export.csproj‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
44
<TargetFramework>$(DotNetTargetFramework)</TargetFramework>
5-
<LangVersion>9.0</LangVersion>
6-
<ProjectGuid>{B501D075-6183-4E1D-92C9-F7B5002475B1}</ProjectGuid>
75
<Nullable>enable</Nullable>
86
<SignAssembly>true</SignAssembly>
97
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
10-
<AssemblyTitle>Java.Interop.Export</AssemblyTitle>
118
</PropertyGroup>
9+
1210
<Import Project="..\..\TargetFrameworkDependentValues.props" />
11+
1312
<PropertyGroup>
1413
<OutputPath>$(ToolOutputFullPath)</OutputPath>
1514
<Version>$(JICoreLibVersion)</Version>
1615
</PropertyGroup>
16+
1717
<ItemGroup>
18-
<ProjectReference Include="..\Java.Interop\Java.Interop.csproj">
19-
<Project>{94BD81F7-B06F-4295-9636-F8A3B6BDC762}</Project>
20-
<Name>Java.Interop</Name>
21-
</ProjectReference>
18+
<ProjectReference Include="..\Java.Interop\Java.Interop.csproj" />
2219
</ItemGroup>
20+
2321
<ItemGroup>
2422
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
2523
</ItemGroup>
24+
2625
</Project>

‎src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,32 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
44
<TargetFramework>$(DotNetTargetFramework)</TargetFramework>
5-
<ProjectGuid>{D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}</ProjectGuid>
65
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
76
<SignAssembly>true</SignAssembly>
87
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
9-
<AssemblyTitle>Java.Interop.GenericMarshaler</AssemblyTitle>
108
</PropertyGroup>
9+
1110
<Import Project="..\..\TargetFrameworkDependentValues.props" />
11+
1212
<PropertyGroup>
1313
<OutputPath>$(ToolOutputFullPath)</OutputPath>
1414
<Version>$(JICoreLibVersion)</Version>
1515
</PropertyGroup>
16+
1617
<ItemGroup>
1718
<None Include="Java.Interop.GenericMarshaler\JniPeerInstanceMethodsExtensions.tt">
1819
<Generator>TextTemplatingFileGenerator</Generator>
1920
<LastGenOutput>Java.Interop.GenericMarshaler\JniPeerInstanceMethodsExtensions.cs</LastGenOutput>
2021
</None>
2122
</ItemGroup>
23+
2224
<ItemGroup>
2325
<ProjectReference Include="..\Java.Interop\Java.Interop.csproj" />
2426
</ItemGroup>
27+
2528
<ItemGroup>
2629
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
2730
</ItemGroup>
31+
2832
</Project>

‎src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@
2929
<ItemGroup>
3030
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
3131
</ItemGroup>
32+
3233
</Project>

‎src/Java.Interop.Tools.Generator/Java.Interop.Tools.Generator.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>$(DotNetTargetFramework)</TargetFramework>
5-
<LangVersion>8.0</LangVersion>
65
<Nullable>enable</Nullable>
76
</PropertyGroup>
87

‎src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
99
<SignAssembly>true</SignAssembly>
1010
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
11+
<DefineConstants>$(DefineConstants);JCW_ONLY_TYPE_NAMES;HAVE_CECIL</DefineConstants>
1112
</PropertyGroup>
1213

1314
<Import Project="..\..\TargetFrameworkDependentValues.props" />
@@ -16,14 +17,6 @@
1617
<OutputPath>$(ToolOutputFullPath)</OutputPath>
1718
</PropertyGroup>
1819

19-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
20-
<DefineConstants>DEBUG;JCW_ONLY_TYPE_NAMES;HAVE_CECIL</DefineConstants>
21-
</PropertyGroup>
22-
23-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
24-
<DefineConstants>JCW_ONLY_TYPE_NAMES;HAVE_CECIL</DefineConstants>
25-
</PropertyGroup>
26-
2720
<Import Project="..\..\build-tools\scripts\cecil.projitems" />
2821

2922
<ItemGroup>

‎src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource.csproj‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
44
<TargetFramework>$(DotNetTargetFramework)</TargetFramework>
55
<LangVersion>8.0</LangVersion>
66
<Nullable>enable</Nullable>
7-
<DefineConstants>INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
8-
<ProjectGuid>{5C0B3562-8DA0-4726-9762-75B9709ED6B7}</ProjectGuid>
9-
<AssemblyTitle>Java.Interop.Tools.JavaSource</AssemblyTitle>
107
</PropertyGroup>
8+
119
<Import Project="..\..\TargetFrameworkDependentValues.props" />
10+
1211
<PropertyGroup>
1312
<OutputPath>$(ToolOutputFullPath)</OutputPath>
1413
</PropertyGroup>
15-
<ItemGroup>
16-
<Compile Include="..\utils\NullableAttributes.cs" />
17-
</ItemGroup>
14+
1815
<ItemGroup>
1916
<PackageReference Include="Irony" />
17+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
2018
</ItemGroup>
19+
2120
<ItemGroup>
2221
<ProjectReference Include="..\Xamarin.Android.Tools.ApiXmlAdjuster\Xamarin.Android.Tools.ApiXmlAdjuster.csproj" />
2322
</ItemGroup>
24-
<ItemGroup>
25-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
26-
</ItemGroup>
23+
2724
</Project>

‎src/Java.Interop.Tools.JavaTypeSystem/Java.Interop.Tools.JavaTypeSystem.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@
2121
<ItemGroup>
2222
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
2323
</ItemGroup>
24+
2425
</Project>

0 commit comments

Comments
 (0)