Skip to content

Commit e3e2591

Browse files
committed
Simplify structure of csharp runtime files, remove not used .sln file, use PackageIcon property instead of outdated PackageIcon in Antlr4.csproj
1 parent e340573 commit e3e2591

File tree

192 files changed

+8
-39
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+8
-39
lines changed

runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/BaseCSharpTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public boolean buildProject() {
324324

325325
// find runtime package
326326
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
327-
final URL runtimeProj = loader.getResource("CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj");
327+
final URL runtimeProj = loader.getResource("CSharp/Antlr4.csproj");
328328
if (runtimeProj == null) {
329329
throw new RuntimeException("C# runtime project file not found!");
330330
}

runtime/CSharp/Antlr.png

1.57 KB
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<NoWarn>$(NoWarn);CS1591;CS1574;CS1580</NoWarn>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<AssemblyName>Antlr4.Runtime.Standard</AssemblyName>
10-
<AssemblyOriginatorKeyFile>../../Antlr4.snk</AssemblyOriginatorKeyFile>
10+
<AssemblyOriginatorKeyFile>Antlr4.snk</AssemblyOriginatorKeyFile>
1111
<SignAssembly>true</SignAssembly>
1212
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1313
<PackageId>Antlr4.Runtime.Standard</PackageId>
@@ -19,8 +19,7 @@
1919
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2020
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
2121
<PackageProjectUrl>https://github.com/antlr/antlr4</PackageProjectUrl>
22-
<!-- <PackageIcon>Antlr.png</PackageIcon> -->
23-
<PackageIconUrl>https://raw.github.com/antlr/website-antlr4/master/images/icons/antlr.png</PackageIconUrl>
22+
<PackageIcon>Antlr.png</PackageIcon>
2423
<PackageReleaseNotes>https://github.com/antlr/antlr4/releases</PackageReleaseNotes>
2524
<PackageTags>antlr parsing grammar</PackageTags>
2625
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
@@ -44,4 +43,9 @@
4443
<Optimize>true</Optimize>
4544
<OutputPath>lib\Release</OutputPath>
4645
</PropertyGroup>
46+
<ItemGroup>
47+
<None Update="Antlr.png">
48+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
49+
</None>
50+
</ItemGroup>
4751
</Project>
File renamed without changes.

0 commit comments

Comments
 (0)