# HG changeset patch # User Alys Brooks # Date 2022-11-14 03:14:47 # Node ID ed9fbad5f9a936f32a6605132cf6d9a94e95a563 # Parent 15212b3c15eb1542607081c4c5774b69c0e6e8be Tweak restore and solution file. * Run restore on the entire solution file. * Remove the ImGui project from the solution file to restore it to a previous version that seemed to work. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ build-debug: stage: build script: - - dotnet restore ./isometric-park-fna/isometric-park-fna-core.csproj + - dotnet restore isometric-park-fna-core.sln - dotnet build isometric-park-fna-core.sln -f netcoreapp3.1 image: mcr.microsoft.com/dotnet/sdk:3.1.415-focal @@ -22,14 +22,14 @@ build-release-windows: stage: build script: - - dotnet restore ./isometric-park-fna/isometric-park-fna-core.csproj + - dotnet restore isometric-park-fna-core.sln - dotnet build isometric-park-fna-core.sln -f netcoreapp3.1 -c Release image: mcr.microsoft.com/dotnet/sdk:3.1.415 build-release: stage: build script: - - dotnet restore ./isometric-park-fna/isometric-park-fna-core.csproj + - dotnet restore isometric-park-fna-core.sln - dotnet build isometric-park-fna-core.sln -f netcoreapp3.1 -c Release artifacts: paths: diff --git a/isometric-park-fna-core.sln b/isometric-park-fna-core.sln --- a/isometric-park-fna-core.sln +++ b/isometric-park-fna-core.sln @@ -5,8 +5,6 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "isometric-park-fna-core", "isometric-park-fna\isometric-park-fna-core.csproj", "{4BA11D6F-B980-4E5B-99FE-729AD3D34A12}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImGui.NET.Core", "ImGui.NET\ImGui.NET.Core.csproj", "{E7AB4506-A404-4BE8-AF71-5486AD9EBC71}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU