Merge pull request #149 from cwtools/tidy2

tboby · web-flow · commit 364beae5e3c1 · 2025-12-08T22:44:17.000Z
Tidy solution some more
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,7 +13,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
       with:
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "src/Main/config"]
-	path = src/Main/config
-	url = https://github.com/tboby/cwtools-stellaris-config
+[submodule "submodules/cwtools"]
+	path = submodules/cwtools
+	url = https://github.com/cwtools/cwtools
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+    <PropertyGroup>
+        <UseArtifactsOutput>true</UseArtifactsOutput>
+    </PropertyGroup>
+</Project>
diff --git a/build.cmd b/build.cmd
@@ -2,9 +2,7 @@
 cls
 
 dotnet tool restore
-dotnet paket restore
-if errorlevel 1 (
-  exit /b %errorlevel%
-)
+REM Ensure git submodules (cwtools) are available when not using a local override
+git submodule update --init --recursive
 
 dotnet run --project build -- -t %*
diff --git a/build.nu b/build.nu
@@ -1,10 +1,6 @@
 def main [profile? : string] {
 
 dotnet tool restore
-dotnet paket restore
-let exit_code = $env.LAST_EXIT_CODE
-if $exit_code != 0 {
-    exit $exit_code
-}
+git submodule update --init --recursive
 dotnet run --project build -- -t ($profile | default "QuickBuild")
 }
diff --git a/build.sh b/build.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 
 dotnet tool restore
-dotnet paket restore
-exit_code=$?
-if [ $exit_code -ne 0 ]; then
-  exit $exit_code
-fi
+# Ensure git submodules (cwtools) are available when not using a local override
+git submodule update --init --recursive
 dotnet run --project build -- -t $@
diff --git a/cwtools-vscode.slnx b/cwtools-vscode.slnx
@@ -0,0 +1,20 @@
+<Solution>
+  <Folder Name="/.paket/">
+    <File Path="paket.dependencies" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path="build.cmd" />
+    <File Path="build.sh" />
+    <File Path="Directory.Packages.props" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/CSharpExtensions/CSharpExtensions.csproj" />
+    <Project Path="src/Languages/Languages.csproj" />
+    <Project Path="src/LSP/LSP.fsproj">
+    </Project>
+    <Project Path="src/Main/Main.fsproj">
+    </Project>
+  </Folder>
+  <Folder Name="/tests/" />
+  <Project Path="build/build.fsproj" />
+</Solution>
diff --git a/fsharp-language-server.sln b/fsharp-language-server.sln
diff --git a/fsharp-language-server.sln.DotSettings.user b/fsharp-language-server.sln.DotSettings.user
diff --git a/paket.dependencies b/paket.dependencies
diff --git a/paket.lock b/paket.lock
diff --git a/src/Main/Main.fsproj b/src/Main/Main.fsproj
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <AssemblyName>CWTools Server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
@@ -17,7 +17,7 @@
     <RuntimeHostConfigurationOption Include="System.GC.NoAffinitize" Value="true" />
 
     <ProjectReference Include="..\LSP\LSP.fsproj" />
-    <ProjectReference Condition="'$(UseLocalCwtools)' != 'True'" Include="..\..\paket-files\git\www.github.com\cwtools\cwtools\CWTools\CWTools.fsproj" />
+    <ProjectReference Condition="'$(UseLocalCwtools)' != 'True'" Include="..\..\submodules\cwtools\CWTools\CWTools.fsproj" />
     <ProjectReference Condition="'$(UseLocalCwtools)' == 'True'" Include="$(CwtoolsPath)" />
   </ItemGroup>
   <ItemGroup>
diff --git a/submodules/cwtools b/submodules/cwtools
@@ -0,0 +1 @@
+Subproject commit b377453dee803f9258be92cfc49896d09039702d
