Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migration #3

Merged
merged 5 commits into from
Apr 4, 2024
Merged

Migration #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b0bd33
Migrate app to NyaIO library
teplofizik Apr 4, 2024
bcd177a
Upgrade NyaFS and NyaLZO
teplofizik Apr 4, 2024
3ded70f
Updated nyafs (nuget dependencies)
teplofizik Apr 4, 2024
c853f6b
Migrate to nuget NyaFs
teplofizik Apr 4, 2024
825bf85
NyaFsTest migrated to nuget
teplofizik Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

Plugins/NyaFsIncmEncrypt

# User-specific files
*.rsuser
*.suo
Expand Down
9 changes: 0 additions & 9 deletions .gitmodules
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion NyaFs
Open in desktop
Submodule NyaFs deleted from 5a837a
2 changes: 1 addition & 1 deletion NyaFsTest/NyaFsTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\NyaFs\src\NyaFs\NyaFs.csproj" />
<PackageReference Include="NyaFs" Version="1.0.0" />
</ItemGroup>

</Project>
55 changes: 0 additions & 55 deletions NyaImageTool.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.7.34202.233
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaExtensions", "NyaFs\src\submodules\NyaExtensions\NyaExtensions.csproj", "{578CE3A5-682A-466E-982F-DF676D6C78FE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaFs", "NyaFs\src\NyaFs\NyaFs.csproj", "{17442459-436D-4B9E-8B4F-44D935B48A6E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaFsTest", "NyaFsTest\NyaFsTest.csproj", "{1BA6938F-9B3A-4ADA-8AE6-E3CD8C7BA912}"
ProjectSection(ProjectDependencies) = postProject
{17442459-436D-4B9E-8B4F-44D935B48A6E} = {17442459-436D-4B9E-8B4F-44D935B48A6E}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaImageTool", "NyaImageTool\NyaImageTool.csproj", "{62010B34-B500-4655-8972-5A0360D3123F}"
ProjectSection(ProjectDependencies) = postProject
{4B64DF0F-CD57-4A68-BEB9-676EA490578A} = {4B64DF0F-CD57-4A68-BEB9-676EA490578A}
{17442459-436D-4B9E-8B4F-44D935B48A6E} = {17442459-436D-4B9E-8B4F-44D935B48A6E}
{2FFD947D-8EF4-417A-BE85-CDD8A456BDFD} = {2FFD947D-8EF4-417A-BE85-CDD8A456BDFD}
{A88BD9AE-046F-4E84-B066-35CB6CFAC504} = {A88BD9AE-046F-4E84-B066-35CB6CFAC504}
{433FCFC8-B750-4057-8B34-BFF8E598AABF} = {433FCFC8-B750-4057-8B34-BFF8E598AABF}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaLZO", "NyaFs\src\submodules\NyaLZO\NyaLZO.csproj", "{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{7DE93B12-1E74-4204-A550-DDC4F3550AF9}"
ProjectSection(SolutionItems) = preProject
readme.md = readme.md
Expand All @@ -32,14 +22,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{D12DEDB5-FE5C-483B-9AF0-FC9E6C751BEC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaFsSftp", "Plugins\NyaFsSftp\NyaFsSftp.csproj", "{433FCFC8-B750-4057-8B34-BFF8E598AABF}"
ProjectSection(ProjectDependencies) = postProject
{17442459-436D-4B9E-8B4F-44D935B48A6E} = {17442459-436D-4B9E-8B4F-44D935B48A6E}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaFsFiles", "Plugins\NyaFsFiles\NyaFsFiles.csproj", "{A88BD9AE-046F-4E84-B066-35CB6CFAC504}"
ProjectSection(ProjectDependencies) = postProject
{17442459-436D-4B9E-8B4F-44D935B48A6E} = {17442459-436D-4B9E-8B4F-44D935B48A6E}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaFsLinux", "Plugins\NyaFsLinux\NyaFsLinux.csproj", "{4B64DF0F-CD57-4A68-BEB9-676EA490578A}"
EndProject
Expand All @@ -51,9 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflow", "Workflow", "{D8
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaFsEncrypt", "Plugins\NyaFsEncrypt\NyaFsEncrypt.csproj", "{C0B57D62-F526-4433-BEAC-2D4772111DA9}"
ProjectSection(ProjectDependencies) = postProject
{17442459-436D-4B9E-8B4F-44D935B48A6E} = {17442459-436D-4B9E-8B4F-44D935B48A6E}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -65,30 +46,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{578CE3A5-682A-466E-982F-DF676D6C78FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{578CE3A5-682A-466E-982F-DF676D6C78FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{578CE3A5-682A-466E-982F-DF676D6C78FE}.Debug|x64.ActiveCfg = Debug|Any CPU
{578CE3A5-682A-466E-982F-DF676D6C78FE}.Debug|x64.Build.0 = Debug|Any CPU
{578CE3A5-682A-466E-982F-DF676D6C78FE}.Debug|x86.ActiveCfg = Debug|Any CPU
{578CE3A5-682A-466E-982F-DF676D6C78FE}.Debug|x86.Build.0 = Debug|Any CPU
{578CE3A5-682A-466E-982F-DF676D6C78FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{578CE3A5-682A-466E-982F-DF676D6C78FE}.Release|Any CPU.Build.0 = Release|Any CPU
{578CE3A5-682A-466E-982F-DF676D6C78FE}.Release|x64.ActiveCfg = Release|Any CPU
{578CE3A5-682A-466E-982F-DF676D6C78FE}.Release|x64.Build.0 = Release|Any CPU
{578CE3A5-682A-466E-982F-DF676D6C78FE}.Release|x86.ActiveCfg = Release|Any CPU
{578CE3A5-682A-466E-982F-DF676D6C78FE}.Release|x86.Build.0 = Release|Any CPU
{17442459-436D-4B9E-8B4F-44D935B48A6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17442459-436D-4B9E-8B4F-44D935B48A6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17442459-436D-4B9E-8B4F-44D935B48A6E}.Debug|x64.ActiveCfg = Debug|Any CPU
{17442459-436D-4B9E-8B4F-44D935B48A6E}.Debug|x64.Build.0 = Debug|Any CPU
{17442459-436D-4B9E-8B4F-44D935B48A6E}.Debug|x86.ActiveCfg = Debug|Any CPU
{17442459-436D-4B9E-8B4F-44D935B48A6E}.Debug|x86.Build.0 = Debug|Any CPU
{17442459-436D-4B9E-8B4F-44D935B48A6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17442459-436D-4B9E-8B4F-44D935B48A6E}.Release|Any CPU.Build.0 = Release|Any CPU
{17442459-436D-4B9E-8B4F-44D935B48A6E}.Release|x64.ActiveCfg = Release|Any CPU
{17442459-436D-4B9E-8B4F-44D935B48A6E}.Release|x64.Build.0 = Release|Any CPU
{17442459-436D-4B9E-8B4F-44D935B48A6E}.Release|x86.ActiveCfg = Release|Any CPU
{17442459-436D-4B9E-8B4F-44D935B48A6E}.Release|x86.Build.0 = Release|Any CPU
{1BA6938F-9B3A-4ADA-8AE6-E3CD8C7BA912}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1BA6938F-9B3A-4ADA-8AE6-E3CD8C7BA912}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1BA6938F-9B3A-4ADA-8AE6-E3CD8C7BA912}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -113,18 +70,6 @@ Global
{62010B34-B500-4655-8972-5A0360D3123F}.Release|x64.Build.0 = Release|Any CPU
{62010B34-B500-4655-8972-5A0360D3123F}.Release|x86.ActiveCfg = Release|Any CPU
{62010B34-B500-4655-8972-5A0360D3123F}.Release|x86.Build.0 = Release|Any CPU
{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}.Debug|x64.ActiveCfg = Debug|Any CPU
{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}.Debug|x64.Build.0 = Debug|Any CPU
{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}.Debug|x86.ActiveCfg = Debug|Any CPU
{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}.Debug|x86.Build.0 = Debug|Any CPU
{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}.Release|Any CPU.Build.0 = Release|Any CPU
{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}.Release|x64.ActiveCfg = Release|Any CPU
{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}.Release|x64.Build.0 = Release|Any CPU
{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}.Release|x86.ActiveCfg = Release|Any CPU
{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}.Release|x86.Build.0 = Release|Any CPU
{433FCFC8-B750-4057-8B34-BFF8E598AABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{433FCFC8-B750-4057-8B34-BFF8E598AABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{433FCFC8-B750-4057-8B34-BFF8E598AABF}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion NyaImageTool/NyaImageTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\NyaFs\src\NyaFs\NyaFs.csproj" />
<PackageReference Include="NyaFs" Version="1.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Plugins/NyaFsEncrypt/NyaFsEncrypt.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</Target>

<ItemGroup>
<ProjectReference Include="..\..\NyaFs\src\NyaFs\NyaFs.csproj" />
<PackageReference Include="NyaFs" Version="1.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Plugins/NyaFsFiles/NyaFsFiles.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</Target>

<ItemGroup>
<ProjectReference Include="..\..\NyaFs\src\NyaFs\NyaFs.csproj" />
<PackageReference Include="NyaFs" Version="1.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Plugins/NyaFsLinux/NyaFsLinux.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</Target>

<ItemGroup>
<ProjectReference Include="..\..\NyaFs\src\NyaFs\NyaFs.csproj" />
<PackageReference Include="NyaFs" Version="1.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Plugins/NyaFsSftp/FreeSFtpSharp/SftpSubsystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using NyaExtensions.Array;
using FxSsh;
using FxSsh;
using FxSsh.Messages.Connection;
using FxSsh.Services;
using System;
Expand All @@ -11,6 +10,7 @@
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using NyaIO.Data;

namespace FreeSFtpSharp
{
Expand Down
2 changes: 1 addition & 1 deletion Plugins/NyaFsSftp/NyaFsSftp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</Target>

<ItemGroup>
<ProjectReference Include="..\..\NyaFs\src\NyaFs\NyaFs.csproj" />
<PackageReference Include="NyaFs" Version="1.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Plugins/NyaFsSftp/Ssh/NyaSshService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using NyaExtensions.Array;
using FreeSFtpSharp;
using FreeSFtpSharp;
using FxSsh;
using FxSsh.Services;
using NyaFs.Filesystem.Universal.Types;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Text;
using NyaIO.Data;

namespace NyaFsSftp.Ssh
{
Expand Down
5 changes: 1 addition & 4 deletions Plugins/NyaFsTftp/NyaFsTftp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NyaFs" Version="1.0.0" />
<PackageReference Include="Tftp.Net" Version="1.3.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\NyaFs\src\NyaFs\NyaFs.csproj" />
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Copy SourceFiles="$(OutDir)\$(TargetName).dll;$(OutDir)\$(TargetName).pdb;$(OutDir)\Tftp.Net.dll" DestinationFolder="$(SolutionDir)\NyaImageTool\bin\Debug\netcoreapp3.1\plugins\" SkipUnchangedFiles="true" />
</Target>
Expand Down
Loading