From 4ce9c47f62604e8e8d69b32079ea400914ed8f7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= <yangw@mesnac.com>
Date: Tue, 13 Aug 2024 11:26:46 +0800
Subject: [PATCH] 2

---
 .gitattributes                                | 69 +++++++++++++++++++
 .idea/.idea.NDSD-Screwdriver/.idea/.gitignore | 13 ++++
 .idea/.idea.NDSD-Screwdriver/.idea/.name      |  1 +
 NDSD-TouchSocket/NDSD-TouchSocket.csproj      |  6 +-
 4 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 .gitattributes
 create mode 100644 .idea/.idea.NDSD-Screwdriver/.idea/.gitignore
 create mode 100644 .idea/.idea.NDSD-Screwdriver/.idea/.name

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..42a55b4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,69 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+/.idea/.idea.NDSD-Screwdriver/.idea/encodings.xml
+/.idea/.idea.NDSD-Screwdriver/.idea/indexLayout.xml
+/.idea/.idea.NDSD-Screwdriver/.idea/vcs.xml
+/.idea/.idea.NDSD-Screwdriver/.idea/.name
+/.idea/.idea.NDSD-Screwdriver/.idea/encodings.xml
+/.idea/.idea.NDSD-Screwdriver/.idea/indexLayout.xml
+/.idea/.idea.NDSD-Screwdriver/.idea/vcs.xml
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain
diff --git a/.idea/.idea.NDSD-Screwdriver/.idea/.gitignore b/.idea/.idea.NDSD-Screwdriver/.idea/.gitignore
new file mode 100644
index 0000000..254272c
--- /dev/null
+++ b/.idea/.idea.NDSD-Screwdriver/.idea/.gitignore
@@ -0,0 +1,13 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# Rider 忽略的文件
+/modules.xml
+/contentModel.xml
+/projectSettingsUpdater.xml
+/.idea.NDSD-Screwdriver.iml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/.idea.NDSD-Screwdriver/.idea/.name b/.idea/.idea.NDSD-Screwdriver/.idea/.name
new file mode 100644
index 0000000..327fd25
--- /dev/null
+++ b/.idea/.idea.NDSD-Screwdriver/.idea/.name
@@ -0,0 +1 @@
+NDSD-Screwdriver
\ No newline at end of file
diff --git a/NDSD-TouchSocket/NDSD-TouchSocket.csproj b/NDSD-TouchSocket/NDSD-TouchSocket.csproj
index 23c28e7..bbe7c9f 100644
--- a/NDSD-TouchSocket/NDSD-TouchSocket.csproj
+++ b/NDSD-TouchSocket/NDSD-TouchSocket.csproj
@@ -59,10 +59,10 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="TouchSocket, Version=2.1.0.0, Culture=neutral, PublicKeyToken=5f39d7da98dac6a9, processorArchitecture=MSIL">
-      <HintPath>..\NDSD-Screwdriver\packages\TouchSocket.2.1.0-rc.9\lib\net472\TouchSocket.dll</HintPath>
+      <HintPath>..\packages\TouchSocket.2.1.0-rc.9\lib\net472\TouchSocket.dll</HintPath>
     </Reference>
     <Reference Include="TouchSocket.Core, Version=2.1.0.0, Culture=neutral, PublicKeyToken=d6c415a2f58eda72, processorArchitecture=MSIL">
-      <HintPath>..\NDSD-Screwdriver\packages\TouchSocket.Core.2.1.0-rc.9\lib\net472\TouchSocket.Core.dll</HintPath>
+      <HintPath>..\packages\TouchSocket.Core.2.1.0-rc.9\lib\net472\TouchSocket.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -77,7 +77,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\NDSD-Screwdriver\packages\TouchSocket.Core.2.1.0-rc.9\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" />
+    <Analyzer Include="..\packages\TouchSocket.Core.2.1.0-rc.9\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file