调整例程目录

NewLifeX · Nov 30, 2024 · 5c8cf97 · 5c8cf97
1 parent de48c27
commit 5c8cf97
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 18 deletions.
diff --git a/Demo/Demo.csproj b/Demo/Demo.csproj
diff --git a/NewLife.Remoting.sln b/NewLife.Remoting.sln
@@ -18,7 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewLife.Remoting", "NewLife.Remoting\NewLife.Remoting.csproj", "{D07654F5-5A89-4781-9094-070D026858CE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo", "Demo\Demo.csproj", "{685205DD-0754-4877-9A96-40CD18F8D84B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo", "Samples\Demo\Demo.csproj", "{685205DD-0754-4877-9A96-40CD18F8D84B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{8DB8495C-1EB6-41AE-83DD-55DBBB0E6FA2}"
 EndProject
@@ -30,7 +30,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoTZero", "Samples\IoTZero\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZeroServer", "Samples\ZeroServer\ZeroServer.csproj", "{95AA14E4-6771-487B-886E-251C785624E6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zero.Desktop", "ZeroClient\Zero.Desktop.csproj", "{C9E9BE11-9B06-483D-86C1-3C11D1A5907A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zero.Desktop", "Samples\Zero.Desktop\Zero.Desktop.csproj", "{C9E9BE11-9B06-483D-86C1-3C11D1A5907A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Samples/Demo/Demo.csproj b/Samples/Demo/Demo.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <AssemblyTitle>RPC例程</AssemblyTitle>
+    <Description>RPC通信例程</Description>
+    <Company>新生命开发团队</Company>
+    <Copyright>©2002-2024 NewLife</Copyright>
+    <VersionPrefix>1.0</VersionPrefix>
+    <VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
+    <Version>$(VersionPrefix).$(VersionSuffix)</Version>
+    <FileVersion>$(Version)</FileVersion>
+    <AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
+    <Deterministic>false</Deterministic>
+    <OutputPath>..\..\Bin\Demo</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\NewLife.Remoting\NewLife.Remoting.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Demo/Program.cs → Samples/Demo/Program.cs b/Demo/Program.cs → Samples/Demo/Program.cs
diff --git a/ZeroClient/ClientSetting.cs → Samples/Zero.Desktop/ClientSetting.cs b/ZeroClient/ClientSetting.cs → Samples/Zero.Desktop/ClientSetting.cs
diff --git a/ZeroClient/FrmMain.Designer.cs → Samples/Zero.Desktop/FrmMain.Designer.cs b/ZeroClient/FrmMain.Designer.cs → Samples/Zero.Desktop/FrmMain.Designer.cs
diff --git a/ZeroClient/FrmMain.cs → Samples/Zero.Desktop/FrmMain.cs b/ZeroClient/FrmMain.cs → Samples/Zero.Desktop/FrmMain.cs
diff --git a/ZeroClient/FrmMain.resx → Samples/Zero.Desktop/FrmMain.resx b/ZeroClient/FrmMain.resx → Samples/Zero.Desktop/FrmMain.resx
diff --git a/ZeroClient/Program.cs → Samples/Zero.Desktop/Program.cs b/ZeroClient/Program.cs → Samples/Zero.Desktop/Program.cs
diff --git a/ZeroClient/Zero.Desktop.csproj → Samples/Zero.Desktop/Zero.Desktop.csproj b/ZeroClient/Zero.Desktop.csproj → Samples/Zero.Desktop/Zero.Desktop.csproj
@@ -13,7 +13,7 @@
     <FileVersion>$(Version)</FileVersion>
     <AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
     <Deterministic>false</Deterministic>
-    <OutputPath>..\Bin\Desktop</OutputPath>
+    <OutputPath>..\..\Bin\Desktop</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>latest</LangVersion>
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NewLife.Remoting\NewLife.Remoting.csproj" />
+    <ProjectReference Include="..\..\NewLife.Remoting\NewLife.Remoting.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/ZeroClient/app.manifest → Samples/Zero.Desktop/app.manifest b/ZeroClient/app.manifest → Samples/Zero.Desktop/app.manifest
diff --git a/ZeroClient/appsettings.json → Samples/Zero.Desktop/appsettings.json b/ZeroClient/appsettings.json → Samples/Zero.Desktop/appsettings.json