Improve SimplePInvoke native build flow

Author: chsbuffer

.github/workflows/build.yml

@@ -50,10 +50,10 @@ jobs:
         run: sudo ./eng/common/native/install-dependencies.sh linux
 
       - name: Build hostlibs for Linux x64
-        run: python ./scripts/build-hostlibs.py --os linux --arch x64
+        run: python ./scripts/build-hostlibs.py -v --os linux --arch x64
 
       - name: Run SimplePInvoke sample
-        run: ./repo/runtime/.dotnet/dotnet run --project samples/simple-pinvoke/SimplePInvoke.csproj
+        run: ./repo/runtime/.dotnet/dotnet run --project samples/simple-pinvoke/SimplePInvoke.csproj -v:normal
 
       - name: Publish SimplePInvoke sample trimmed
-        run: ./repo/runtime/.dotnet/dotnet publish samples/simple-pinvoke/SimplePInvoke.csproj -p:"PublishTrimmed=true"
+        run: ./repo/runtime/.dotnet/dotnet publish samples/simple-pinvoke/SimplePInvoke.csproj -v:normal -p:"PublishTrimmed=true"

Directory.Build.props

@@ -1,7 +1,6 @@
 <Project>
   <PropertyGroup>
     <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
-    <DefaultRid>win-x64</DefaultRid>
     <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
 
     <AvaloniaAppHostPackageVersion>11.0.0-preview.2</AvaloniaAppHostPackageVersion>

README.md

@@ -86,7 +86,7 @@ python .\scripts\pipeline.py matrix
 - 构建 SkiaSharp：
 
 ```powershell
-python .\scripts\pipeline.py skia
+python .\scripts\pipeline.py skia -v
 ```
 或
 ```powershell
@@ -97,15 +97,15 @@ python .\scripts\build-skia-harfbuzz.py -v -a arm64
 - 打包 Avalonia Host 包：
 
 ```powershell
-python .\scripts\pipeline.py pack-avalonia
+python .\scripts\pipeline.py pack-avalonia -v
 ```
 
 ## 实验性 Linux 生成
 
 - 构建 HostLib：
 
 ```bash
-python scripts/build-hostlibs.py --os linux --arch x64
+python scripts/build-hostlibs.py -v --os linux --arch x64
 ```
 
 - 运行构建集成矩阵测试：

samples/simple-pinvoke/NativeLib/build.py

@@ -30,16 +30,27 @@ def execv(cmd: str, cwd: Path | None = None, env=None):
     return proc
 
 
+def run_in_vs_env(cmd: str, cwd: Path, arch: str, env=None):
+    full_cmd = f"call {INIT_VS_ENV_CMD} {arch} && cd /d {cwd} && {cmd}"
+    execv(full_cmd)
+
+
 SCRIPT_ROOT = Path(__file__).resolve().parent
+INIT_VS_ENV_CMD = SCRIPT_ROOT / ".." / ".." / ".." / "scripts" / "init-vs-env.cmd"
 
 
 def main():
     if is_windows:
-        execv("cl.exe /nologo /c dll.cpp")
-        execv("lib.exe /nologo dll.obj")
+        if not Path(SCRIPT_ROOT, "dll.lib").exists():
+            run_in_vs_env(
+                "cl.exe /nologo /c dll.cpp && lib.exe /nologo dll.obj",
+                cwd=SCRIPT_ROOT,
+                arch="x64",
+            )
     else:
-        execv("clang++ -c dll.cpp")
-        execv("llvm-ar rcs dll.a dll.o")
+        if not Path(SCRIPT_ROOT, "dll.a").exists():
+            execv("clang++ -c dll.cpp")
+            execv("llvm-ar rcs dll.a dll.o")
 
 
 if __name__ == "__main__":

samples/simple-pinvoke/NativeLib/lib.cpp samples/simple-pinvoke/NativeLib/dll.cppsamples/simple-pinvoke/NativeLib/lib.cpp renamed to samples/simple-pinvoke/NativeLib/dll.cpp

@@ -30,4 +30,9 @@
     </NativeLibrary>
   </ItemGroup>
 
+  <Target Name="BuildNativeLib" BeforeTargets="CoreCompile">
+    <Exec Command="python build.py"
+          WorkingDirectory="$(ProjectDir)NativeLib" />
+  </Target>
+
 </Project>