Skip to content

Commit

Permalink
Cleaned up my code some more
Browse files Browse the repository at this point in the history
  • Loading branch information
BrentBlanckaert committed Nov 21, 2024
1 parent b6d8f4e commit 8cd5a86
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
28 changes: 14 additions & 14 deletions tested/languages/csharp/templates/dotnet.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<CSFile Include="*.cs" />
</ItemGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<CSFile Include="*.cs" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions tested/languages/typescript/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
BasicStringTypes,
ExpressionTypes,
)
from tested.dodona import AnnotateCode, Message
from tested.dodona import AnnotateCode, Message, Status
from tested.features import Construct, TypeSupport
from tested.languages.conventionalize import (
EXECUTION_PREFIX,
Expand Down Expand Up @@ -108,9 +108,9 @@ def collection_restrictions(self) -> dict[AllTypes, set[ExpressionTypes]]:

def compilation(self, files: list[str]) -> CallbackResult:
submission = submission_file(self)
main_file = list(filter(lambda x: x == submission, files))
main_file = self.find_main_file(list(map(lambda name: Path(name), files)), submission)

if main_file:
if main_file != Status.COMPILATION_ERROR:
path_to_modules = os.environ['NODE_PATH']
return (
[
Expand All @@ -125,7 +125,7 @@ def compilation(self, files: list[str]) -> CallbackResult:
"--esModuleInterop",
"--typeRoots",
f"{path_to_modules}/@types",
main_file[0],
main_file,
],
files,
)
Expand Down

0 comments on commit 8cd5a86

Please sign in to comment.