added windows slnf

lowered .net 7 fixed pipeline
kougen · Nov 2, 2023 · 4b6cce9 · 4b6cce9
1 parent 21c2d4b
commit 4b6cce9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
     name: Build
     env:
       BUILD_CONFIG: 'Debug'
-      SOLUTION: '_Solutions/GameFramework.sln'
+      SOLUTION: '_Solutions/GameFramework.Windows.slnf'
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
@@ -62,7 +62,7 @@ jobs:
     name: 'Build, Test & Deploy'
     env:
       BUILD_CONFIG: 'Release'
-      SOLUTION: '_Solutions/GameFramework.sln'
+      SOLUTION: '_Solutions/GameFramework.Windows.slnf'
     runs-on: windows-latest
     steps:
     - name: Checkout
@@ -98,5 +98,5 @@ jobs:
 
     - name: Publish
       run: |
-        '& .\dotnet-tools\PushPackages.ps1 -CustomProjectsFile .projects.conf -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGET_API_KEY}}' 
-        '& .\dotnet-tools\PushPackages.ps1 -CustomProjectsFile .projects.conf -Source 'https://nuget.pkg.github.com/joshika39/index.json' -ApiKey ${{secrets.GIT_API_KEY}}' 
+        '& .\dotnet-tools\PushPackages.ps1 -CustomProjectsFile .projects.conf -Source https://api.nuget.org/v3/index.json -ApiKey ${{secrets.NUGET_API_KEY}}' 
+        '& .\dotnet-tools\PushPackages.ps1 -CustomProjectsFile .projects.conf -Source https://nuget.pkg.github.com/joshika39/index.json -ApiKey ${{secrets.GIT_API_KEY}}' 
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -12,7 +12,7 @@ jobs:
     name: Build
     env:
       BUILD_CONFIG: 'Debug'
-      SOLUTION: '_Solutions/GameFramework.sln'
+      SOLUTION: '_Solutions/GameFramework.Windows.slnf'
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2

diff --git a/_Solutions/GameFramework.Windows.slnf b/_Solutions/GameFramework.Windows.slnf
@@ -0,0 +1,13 @@
+{
+  "solution": {
+    "path": "GameFramework.sln",
+    "projects": [
+      "..\\_Tests\\GameFramework.ManualTests.Desktop.WPF\\GameFramework.ManualTests.Desktop.WPF.csproj",
+      "..\\_Tests\\GameFramework.Unit.Tests\\GameFramework.Unit.Tests.csproj",
+      "..\\_src\\GameFramework.Impl\\GameFramework.Impl.csproj",
+      "..\\_src\\GameFramework.UI.Avalonia\\GameFramework.UI.Avalonia\\GameFramework.UI.Avalonia.csproj",
+      "..\\_src\\GameFramework.UI.WPF\\GameFramework.UI.WPF.csproj",
+      "..\\_src\\GameFramework\\GameFramework.csproj"
+    ]
+  }
+}
diff --git a/_src/GameFramework.UI.Avalonia/GameFramework.UI.Avalonia/GameFramework.UI.Avalonia.csproj b/_src/GameFramework.UI.Avalonia/GameFramework.UI.Avalonia/GameFramework.UI.Avalonia.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>