Skip to content

Commit f5fa462

Browse files
authored
[jnienv-gen] Convert to SDK-style (#608)
1 parent 1a086ff commit f5fa462

File tree

3 files changed

+10
-62
lines changed

3 files changed

+10
-62
lines changed

build-tools/jnienv-gen/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>10.0.0</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}</ProjectGuid>
94
<OutputType>Exe</OutputType>
10-
<RootNamespace>jnienvgen</RootNamespace>
11-
<AssemblyName>jnienv-gen</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
5+
<TargetFramework>net472</TargetFramework>
6+
<IsPackable>false</IsPackable>
7+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
138
</PropertyGroup>
14-
<Import Project="..\..\Directory.Build.props" />
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' Or '$(Configuration)|$(Platform)' == 'Gendarme|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>$(BuildToolOutputFullPath)</OutputPath>
20-
<DefineConstants>DEBUG;</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
<Externalconsole>true</Externalconsole>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>full</DebugType>
27-
<Optimize>true</Optimize>
9+
10+
<PropertyGroup>
2811
<OutputPath>$(BuildToolOutputFullPath)</OutputPath>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
<Externalconsole>true</Externalconsole>
3212
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="System" />
35-
</ItemGroup>
36-
<ItemGroup>
37-
<Compile Include="Properties\AssemblyInfo.cs" />
38-
<Compile Include="Generator.cs" />
39-
<Compile Include="Generator.g.cs" />
40-
</ItemGroup>
41-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
42-
</Project>
13+
14+
</Project>

src/Java.Interop/Java.Interop.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@
6060
<PrivateAssets>all</PrivateAssets>
6161
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6262
</PackageReference>
63-
<ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj">
64-
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
65-
</ProjectReference>
63+
<ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
6664
</ItemGroup>
6765
<ItemGroup>
6866
<Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JavaPrimitiveArrays.cs">

0 commit comments

Comments
 (0)