Skip to content

Commit cd59764

Browse files
phoglundphoglund
committed
Merge branch 'bug/missing-types' of https://github.com/EmbarkStudios/server-code-exciser into bug/missing-types
2 parents 043b69b + a2eda82 commit cd59764

File tree

9 files changed

+47
-17
lines changed

9 files changed

+47
-17
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: ci
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
runs-on: windows-latest
8+
9+
steps:
10+
- uses: actions/checkout@v3
11+
- uses: actions/setup-dotnet@v3
12+
with:
13+
dotnet-version: '6.0.x'
14+
- name: Run tests
15+
run: dotnet run ServerCodeExciserTest.csproj
16+
working-directory: ./ServerCodeExciserTest

‎ServerCodeExciser/ServerCodeExciser.cs‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
using System;
2-
using System.IO;
3-
using UnrealAngelscriptServerCodeExcision;
4-
using ServerCodeExcisionCommon;
1+
using ServerCodeExcisionCommon;
2+
using Spectre.Console;
53
using Spectre.Console.Cli;
4+
using System;
65
using System.ComponentModel;
76
using System.Diagnostics.CodeAnalysis;
8-
using Spectre.Console;
7+
using System.IO;
98
using System.Text.Json;
109
using System.Text.Json.Serialization;
10+
using UnrealAngelscriptServerCodeExcision;
1111

1212
namespace ServerCodeExcision
1313
{
@@ -103,11 +103,16 @@ public override int Execute([NotNull] CommandContext context, [NotNull] Settings
103103
return (int)EExciserReturnValues.InternalExcisionError;
104104
}
105105
}
106-
else if(!Directory.Exists(settings.InputPath))
106+
else if(Directory.Exists(settings.InputPath))
107+
{
108+
parameters.InputPaths.Add(settings.InputPath);
109+
}
110+
else
107111
{
108112
AnsiConsole.WriteLine("Input directory does not exist.");
109113
return (int)EExciserReturnValues.BadInputPath;
110114
}
115+
111116
foreach (var path in parameters.InputPaths)
112117
{
113118
AnsiConsole.WriteLine("Input path: " + path);

‎ServerCodeExciser/ServerCodeExciser.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Spectre.Console" Version="0.44.0" />
10+
<PackageReference Include="Spectre.Console" Version="0.45.0" />
11+
<PackageReference Include="Spectre.Console.Cli" Version="0.45.0" />
1112
</ItemGroup>
1213

1314
<ItemGroup>

‎ServerCodeExciserTest/ExcisionIntegrationTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ private static bool RunExciserIntegrationTests(string fileExtension, string test
6666
{
6767
problemPath,
6868
"-u",
69-
"-fe",
69+
"-f",
7070
"FullExcise1/.*",
71-
"-eaf",
71+
"-a",
7272
"AllFunctionExcise1/.*|||AllFunctionExcise2/.*",
7373
"-o",
7474
answerPath

‎ServerCodeExciserTest/Properties/launchSettings.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"profiles": {
3+
"ServerCodeExciserTest": {
4+
"commandName": "Project",
5+
"workingDirectory": "D:\\EmbarkBuild\\ServerCodeExcision\\ServerCodeExciserTest"
6+
}
7+
}
8+
}

‎ServerCodeExciserTest/ServerCodeExciserTest.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>

‎ServerCodeExcisionCommon/ServerCodeExcisionCommon.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Antlr4.Runtime.Standard" Version="4.10.1" />
8+
<PackageReference Include="Antlr4.Runtime.Standard" Version="4.11.1" />
99
</ItemGroup>
1010

1111
</Project>

‎UnrealAngelscriptParser/UnrealAngelscriptParser.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -23,8 +23,8 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Antlr4.Runtime.Standard" Version="4.10.1" />
27-
<PackageReference Include="Antlr4BuildTasks" Version="10.7.0" />
26+
<PackageReference Include="Antlr4.Runtime.Standard" Version="4.11.1" />
27+
<PackageReference Include="Antlr4BuildTasks" Version="12.1.0" />
2828
</ItemGroup>
2929

3030
</Project>

‎UnrealAngelscriptServerCodeExcision/UnrealAngelscriptServerCodeExcision.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)