Skip to content

Commit

Permalink
refactor: Переименован компонент;
Browse files Browse the repository at this point in the history
Изменены GUID;
Изменен номер версии.
  • Loading branch information
arkuznetsov committed May 25, 2022
1 parent ab5bec6 commit 54357a3
Show file tree
Hide file tree
Showing 16 changed files with 49 additions and 49 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ jobs:
dotnet restore ./src
dotnet msbuild ./src -property:Configuration=Release
mkdir ./build/bin/
cp -f ./src/oscript-component/bin/Release/net452/*.dll ./build/bin/
cp -f ./src/oscript-component/bin/Release/net452/*.xml ./build/bin/
cp -f ./src/oscript-ssh/bin/Release/net452/*.dll ./build/bin/
cp -f ./src/oscript-ssh/bin/Release/net452/*.xml ./build/bin/
rm -f ./build/bin/OneScript*.* ./build/bin/ScriptEngine*.* ./build/bin/NewtonSoft*.* ./build/bin/DotNetZip*.*
# Генерация документации
- name: Генерация документации
run: |
chmod +x ./build/OneScriptDocumenter/OneScriptDocumenter.exe
./build/OneScriptDocumenter/OneScriptDocumenter.exe json ./build/bin/syntaxHelp.json ./src/oscript-component/bin/Release/net452/oscript-component.dll
./build/OneScriptDocumenter/OneScriptDocumenter.exe json ./build/bin/syntaxHelp.json ./src/oscript-ssh/bin/Release/net452/oscript-ssh.dll
# Сборка пакета OneScript
- name: Сборка пакета
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
\.vscode/
src/NUnitTests/bin/
src/NUnitTests/obj/
src/oscript-component/bin/
src/oscript-component/obj/
src/oscript-ssh/bin/
src/oscript-ssh/obj/
src/TestApp/bin/
src/TestApp/obj/
test/
Expand Down
6 changes: 3 additions & 3 deletions build/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ echo %~dp0

@rd /S /Q "%~dp0bin"
@mkdir "%~dp0bin"
@xcopy %~dp0..\src\oscript-component\bin\Release\net452\*.dll %~dp0bin\
@xcopy %~dp0..\src\oscript-component\bin\Release\net452\*.xml %~dp0bin\
@xcopy %~dp0..\src\oscript-ssh\bin\Release\net452\*.dll %~dp0bin\
@xcopy %~dp0..\src\oscript-ssh\bin\Release\net452\*.xml %~dp0bin\
@del /F /Q "%~dp0bin\OneScript*.*" "%~dp0bin\ScriptEngine*.*" "%~dp0bin\NewtonSoft*.*" "%~dp0bin\DotNetZip*.*"

@"C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe" curl -o "%~dp0OneScriptDocumenter.zip" https://github.com/dmpas/OneScriptDocumenter/releases/download/1.0.14/documenter.zip
@"C:\Program Files\7-Zip\7z.exe" x -o%~dp0OneScriptDocumenter -y %~dp0OneScriptDocumenter.zip
@del /F /Q "%~dp0OneScriptDocumenter*.*"

@%~dp0OneScriptDocumenter\OneScriptDocumenter.exe json %~dp0bin\syntaxHelp.json %~dp0..\src\oscript-component\bin\Release\net452\oscript-component.dll
@%~dp0OneScriptDocumenter\OneScriptDocumenter.exe json %~dp0bin\syntaxHelp.json %~dp0..\src\oscript-ssh\bin\Release\net452\oscript-ssh.dll

@rd /S /Q "%~dp0OneScriptDocumenter"

Expand Down
2 changes: 1 addition & 1 deletion build/package-loader.os
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
СтандартнаяОбработка = Ложь;
Отказ = Ложь;

ПодключитьВнешнююКомпоненту(ОбъединитьПути(КаталогБиблиотеки, "bin", "oscript-component.dll"));
ПодключитьВнешнююКомпоненту(ОбъединитьПути(КаталогБиблиотеки, "bin", "oscript-ssh.dll"));

КонецПроцедуры

2 changes: 1 addition & 1 deletion build/packagedef
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Описание
.Имя("ClientSSH")
.Версия("0.5.0")
.Версия("0.5.1")
.Автор("a.sosnoviy aka lab; Artem Kuznetsov")
.АдресАвтора("int-it@yandex.ru; ArKuznetsov@gmail.com")
.Описание("ssh client для oscript")
Expand Down
6 changes: 3 additions & 3 deletions src/NUnitTests/NUnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<Platforms>AnyCPU</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\oscript-component\oscript-component.csproj">
<Project>{EA173D06-CCD2-45D5-A263-DC866289517A}</Project>
<Name>oscript-component</Name>
<ProjectReference Include="..\oscript-ssh\oscript-ssh.csproj">
<Project>{D0415022-7655-4764-BFD8-D5E0616C2BB2}</Project>
<Name>oscript-ssh</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/NUnitTests/Tests/external.os
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
ПутьККлючу = ОбъединитьПути(ТекущийСценарий().Каталог, "tools", "openssh", "files");
ПутьККлючу = ОбъединитьПути(ПутьККлючу, "sftp-key");

ПутьККомпоненте = ОбъединитьПути(ТекущийСценарий().Каталог, "src", "oscript-component", "bin");
ПутьККомпоненте = ОбъединитьПути(ПутьККомпоненте, "Debug", "net452", "oscript-component.dll");
ПутьККомпоненте = ОбъединитьПути(ТекущийСценарий().Каталог, "src", "oscript-ssh", "bin");
ПутьККомпоненте = ОбъединитьПути(ПутьККомпоненте, "Debug", "net452", "oscript-ssh.dll");

Попытка
ПодключитьВнешнююКомпоненту(ПутьККомпоненте);
Expand Down
6 changes: 3 additions & 3 deletions src/TestApp/TestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\oscript-component\oscript-component.csproj">
<Project>{EA173D06-CCD2-45D5-A263-DC866289517A}</Project>
<Name>oscript-component</Name>
<ProjectReference Include="..\oscript-ssh\oscript-ssh.csproj">
<Project>{D0415022-7655-4764-BFD8-D5E0616C2BB2}</Project>
<Name>oscript-ssh</Name>
</ProjectReference>
</ItemGroup>
</Project>
29 changes: 0 additions & 29 deletions src/oscript-component.sln

This file was deleted.

29 changes: 29 additions & 0 deletions src/oscript-ssh.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{DFE334BF-3243-4939-BD9E-045170645703}") = "oscript-ssh", "oscript-ssh\oscript-ssh.csproj", "{D0415022-7655-4764-BFD8-D5E0616C2BB2}"
EndProject
Project("{DFE334BF-3243-4939-BD9E-045170645703}") = "TestApp", "TestApp\TestApp.csproj", "{4EA8C040-413C-4289-9C75-FF1306DD0560}"
EndProject
Project("{DFE334BF-3243-4939-BD9E-045170645703}") = "NUnitTests", "NUnitTests\NUnitTests.csproj", "{105A994F-2E45-4698-9CDD-8C0C16B8CFA5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D0415022-7655-4764-BFD8-D5E0616C2BB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0415022-7655-4764-BFD8-D5E0616C2BB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0415022-7655-4764-BFD8-D5E0616C2BB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D0415022-7655-4764-BFD8-D5E0616C2BB2}.Release|Any CPU.Build.0 = Release|Any CPU
{4EA8C040-413C-4289-9C75-FF1306DD0560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4EA8C040-413C-4289-9C75-FF1306DD0560}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EA8C040-413C-4289-9C75-FF1306DD0560}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4EA8C040-413C-4289-9C75-FF1306DD0560}.Release|Any CPU.Build.0 = Release|Any CPU
{105A994F-2E45-4698-9CDD-8C0C16B8CFA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{105A994F-2E45-4698-9CDD-8C0C16B8CFA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{105A994F-2E45-4698-9CDD-8C0C16B8CFA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{105A994F-2E45-4698-9CDD-8C0C16B8CFA5}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<Platforms>AnyCPU</Platforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net452|AnyCPU'">
<DocumentationFile>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(TargetFramework)\oscript-component.xml</DocumentationFile>
<DocumentationFile>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(TargetFramework)\oscript-ssh.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net452|AnyCPU'">
<DocumentationFile>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(TargetFramework)\oscript-component.xml</DocumentationFile>
<DocumentationFile>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(TargetFramework)\oscript-ssh.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CoreTechs.Sftp.Client">
Expand Down

0 comments on commit 54357a3

Please sign in to comment.