Skip to content

Commit df590dd

Browse files
paulirwinpaulirwin
committed
Initial port to .NET 5.0
1 parent 315f6d3 commit df590dd

File tree

21 files changed

+37
-1740
lines changed

21 files changed

+37
-1740
lines changed

‎JavaToCSharp.sln‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31410.357
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaToCSharp", "JavaToCSharp\JavaToCSharp.csproj", "{EDCE2F7C-299E-4FEA-870F-87C201FB2E43}"
77
EndProject
@@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaToCSharpCli", "JavaToCS
1515
EndProject
1616
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaToCSharpGui", "JavaToCSharpGui\JavaToCSharpGui.csproj", "{DAA3F412-0460-40C3-98F7-3244649820F9}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebPageLauncher", "WebPageLauncher\WebPageLauncher.csproj", "{8C687DDF-1458-4918-B21E-E703DD971334}"
19-
EndProject
2018
Global
2119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2220
Debug|Any CPU = Debug|Any CPU
@@ -35,12 +33,11 @@ Global
3533
{DAA3F412-0460-40C3-98F7-3244649820F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
3634
{DAA3F412-0460-40C3-98F7-3244649820F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
3735
{DAA3F412-0460-40C3-98F7-3244649820F9}.Release|Any CPU.Build.0 = Release|Any CPU
38-
{8C687DDF-1458-4918-B21E-E703DD971334}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39-
{8C687DDF-1458-4918-B21E-E703DD971334}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{8C687DDF-1458-4918-B21E-E703DD971334}.Release|Any CPU.ActiveCfg = Release|Any CPU
41-
{8C687DDF-1458-4918-B21E-E703DD971334}.Release|Any CPU.Build.0 = Release|Any CPU
4236
EndGlobalSection
4337
GlobalSection(SolutionProperties) = preSolution
4438
HideSolutionNode = FALSE
4539
EndGlobalSection
40+
GlobalSection(ExtensibilityGlobals) = postSolution
41+
SolutionGuid = {EB538484-5025-4753-B0A5-2C66A6C06193}
42+
EndGlobalSection
4643
EndGlobal

‎JavaToCSharp/JavaToCSharp.csproj‎

Lines changed: 7 additions & 278 deletions
Large diffs are not rendered by default.

‎JavaToCSharp/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎JavaToCSharp/app.config‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎JavaToCSharpCli/App.config‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎JavaToCSharpCli/JavaToCSharpCli.csproj‎

Lines changed: 3 additions & 197 deletions
Original file line numberDiff line numberDiff line change
@@ -1,203 +1,9 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{8C56AE52-8E0F-438F-9B5B-87B891D70861}</ProjectGuid>
83
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>JavaToCSharpCli</RootNamespace>
11-
<AssemblyName>JavaToCSharpCli</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
15-
<LangVersion>latest</LangVersion>
4+
<TargetFramework>net5.0</TargetFramework>
165
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<PlatformTarget>AnyCPU</PlatformTarget>
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<PlatformTarget>AnyCPU</PlatformTarget>
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="IKVM.AWT.WinForms, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
38-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.AWT.WinForms.dll</HintPath>
39-
<Private>True</Private>
40-
</Reference>
41-
<Reference Include="IKVM.OpenJDK.Beans, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
42-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Beans.dll</HintPath>
43-
<Private>True</Private>
44-
</Reference>
45-
<Reference Include="IKVM.OpenJDK.Charsets, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
46-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Charsets.dll</HintPath>
47-
<Private>True</Private>
48-
</Reference>
49-
<Reference Include="IKVM.OpenJDK.Cldrdata, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
50-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Cldrdata.dll</HintPath>
51-
<Private>True</Private>
52-
</Reference>
53-
<Reference Include="IKVM.OpenJDK.Corba, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
54-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Corba.dll</HintPath>
55-
<Private>True</Private>
56-
</Reference>
57-
<Reference Include="IKVM.OpenJDK.Core, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
58-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Core.dll</HintPath>
59-
<Private>True</Private>
60-
</Reference>
61-
<Reference Include="IKVM.OpenJDK.Jdbc, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
62-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Jdbc.dll</HintPath>
63-
<Private>True</Private>
64-
</Reference>
65-
<Reference Include="IKVM.OpenJDK.Localedata, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
66-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Localedata.dll</HintPath>
67-
<Private>True</Private>
68-
</Reference>
69-
<Reference Include="IKVM.OpenJDK.Management, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
70-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Management.dll</HintPath>
71-
<Private>True</Private>
72-
</Reference>
73-
<Reference Include="IKVM.OpenJDK.Media, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
74-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Media.dll</HintPath>
75-
<Private>True</Private>
76-
</Reference>
77-
<Reference Include="IKVM.OpenJDK.Misc, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
78-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Misc.dll</HintPath>
79-
<Private>True</Private>
80-
</Reference>
81-
<Reference Include="IKVM.OpenJDK.Naming, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
82-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Naming.dll</HintPath>
83-
<Private>True</Private>
84-
</Reference>
85-
<Reference Include="IKVM.OpenJDK.Nashorn, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
86-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Nashorn.dll</HintPath>
87-
<Private>True</Private>
88-
</Reference>
89-
<Reference Include="IKVM.OpenJDK.Remoting, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
90-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Remoting.dll</HintPath>
91-
<Private>True</Private>
92-
</Reference>
93-
<Reference Include="IKVM.OpenJDK.Security, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
94-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Security.dll</HintPath>
95-
<Private>True</Private>
96-
</Reference>
97-
<Reference Include="IKVM.OpenJDK.SwingAWT, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
98-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.SwingAWT.dll</HintPath>
99-
<Private>True</Private>
100-
</Reference>
101-
<Reference Include="IKVM.OpenJDK.Text, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
102-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Text.dll</HintPath>
103-
<Private>True</Private>
104-
</Reference>
105-
<Reference Include="IKVM.OpenJDK.Tools, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
106-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Tools.dll</HintPath>
107-
<Private>True</Private>
108-
</Reference>
109-
<Reference Include="IKVM.OpenJDK.Util, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
110-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.Util.dll</HintPath>
111-
<Private>True</Private>
112-
</Reference>
113-
<Reference Include="IKVM.OpenJDK.XML.API, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
114-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.XML.API.dll</HintPath>
115-
<Private>True</Private>
116-
</Reference>
117-
<Reference Include="IKVM.OpenJDK.XML.Bind, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
118-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.XML.Bind.dll</HintPath>
119-
<Private>True</Private>
120-
</Reference>
121-
<Reference Include="IKVM.OpenJDK.XML.Crypto, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
122-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.XML.Crypto.dll</HintPath>
123-
<Private>True</Private>
124-
</Reference>
125-
<Reference Include="IKVM.OpenJDK.XML.Parse, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
126-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.XML.Parse.dll</HintPath>
127-
<Private>True</Private>
128-
</Reference>
129-
<Reference Include="IKVM.OpenJDK.XML.Transform, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
130-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.XML.Transform.dll</HintPath>
131-
<Private>True</Private>
132-
</Reference>
133-
<Reference Include="IKVM.OpenJDK.XML.WebServices, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
134-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.XML.WebServices.dll</HintPath>
135-
<Private>True</Private>
136-
</Reference>
137-
<Reference Include="IKVM.OpenJDK.XML.XPath, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
138-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.OpenJDK.XML.XPath.dll</HintPath>
139-
<Private>True</Private>
140-
</Reference>
141-
<Reference Include="IKVM.Runtime, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
142-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.Runtime.dll</HintPath>
143-
<Private>True</Private>
144-
</Reference>
145-
<Reference Include="IKVM.Runtime.JNI, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
146-
<HintPath>..\packages\IKVM.8.1.5717.0\lib\IKVM.Runtime.JNI.dll</HintPath>
147-
<Private>True</Private>
148-
</Reference>
149-
<Reference Include="javaparser-core-3.0.0-SNAPSHOT">
150-
<HintPath>..\Lib\javaparser-core-3.0.0-SNAPSHOT.dll</HintPath>
151-
</Reference>
152-
<Reference Include="Roslyn.Compilers">
153-
<HintPath>..\packages\Roslyn.Compilers.Common.1.2.20906.2\lib\net45\Roslyn.Compilers.dll</HintPath>
154-
</Reference>
155-
<Reference Include="Roslyn.Compilers.CSharp">
156-
<HintPath>..\packages\Roslyn.Compilers.CSharp.1.2.20906.2\lib\net45\Roslyn.Compilers.CSharp.dll</HintPath>
157-
</Reference>
158-
<Reference Include="Roslyn.Compilers.VisualBasic">
159-
<HintPath>..\packages\Roslyn.Compilers.VisualBasic.1.2.20906.2\lib\net45\Roslyn.Compilers.VisualBasic.dll</HintPath>
160-
</Reference>
161-
<Reference Include="Roslyn.Services">
162-
<HintPath>..\packages\Roslyn.Services.Common.1.2.20906.2\lib\net45\Roslyn.Services.dll</HintPath>
163-
</Reference>
164-
<Reference Include="Roslyn.Services.CSharp">
165-
<HintPath>..\packages\Roslyn.Services.CSharp.1.2.20906.2\lib\net45\Roslyn.Services.CSharp.dll</HintPath>
166-
</Reference>
167-
<Reference Include="Roslyn.Services.VisualBasic">
168-
<HintPath>..\packages\Roslyn.Services.VisualBasic.1.2.20906.2\lib\net45\Roslyn.Services.VisualBasic.dll</HintPath>
169-
</Reference>
170-
<Reference Include="Roslyn.Utilities">
171-
<HintPath>..\packages\Roslyn.Services.Common.1.2.20906.2\lib\net45\Roslyn.Utilities.dll</HintPath>
172-
</Reference>
173-
<Reference Include="System" />
174-
<Reference Include="System.Core" />
175-
<Reference Include="System.Xml.Linq" />
176-
<Reference Include="System.Data.DataSetExtensions" />
177-
<Reference Include="Microsoft.CSharp" />
178-
<Reference Include="System.Data" />
179-
<Reference Include="System.Xml" />
180-
</ItemGroup>
181-
<ItemGroup>
182-
<Compile Include="Program.cs" />
183-
<Compile Include="Properties\AssemblyInfo.cs" />
184-
</ItemGroup>
185-
<ItemGroup>
186-
<None Include="App.config" />
187-
<None Include="packages.config" />
188-
</ItemGroup>
1896
<ItemGroup>
190-
<ProjectReference Include="..\JavaToCSharp\JavaToCSharp.csproj">
191-
<Project>{edce2f7c-299e-4fea-870f-87c201fb2e43}</Project>
192-
<Name>JavaToCSharp</Name>
193-
</ProjectReference>
7+
<ProjectReference Include="..\JavaToCSharp\JavaToCSharp.csproj" />
1948
</ItemGroup>
195-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
196-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
197-
Other similar extension points exist, see Microsoft.Common.targets.
198-
<Target Name="BeforeBuild">
199-
</Target>
200-
<Target Name="AfterBuild">
201-
</Target>
202-
-->
2039
</Project>

‎JavaToCSharpCli/Program.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
namespace JavaToCSharpCli
66
{
7-
class Program
7+
public class Program
88
{
9-
static void Main(string[] args)
9+
public static void Main(string[] args)
1010
{
1111
if (args == null || args.Length < 2)
1212
{
@@ -23,11 +23,7 @@ static void Main(string[] args)
2323
var javaText = File.ReadAllText(args[0]);
2424

2525
// HACK for testing
26-
var options = new JavaConversionOptions()
27-
.AddPackageReplacement("org\\.apache\\.lucene", "Lucene.Net")
28-
.AddUsing("Lucene.Net")
29-
.AddUsing("Lucene.Net.Support")
30-
.AddUsing("Lucene.Net.Util");
26+
var options = new JavaConversionOptions();
3127

3228
var parsed = JavaToCSharpConverter.ConvertText(javaText, options);
3329

‎JavaToCSharpCli/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)