Исправлены пути к каталогам проетка DevAdmHelpers

- Пути не соответствовали именам проектам и пространствам имен
YPermitin · Apr 23, 2023 · 799cfd3 · 799cfd3
1 parent eb6a6a2
commit 799cfd3
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/...s.SQLCLR.Tests/DevAdmHelpers.Tests.csproj → ...mHelpers.Tests/DevAdmHelpers.Tests.csproj b/...s.SQLCLR.Tests/DevAdmHelpers.Tests.csproj → ...mHelpers.Tests/DevAdmHelpers.Tests.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DevAdmHelpers.SQLCLR\DevAdmHelpers.csproj" />
+    <ProjectReference Include="..\DevAdmHelpers\DevAdmHelpers.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...lpers.SQLCLR.Tests/EntryDiagnosticTest.cs → ...evAdmHelpers.Tests/EntryDiagnosticTest.cs b/...lpers.SQLCLR.Tests/EntryDiagnosticTest.cs → ...evAdmHelpers.Tests/EntryDiagnosticTest.cs
diff --git a/...pers/DevAdmHelpers.SQLCLR.Tests/Usings.cs → ...vAdmHelpers/DevAdmHelpers.Tests/Usings.cs b/...pers/DevAdmHelpers.SQLCLR.Tests/Usings.cs → ...vAdmHelpers/DevAdmHelpers.Tests/Usings.cs
diff --git a/SQL-Server-SQLCLR/Projects/DevAdmHelpers/DevAdmHelpers.sln b/SQL-Server-SQLCLR/Projects/DevAdmHelpers/DevAdmHelpers.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33530.505
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevAdmHelpers", "DevAdmHelpers.SQLCLR\DevAdmHelpers.csproj", "{181CDC87-A70E-48B0-AFED-D8B8B782FB71}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevAdmHelpers", "DevAdmHelpers\DevAdmHelpers.csproj", "{181CDC87-A70E-48B0-AFED-D8B8B782FB71}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{549056E1-02AF-4C2B-91C0-B5E52B1D51AD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{7C2F57BE-D1B3-4DB5-8545-8FF318BEFBB4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevAdmHelpers.Tests", "DevAdmHelpers.SQLCLR.Tests\DevAdmHelpers.Tests.csproj", "{BEB541D3-6061-4E8B-A8BC-746EA1B88525}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevAdmHelpers.Tests", "DevAdmHelpers.Tests\DevAdmHelpers.Tests.csproj", "{BEB541D3-6061-4E8B-A8BC-746EA1B88525}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{1A108FF1-54B1-4F2D-9B3C-CF1A8A4854F8}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/...DevAdmHelpers.SQLCLR/DevAdmHelpers.csproj → ...elpers/DevAdmHelpers/DevAdmHelpers.csproj b/...DevAdmHelpers.SQLCLR/DevAdmHelpers.csproj → ...elpers/DevAdmHelpers/DevAdmHelpers.csproj
diff --git a/...Helpers/DevAdmHelpers.SQLCLR/EntryBase.cs → .../DevAdmHelpers/DevAdmHelpers/EntryBase.cs b/...Helpers/DevAdmHelpers.SQLCLR/EntryBase.cs → .../DevAdmHelpers/DevAdmHelpers/EntryBase.cs
diff --git a/...s/DevAdmHelpers.SQLCLR/EntryDiagnostic.cs → ...mHelpers/DevAdmHelpers/EntryDiagnostic.cs b/...s/DevAdmHelpers.SQLCLR/EntryDiagnostic.cs → ...mHelpers/DevAdmHelpers/EntryDiagnostic.cs
diff --git a/...Helpers.SQLCLR/Properties/AssemblyInfo.cs → .../DevAdmHelpers/Properties/AssemblyInfo.cs b/...Helpers.SQLCLR/Properties/AssemblyInfo.cs → .../DevAdmHelpers/Properties/AssemblyInfo.cs
diff --git a/SQL-Server-SQLCLR/Projects/DevAdmHelpers/Readme.md b/SQL-Server-SQLCLR/Projects/DevAdmHelpers/Readme.md
@@ -14,23 +14,23 @@
 
 * **GetSystemInfo** - получение системной информации о текущем контексте процесса SQL Server. Пример вывода:
 
-| Name         | Value           | Description                                                        |   |   |
-|--------------|-----------------|--------------------------------------------------------------------|---|---|
-| VersionCLR   | 4.0.30319.42000 | Описание версии CLR                                                |   |   |
-| OSUserName   | ypermitin       | Имя пользователя операционной системы, от которого запущен процесс |   |   |
-| OSDomainName | YY              | Имя сетевого домена, связанное с текущим пользователем             |   |   |
-| MachineName  | SRV-SQL-1       | Имя NetBIOS данного компьютера                                     |   |   |
+| Name         | Value           | Description                                                        |
+|--------------|-----------------|--------------------------------------------------------------------|
+| VersionCLR   | 4.0.30319.42000 | Описание версии CLR                                                |
+| OSUserName   | ypermitin       | Имя пользователя операционной системы, от которого запущен процесс |
+| OSDomainName | YY              | Имя сетевого домена, связанное с текущим пользователем             |
+| MachineName  | SRV-SQL-1       | Имя NetBIOS данного компьютера                                     |
 
 * **GetEnvironmentVariables** - список переменных окружения с их значениями, которые доступны процессу SQL Server. Пример вывода:
 
-| Name                            | Value                                                                                                                                                                                                                                           |   |   |   |
-|---------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---|---|---|
-| COMPUTERNAME                    | SRV-SQL-1                                                                                                                                                                                                                                       |   |   |   |
-| POWERSHELL_DISTRIBUTION_CHANNEL | MSI:Windows Server 2019 Standard                                                                                                                                                                                                                |   |   |   |
-| PUBLIC                          | C:\Users\Public                                                                                                                                                                                                                                 |   |   |   |
-| LOCALAPPDATA                    | C:\Users\ypermitin.YY\AppData\Local                                                                                                                                                                                                             |   |   |   |
-| PSModulePath                    | %ProgramFiles%\WindowsPowerShell\Modules;C:\Windows\system32\WindowsPowerShell\v1.0\Modules;C:\Program Files (x86)\Microsoft SQL Server\150\Tools\PowerShell\Modules\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\PowerShell\Modules\ |   |   |   |
-| PROCESSOR_ARCHITECTURE          | AMD64                                                                                                                                                                                                                                           |   |   |   |
+| Name                            | Value                                                                                                                                                                                                                                           |
+|---------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| COMPUTERNAME                    | SRV-SQL-1                                                                                                                                                                                                                                       |
+| POWERSHELL_DISTRIBUTION_CHANNEL | MSI:Windows Server 2019 Standard                                                                                                                                                                                                                |
+| PUBLIC                          | C:\Users\Public                                                                                                                                                                                                                                 |
+| LOCALAPPDATA                    | C:\Users\ypermitin.YY\AppData\Local                                                                                                                                                                                                             |
+| PSModulePath                    | %ProgramFiles%\WindowsPowerShell\Modules;C:\Windows\system32\WindowsPowerShell\v1.0\Modules;C:\Program Files (x86)\Microsoft SQL Server\150\Tools\PowerShell\Modules\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\PowerShell\Modules\ |
+| PROCESSOR_ARCHITECTURE          | AMD64                                                                                                                                                                                                                                           |
 
 ## Окружение для разработки