feat: generate csproj on demand

19 files changed, 40 insertions, 99 deletions

diff --git a/tests/projects/csharp/console/xmake.lua b/tests/projects/csharp/console/xmake.lua
index 25cd801f0..3288c96a8 100644
--- a/tests/projects/csharp/console/xmake.lua
+++ b/tests/projects/csharp/console/xmake.lua
@@ -3,4 +3,4 @@ add_rules("mode.debug", "mode.release")
 target("test")
     set_kind("binary")
     add_rules("csharp")
-    add_files("src/Program.cs", "src/test.csproj")
+    add_files("src/Program.cs")
diff --git a/tests/projects/csharp/console_with_runtime_json/src/app.csproj b/tests/projects/csharp/console_with_runtime_json/src/app.csproj
deleted file mode 100644
index 4e754bb15..000000000
--- a/tests/projects/csharp/console_with_runtime_json/src/app.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="runtime.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-</Project>
-
diff --git a/tests/projects/csharp/console_with_runtime_json/xmake.lua b/tests/projects/csharp/console_with_runtime_json/xmake.lua
index 8d8539b26..474eda548 100644
--- a/tests/projects/csharp/console_with_runtime_json/xmake.lua
+++ b/tests/projects/csharp/console_with_runtime_json/xmake.lua
@@ -3,4 +3,4 @@ add_rules("mode.debug", "mode.release")
 target("app")
     set_kind("binary")
     add_rules("csharp")
-    add_files("src/Program.cs", "src/app.csproj")
+    add_files("src/Program.cs")
diff --git a/tests/projects/csharp/exe_with_library/src/app/app.csproj b/tests/projects/csharp/exe_with_library/src/app/app.csproj
deleted file mode 100644
index e5e49a685..000000000
--- a/tests/projects/csharp/exe_with_library/src/app/app.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="../lib/lib.csproj" />
-  </ItemGroup>
-</Project>
-
diff --git a/tests/projects/csharp/exe_with_library/src/lib/lib.csproj b/tests/projects/csharp/exe_with_library/src/lib/lib.csproj
deleted file mode 100644
index 30c56ecb5..000000000
--- a/tests/projects/csharp/exe_with_library/src/lib/lib.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-</Project>
-
diff --git a/tests/projects/csharp/exe_with_library/xmake.lua b/tests/projects/csharp/exe_with_library/xmake.lua
index 063e051db..f8549444e 100644
--- a/tests/projects/csharp/exe_with_library/xmake.lua
+++ b/tests/projects/csharp/exe_with_library/xmake.lua
@@ -3,10 +3,10 @@ add_rules("mode.debug", "mode.release")
 target("mylib")
     set_kind("shared")
     add_rules("csharp")
-    add_files("src/lib/*.cs", "src/lib/lib.csproj")
+    add_files("src/lib/*.cs")
 
 target("app")
     set_kind("binary")
     add_rules("csharp")
     add_deps("mylib")
-    add_files("src/app/*.cs", "src/app/app.csproj")
+    add_files("src/app/*.cs")
diff --git a/tests/projects/csharp/exe_with_package/src/app.csproj b/tests/projects/csharp/exe_with_package/src/app.csproj
deleted file mode 100644
index 0521e2a0c..000000000
--- a/tests/projects/csharp/exe_with_package/src/app.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-  </ItemGroup>
-</Project>
-
diff --git a/tests/projects/csharp/exe_with_package/xmake.lua b/tests/projects/csharp/exe_with_package/xmake.lua
index 8d8539b26..6ec474822 100644
--- a/tests/projects/csharp/exe_with_package/xmake.lua
+++ b/tests/projects/csharp/exe_with_package/xmake.lua
@@ -1,6 +1,8 @@
 add_rules("mode.debug", "mode.release")
+add_requires("nuget::Humanizer.Core 2.14.1")
 
 target("app")
     set_kind("binary")
     add_rules("csharp")
-    add_files("src/Program.cs", "src/app.csproj")
+    add_files("src/Program.cs")
+    add_packages("nuget::Humanizer.Core")
diff --git a/tests/projects/csharp/existing_csproj/.gitignore b/tests/projects/csharp/existing_csproj/.gitignore
new file mode 100644
index 000000000..6b8d3af38
--- /dev/null
+++ b/tests/projects/csharp/existing_csproj/.gitignore
@@ -0,0 +1,6 @@
+.xmake/
+build/
+bin/
+obj/
+vsxmake*/
+.vs/
diff --git a/tests/projects/csharp/existing_csproj/Program.cs b/tests/projects/csharp/existing_csproj/Program.cs
new file mode 100644
index 000000000..3751555cb
--- /dev/null
+++ b/tests/projects/csharp/existing_csproj/Program.cs
@@ -0,0 +1,2 @@
+// See https://aka.ms/new-console-template for more information
+Console.WriteLine("Hello, World!");
diff --git a/tests/projects/csharp/console/src/test.csproj b/tests/projects/csharp/existing_csproj/existing_csproj.csproj
index 9dbab4973..ed9781c22 100644
--- a/tests/projects/csharp/console/src/test.csproj
+++ b/tests/projects/csharp/existing_csproj/existing_csproj.csproj
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-</Project>
 
+</Project>
diff --git a/tests/projects/csharp/existing_csproj/test.lua b/tests/projects/csharp/existing_csproj/test.lua
new file mode 100644
index 000000000..5ab8adc69
--- /dev/null
+++ b/tests/projects/csharp/existing_csproj/test.lua
@@ -0,0 +1,10 @@
+import("lib.detect.find_tool")
+
+function test_build(t)
+    local dotnet = find_tool("dotnet")
+    if dotnet then
+        t:build()
+    else
+        return t:skip("dotnet not found")
+    end
+end
diff --git a/tests/projects/csharp/existing_csproj/xmake.lua b/tests/projects/csharp/existing_csproj/xmake.lua
new file mode 100644
index 000000000..95e5e45d9
--- /dev/null
+++ b/tests/projects/csharp/existing_csproj/xmake.lua
@@ -0,0 +1,6 @@
+add_rules("mode.debug", "mode.release")
+
+target("test")
+    set_kind("binary")
+    add_rules("csharp")
+    add_files("existing_csproj.csproj")
diff --git a/tests/projects/csharp/multiple_library/src/libalpha/libalpha.csproj b/tests/projects/csharp/multiple_library/src/libalpha/libalpha.csproj
deleted file mode 100644
index 30c56ecb5..000000000
--- a/tests/projects/csharp/multiple_library/src/libalpha/libalpha.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-</Project>
-
diff --git a/tests/projects/csharp/multiple_library/src/libbeta/libbeta.csproj b/tests/projects/csharp/multiple_library/src/libbeta/libbeta.csproj
deleted file mode 100644
index 15502d321..000000000
--- a/tests/projects/csharp/multiple_library/src/libbeta/libbeta.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="../libalpha/libalpha.csproj" />
-  </ItemGroup>
-</Project>
-
diff --git a/tests/projects/csharp/multiple_library/src/sample/sample.csproj b/tests/projects/csharp/multiple_library/src/sample/sample.csproj
deleted file mode 100644
index 459440d0e..000000000
--- a/tests/projects/csharp/multiple_library/src/sample/sample.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../libbeta/libbeta.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/tests/projects/csharp/multiple_library/xmake.lua b/tests/projects/csharp/multiple_library/xmake.lua
index b4be98c99..db3f65811 100644
--- a/tests/projects/csharp/multiple_library/xmake.lua
+++ b/tests/projects/csharp/multiple_library/xmake.lua
@@ -3,16 +3,16 @@ add_rules("mode.debug", "mode.release")
 target("libalpha")
     set_kind("shared")
     add_rules("csharp")
-    add_files("src/libalpha/*.cs", "src/libalpha/libalpha.csproj")
+    add_files("src/libalpha/*.cs")
 
 target("libbeta")
     set_kind("shared")
     add_rules("csharp")
     add_deps("libalpha")
-    add_files("src/libbeta/*.cs", "src/libbeta/libbeta.csproj")
+    add_files("src/libbeta/*.cs")
 
 target("sample")
     set_kind("binary")
     add_rules("csharp")
     add_deps("libbeta")
-    add_files("src/sample/*.cs", "src/sample/sample.csproj")
+    add_files("src/sample/*.cs")
diff --git a/tests/projects/csharp/web_project/src/webapp.csproj b/tests/projects/csharp/web_project/src/webapp.csproj
deleted file mode 100644
index 4715481ee..000000000
--- a/tests/projects/csharp/web_project/src/webapp.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-</Project>
-
diff --git a/tests/projects/csharp/web_project/xmake.lua b/tests/projects/csharp/web_project/xmake.lua
index d1e5504c3..56bcad79c 100644
--- a/tests/projects/csharp/web_project/xmake.lua
+++ b/tests/projects/csharp/web_project/xmake.lua
@@ -3,4 +3,5 @@ add_rules("mode.debug", "mode.release")
 target("webapp")
     set_kind("binary")
     add_rules("csharp")
-    add_files("src/Program.cs", "src/webapp.csproj")
+    add_values("csharp.sdk", "Microsoft.NET.Sdk.Web")
+    add_files("src/Program.cs")