Try to fix conflict

ISUCT · Oct 24, 2023 · 6b97f7b · 6b97f7b
1 parent 40666ed
commit 6b97f7b
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet: [ '7.0.x' ]
+        dotnet: [ '6.0.x' ]
 
     steps:
     - uses: actions/checkout@v3
@@ -23,5 +23,5 @@ jobs:
         dotnet build --configuration Release
     - name: Run tests
       run: |
-        cd CourseApp.Tests
+        cd CourseApp.Tests/CourseApp.Tests.csproj
         dotnet test
diff --git a/CourseApp/CourseApp.csproj b/CourseApp/CourseApp.csproj
@@ -21,4 +21,5 @@
 
 
 
+
 </Project>
diff --git a/CourseApp/RpgSaga/IHero.cs b/CourseApp/RpgSaga/IHero.cs
@@ -0,0 +1,18 @@
+namespace CourseApp.RpgSaga;
+
+using System;
+
+public interface IHero
+{
+    public string Name;
+
+    public int Strength;
+
+    public int Health;
+
+    public Random Rand = new Random();
+
+    public int SetValue();
+
+    public void Atack(IHero person);
+}
diff --git a/CourseApp/RpgSaga/Warior.cs b/CourseApp/RpgSaga/Warior.cs
@@ -0,0 +1,15 @@
+namespace CourseApp.RpgSaga;
+
+public class Warior : IHero
+{
+    public int SetValue()
+    {
+        throw new System.NotImplementedException();
+    }
+
+    public void Atack(IHero person)
+    {
+    }
+
+
+}