Skip to content

Commit 6bea9fd

Browse files
committed
Merge branch 'release/2.0.1'
2 parents 9077fe4 + e38a6c4 commit 6bea9fd

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

JavaToCSharp/JavaToCSharp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Version>2.0.0</Version>
3+
<Version>2.0.1</Version>
44
<TargetFramework>net5.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<LangVersion>latest</LangVersion>

JavaToCSharpCli/JavaToCSharpCli.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Version>2.0.0</Version>
3+
<Version>2.0.1</Version>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net5.0</TargetFramework>
66
</PropertyGroup>
7+
<ItemGroup>
8+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
9+
</ItemGroup>
710
<ItemGroup>
811
<ProjectReference Include="..\JavaToCSharp\JavaToCSharp.csproj" />
912
</ItemGroup>

JavaToCSharpCli/Program.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ public static void Main(string[] args)
2222

2323
var javaText = File.ReadAllText(args[0]);
2424

25-
// HACK for testing
2625
var options = new JavaConversionOptions();
2726

27+
options.WarningEncountered += (sender, eventArgs) => Console.WriteLine($"[WARNING] Line {eventArgs.JavaLineNumber}: {eventArgs.Message}");
28+
2829
var parsed = JavaToCSharpConverter.ConvertText(javaText, options);
2930

3031
File.WriteAllText(args[1], parsed);

JavaToCSharpGui/JavaToCSharpGui.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Version>2.0.0</Version>
3+
<Version>2.0.1</Version>
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>net5.0-windows</TargetFramework>
66
<UseWPF>true</UseWPF>

infrastructure/publish-exe.ps1 renamed to infrastructure/publish.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ param([Parameter(Mandatory)] $version);
22

33
# Requires the dotnet-setversion tool installed:
44
# dotnet tool install -g dotnet-setversion
5+
setversion $version ../JavaToCSharp/JavaToCSharp.csproj
56
setversion $version ../JavaToCSharpCli/JavaToCSharpCli.csproj
67
setversion $version ../JavaToCSharpGui/JavaToCSharpGui.csproj
78

89
dotnet publish ../JavaToCSharpGui/JavaToCSharpGui.csproj -c Release -r win10-x64 --self-contained true -o ../publish/gui/
910
dotnet publish ../JavaToCSharpCli/JavaToCSharpCli.csproj -c Release -r win10-x64 --self-contained true -o ../publish/cli/
1011

11-
Compress-Archive @("../publish/gui/", "../publish/cli/") -DestinationPath ../publish/JavaToCSharp-$version.zip
12+
Compress-Archive @("../publish/gui/", "../publish/cli/") -DestinationPath ../publish/JavaToCSharp-$version.zip -Force
13+
14+
dotnet pack ../JavaToCSharp/JavaToCSharp.csproj -c Release

0 commit comments

Comments
 (0)