From 75f01993b1144293bbc52860cdcf5434bcc58076 Mon Sep 17 00:00:00 2001
From: Zonciu Liang <zonciu@zonciu.com>
Date: Sat, 23 Jan 2021 01:15:23 +0800
Subject: [PATCH] chore: fix SolutionDir for building (#1011)

---
 Directory.Build.props                                   | 6 ++++++
 components/AntDesign.csproj                             | 4 ----
 package.json                                            | 4 ++--
 site/AntBlazor.Docs/AntDesign.Docs.csproj               | 4 ----
 site/AntDesign.Docs.Server/AntDesign.Docs.Server.csproj | 4 ----
 site/AntDesign.Docs.Wasm/AntDesign.Docs.Wasm.csproj     | 4 ----
 6 files changed, 8 insertions(+), 18 deletions(-)
 create mode 100644 Directory.Build.props

diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 00000000..89387713
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup Label="BasePath">
+    <SolutionDir Condition="'$(SolutionDir)'==''">$(MSBuildThisFileDirectory)</SolutionDir>
+  </PropertyGroup>
+</Project>
diff --git a/components/AntDesign.csproj b/components/AntDesign.csproj
index de2d95b3..336f8c14 100644
--- a/components/AntDesign.csproj
+++ b/components/AntDesign.csproj
@@ -62,10 +62,6 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' And '$(SolutionDir)'==''">
-    <SolutionDir>../</SolutionDir>
-  </PropertyGroup>
-
   <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SolutionDir)node_modules') ">
     <!-- Ensure Node.js is installed -->
     <Exec Command="node --version" ContinueOnError="true">
diff --git a/package.json b/package.json
index de8fc222..fc3f785a 100644
--- a/package.json
+++ b/package.json
@@ -21,8 +21,8 @@
     "url": "https://github.com/ElderJames/ant-design-blazor/issues"
   },
   "scripts": {
-    "start": "dotnet  watch -p ./site/AntDesign.Docs.Server run",
-    "start:wasm": "dotnet watch -p ./site/AntDesign.Docs.Wasm run",
+    "start": "dotnet watch -p ./site/AntDesign.Docs.Server run -f net5",
+    "start:wasm": "dotnet watch -p ./site/AntDesign.Docs.Wasm run -f net5",
     "gulp:components": "gulp --gulpfile ./components/gulpfile.js",
     "gulp:docs": "gulp --gulpfile ./site/AntBlazor.Docs/gulpfile.js",
     "preinstall": "dotnet tool restore"
diff --git a/site/AntBlazor.Docs/AntDesign.Docs.csproj b/site/AntBlazor.Docs/AntDesign.Docs.csproj
index c667f67c..b4ca2021 100644
--- a/site/AntBlazor.Docs/AntDesign.Docs.csproj
+++ b/site/AntBlazor.Docs/AntDesign.Docs.csproj
@@ -11,10 +11,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web.Extensions" Version="5.0.0-preview9.20513.1" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(SolutionDir)'==''">
-    <SolutionDir>../../</SolutionDir>
-  </PropertyGroup>
-
   <ItemGroup>
     <Content Include="$(SolutionDir)docs\**" LinkBase="docs" />
   </ItemGroup>
diff --git a/site/AntDesign.Docs.Server/AntDesign.Docs.Server.csproj b/site/AntDesign.Docs.Server/AntDesign.Docs.Server.csproj
index 1c9f61db..cd754b2d 100644
--- a/site/AntDesign.Docs.Server/AntDesign.Docs.Server.csproj
+++ b/site/AntDesign.Docs.Server/AntDesign.Docs.Server.csproj
@@ -8,10 +8,6 @@
     <ProjectReference Include="..\AntBlazor.Docs\AntDesign.Docs.csproj" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' And '$(SolutionDir)'==''">
-    <SolutionDir>../../</SolutionDir>
-  </PropertyGroup>
-
   <ItemGroup>
     <DocFiles Include="$(SolutionDir)docs\**\*.*"></DocFiles>
   </ItemGroup>
diff --git a/site/AntDesign.Docs.Wasm/AntDesign.Docs.Wasm.csproj b/site/AntDesign.Docs.Wasm/AntDesign.Docs.Wasm.csproj
index adf4088e..89cd633d 100644
--- a/site/AntDesign.Docs.Wasm/AntDesign.Docs.Wasm.csproj
+++ b/site/AntDesign.Docs.Wasm/AntDesign.Docs.Wasm.csproj
@@ -21,10 +21,6 @@
     <ProjectReference Include="..\AntBlazor.Docs\AntDesign.Docs.csproj" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' And '$(SolutionDir)'==''">
-    <SolutionDir>../../</SolutionDir>
-  </PropertyGroup>
-
   <ItemGroup>
     <Content Include="$(SolutionDir)scripts\gh-pages\**" LinkBase="gh-pages" />
   </ItemGroup>