Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CLI.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

dotnet run --project EDSSharp --framework net8.0 --property WarningLevel=0 "$@"
3 changes: 3 additions & 0 deletions GUI2.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

dotnet run --project EDSEditorGUI2 --framework net8.0 --property WarningLevel=0 "$@"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
dotnet run --project EDSEditorGUI2 --framework net8.0 --property WarningLevel=0 "$@"
dotnet run --project EDSEditorGUI2 --property WarningLevel=0 "$@"

I did not need --framework, its only needed if project uses multiple .net versions

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
dotnet run --project EDSEditorGUI2 --framework net8.0 --property WarningLevel=0 "$@"
dotnet run --project EDSEditorGUI2 --property WarningLevel=0 "$@"

11 changes: 7 additions & 4 deletions GUITests/GUITests.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

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

<OutputType>Exe</OutputType>
<RootNamespace>GUITests</RootNamespace>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.5.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
</ItemGroup>

<ItemGroup>
Expand All @@ -21,5 +20,9 @@

<ItemGroup>
<Using Include="Xunit" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure why this is moved so please move back so every package is in the same group, but everything else looks good

<PackageReference Include="xunit.v3" Version="3.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

</Project>
10 changes: 10 additions & 0 deletions TESTS.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh

COLOR='\033[38;5;21m'
BG='\033[47m'
WHITE='\033[0;32m'

echo ${BG}${COLOR}"LIB and CLI tests:"${WHITE}
dotnet run --project Tests --framework net8.0 --property WarningLevel=0
echo ${BG}${COLOR}"GUI tests:"${WHITE}
dotnet run --project GUITests --framework net8.0 --property WarningLevel=0
21 changes: 7 additions & 14 deletions Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net8.0</TargetFrameworks>
<OutputType>Library</OutputType>
<Nullable>enable</Nullable>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this breaks the CI build on .net framwork 4.8.1

<OutputType>Exe</OutputType>
<RootNamespace>Tests</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
Expand All @@ -21,17 +23,8 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.analyzers" Version="1.11.0" />
<PackageReference Include="xunit.assert" Version="2.7.0" />
<PackageReference Include="xunit.runner.console" Version="2.7.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="xunit.v3" Version="3.2.0" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using xunit.v3 is a good idea, but we need to get it through the CI first to see if it works for all .net versions

<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this might be a good idea if it works in the CI and all we needed is included in the new nuget👍

</ItemGroup>
</Project>
</Project>
Loading