From 23cba087ae3a80c40b9fe5de096ebcc7c3cd4ea6 Mon Sep 17 00:00:00 2001
From: CHINBOY <qinware@163.com>
Date: Mon, 10 Mar 2025 20:46:28 +0800
Subject: [PATCH] Refactor output path

---
 build/Output.props            | 5 +++--
 packages/AtomUI/AtomUI.csproj | 6 +++---
 scripts/BuildAtomUINative.ps1 | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/Output.props b/build/Output.props
index 367b0a8b7..cba34ecbd 100644
--- a/build/Output.props
+++ b/build/Output.props
@@ -3,7 +3,8 @@
         <PackageOutputPath>$(MSBuildThisFileDirectory)..\output\Nuget\</PackageOutputPath>
         <OutputPathWithoutFramework>$(MSBuildThisFileDirectory)..\output\bin\$(Configuration)\</OutputPathWithoutFramework>
         <OutputPath>$(OutputPathWithoutFramework)\$(TargetFramework)\</OutputPath>
-        <IntermediateOutputPathWithoutFramework>$(MSBuildThisFileDirectory)..\output\$(MSBuildProjectName)\obj\$(Configuration)\</IntermediateOutputPathWithoutFramework>
-        <IntermediateOutputPath>$(IntermediateOutputPathWithoutFramework)$(TargetFramework)\</IntermediateOutputPath>
+        <IntermediateOutputPathWithoutFramework>$(BaseIntermediateOutputPath)\</IntermediateOutputPathWithoutFramework>
+        <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\output\$(MSBuildProjectName)\obj\</BaseIntermediateOutputPath>
+        <IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(Configuration)\$(TargetFramework)\</IntermediateOutputPath>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/packages/AtomUI/AtomUI.csproj b/packages/AtomUI/AtomUI.csproj
index ebe853c20..a4b24d9f9 100644
--- a/packages/AtomUI/AtomUI.csproj
+++ b/packages/AtomUI/AtomUI.csproj
@@ -65,8 +65,8 @@
     </ItemGroup>
 
     <PropertyGroup>
-        <AtomUINativeWindowsX64Artifact>$(OutputPath)$(AtomUINativeWindowsX64DeployPath)/$(AtomUINativeWindowsArtifactName)</AtomUINativeWindowsX64Artifact>
-        <AtomUINativeMacOSArtifact>$(OutputPath)$(AtomUINativeMacOSDeployPath)/$(AtomUINativeMacOSArtifactName)</AtomUINativeMacOSArtifact>
+        <AtomUINativeWindowsX64Artifact>$(OutputPathWithoutFramework)$(AtomUINativeWindowsX64DeployPath)/$(AtomUINativeWindowsArtifactName)</AtomUINativeWindowsX64Artifact>
+        <AtomUINativeMacOSArtifact>$(OutputPathWithoutFramework)$(AtomUINativeMacOSDeployPath)/$(AtomUINativeMacOSArtifactName)</AtomUINativeMacOSArtifact>
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -105,7 +105,7 @@
     </ItemGroup>
 
     <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-        <Content Include="$(AtomUIPackageOutput)/$(AtomUINativeDeployPath)/$(AtomUINativeArtifactName)">
+        <Content Include="$(AtomUIPackageOutputWithoutFramework)/$(AtomUINativeDeployPath)/$(AtomUINativeArtifactName)">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Link>$(AtomUINativeDeployPath)/$(AtomUINativeArtifactName)</Link>
         </Content>
diff --git a/scripts/BuildAtomUINative.ps1 b/scripts/BuildAtomUINative.ps1
index 88bcd9b13..4cf0b624c 100644
--- a/scripts/BuildAtomUINative.ps1
+++ b/scripts/BuildAtomUINative.ps1
@@ -20,7 +20,7 @@ $buildMarker = Join-Path -Path $buildDir -ChildPath ".native_compiled"
 
 if (-not (Test-Path -Path $buildMarker -PathType Leaf)) {
     # 如果文件不存在，则创建（自动创建父目录）
-    New-Item -Path $buildMarker -ItemType File -Force
+    New-Item -Path $buildMarker -ItemType File -Force | Out-Null
 } else {
     return
 }