Skip to content

Commit a1979de

Browse files
vchelaruvchelaru
committed
Updated ssh library to address crash on build server uploader
1 parent 12f0171 commit a1979de

File tree

5 files changed

+72
-12
lines changed

5 files changed

+72
-12
lines changed

‎Engines/Forms/FlatRedBall.Forms/FlatRedBall.Forms All Platforms.sln‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaInGum", "..\..\..\..\Gu
2323
EndProject
2424
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "FlatRedBallShared", "..\..\FlatRedBallXNA\FlatRedBall\FlatRedBallShared.shproj", "{0BB8CBE3-8503-46C1-9272-D98E153A230E}"
2525
EndProject
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlatRedBall.Forms.FNA", "FlatRedBall.Forms.FNA\FlatRedBall.Forms.FNA.csproj", "{4F719824-95F7-4864-97CA-0DC91A795BA4}"
27+
EndProject
2628
Global
2729
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2830
Debug|Any CPU = Debug|Any CPU
@@ -115,6 +117,22 @@ Global
115117
{7AE61851-BDC2-4B77-B159-BFF52550C423}.ReleaseAutoBuild|Any CPU.Build.0 = Release|Any CPU
116118
{7AE61851-BDC2-4B77-B159-BFF52550C423}.ReleaseAutoBuild|x86.ActiveCfg = Release|Any CPU
117119
{7AE61851-BDC2-4B77-B159-BFF52550C423}.ReleaseAutoBuild|x86.Build.0 = Release|Any CPU
120+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
122+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.Debug|x86.ActiveCfg = Debug|Any CPU
123+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.Debug|x86.Build.0 = Debug|Any CPU
124+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.DebugAutoBuild|Any CPU.ActiveCfg = Debug|Any CPU
125+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.DebugAutoBuild|Any CPU.Build.0 = Debug|Any CPU
126+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.DebugAutoBuild|x86.ActiveCfg = Debug|Any CPU
127+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.DebugAutoBuild|x86.Build.0 = Debug|Any CPU
128+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
129+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.Release|Any CPU.Build.0 = Release|Any CPU
130+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.Release|x86.ActiveCfg = Release|Any CPU
131+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.Release|x86.Build.0 = Release|Any CPU
132+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.ReleaseAutoBuild|Any CPU.ActiveCfg = Release|Any CPU
133+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.ReleaseAutoBuild|Any CPU.Build.0 = Release|Any CPU
134+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.ReleaseAutoBuild|x86.ActiveCfg = Release|Any CPU
135+
{4F719824-95F7-4864-97CA-0DC91A795BA4}.ReleaseAutoBuild|x86.Build.0 = Release|Any CPU
118136
EndGlobalSection
119137
GlobalSection(SolutionProperties) = preSolution
120138
HideSolutionNode = FALSE
@@ -129,6 +147,7 @@ Global
129147
..\..\..\FRBDK\Glue\GumPlugin\GumPlugin\GumCoreShared.FlatRedBall.projitems*{30c8fdca-92b4-4998-a692-ab72f46e3943}*SharedItemsImports = 5
130148
..\..\..\..\Gum\GumCoreShared.projitems*{30c8fdca-92b4-4998-a692-ab72f46e3943}*SharedItemsImports = 5
131149
FlatRedBall.Forms.Shared\FlatRedBall.Forms.Shared.projitems*{346e0cc5-d25f-4e9f-970f-678f4d019c9f}*SharedItemsImports = 5
150+
FlatRedBall.Forms.Shared\FlatRedBall.Forms.Shared.projitems*{4f719824-95f7-4864-97ca-0dc91a795ba4}*SharedItemsImports = 5
132151
FlatRedBall.Forms.Shared\FlatRedBall.Forms.Shared.projitems*{728151f0-03e0-4253-94fe-46b9c77edea6}*SharedItemsImports = 13
133152
..\..\..\FRBDK\Glue\StateInterpolationPlugin\StateInterpolationPlugin\StateInterpolationShared.projitems*{d00d287d-385b-42fb-bf5f-04401e7d37d0}*SharedItemsImports = 13
134153
..\..\..\FRBDK\Glue\StateInterpolationPlugin\StateInterpolationPlugin\StateInterpolationShared.projitems*{db8cd659-8187-494a-a94e-8adf16f3e7f7}*SharedItemsImports = 5

‎FRBDK/BuildServerUploader/BuildServerUploaderConsole/BuildServerUploaderConsole.csproj‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,28 +127,55 @@
127127
<Prefer32Bit>false</Prefer32Bit>
128128
</PropertyGroup>
129129
<ItemGroup>
130+
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
131+
<HintPath>..\packages\BouncyCastle.Cryptography.2.4.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
132+
</Reference>
130133
<Reference Include="Ionic.Zip, Version=1.7.2.26, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
131134
<SpecificVersion>False</SpecificVersion>
132135
<HintPath>Libraries\Ionic.Zip.dll</HintPath>
133136
</Reference>
137+
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
138+
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
139+
</Reference>
134140
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
135-
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
141+
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
136142
</Reference>
137-
<Reference Include="Renci.SshNet, Version=2014.4.6.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
138-
<SpecificVersion>False</SpecificVersion>
139-
<HintPath>Libraries\Renci.SshNet.dll</HintPath>
143+
<Reference Include="Renci.SshNet, Version=2024.2.0.1, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
144+
<HintPath>..\packages\SSH.NET.2024.2.0\lib\net462\Renci.SshNet.dll</HintPath>
140145
</Reference>
141146
<Reference Include="System" />
147+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
148+
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
149+
</Reference>
142150
<Reference Include="System.Core">
143151
<RequiredTargetFramework>3.5</RequiredTargetFramework>
144152
</Reference>
153+
<Reference Include="System.Formats.Asn1, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
154+
<HintPath>..\packages\System.Formats.Asn1.8.0.1\lib\net462\System.Formats.Asn1.dll</HintPath>
155+
</Reference>
145156
<Reference Include="System.IO.Compression.FileSystem" />
146157
<Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
147158
<HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
148159
<Private>True</Private>
149160
<Private>True</Private>
150161
</Reference>
162+
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
163+
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
164+
</Reference>
151165
<Reference Include="System.Net.Http" />
166+
<Reference Include="System.Numerics" />
167+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
168+
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
169+
</Reference>
170+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
171+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
172+
</Reference>
173+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
174+
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
175+
</Reference>
176+
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
177+
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
178+
</Reference>
152179
<Reference Include="System.Xml.Linq">
153180
<RequiredTargetFramework>3.5</RequiredTargetFramework>
154181
</Reference>

‎FRBDK/BuildServerUploader/BuildServerUploaderConsole/Program.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
using System.Linq;
55
using System.Threading.Tasks;
66
using BuildServerUploaderConsole.Processes;
7+
using BuildServerUploaderConsole.Sftp;
78
using FlatRedBall.IO;
9+
using Renci.SshNet;
810

911
namespace BuildServerUploaderConsole
1012
{
@@ -106,6 +108,7 @@ private static void CreateChangeFrbdkVersion()
106108

107109
private static void CreateZipAndUploadTemplates(string[] args)
108110
{
111+
109112
ProcessSteps.Add(new CopyBuiltEnginesToReleaseFolder(Results));
110113

111114
ProcessSteps.Add(new ZipTemplates(Results));
@@ -167,9 +170,10 @@ private static async Task ExecuteSteps()
167170
for (int i = 0; i < ProcessSteps.Count; i++)
168171
{
169172
int step1Based = i + 1;
170-
Results.WriteMessage($"Processing {step1Based}/{ProcessSteps.Count} : {ProcessSteps[i].Message}");
171-
ProcessSteps[i].ExecuteStep();
172-
await ProcessSteps[i].ExecuteStepAsync();
173+
var step = ProcessSteps[i];
174+
Results.WriteMessage($"Processing {step1Based}/{ProcessSteps.Count} : {step.Message}");
175+
step.ExecuteStep();
176+
await step.ExecuteStepAsync();
173177
}
174178
}
175179

‎FRBDK/BuildServerUploader/BuildServerUploaderConsole/Sftp/SftpManager.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
using Renci.SshNet;
2-
using Renci.SshNet.Sftp;
3-
using System;
1+
using System;
42
using System.Collections.Generic;
53
using System.IO;
64
using System.Linq;
75
using System.Net;
86
using System.Text;
7+
using Renci.SshNet;
8+
using Renci.SshNet.Sftp;
99

1010
namespace BuildServerUploaderConsole.Sftp
1111
{
1212
static class SftpManager
1313
{
14-
public static IEnumerable<SftpFile> GetList(string host, string folder, string userName, string password)
14+
public static IEnumerable<ISftpFile> GetList(string host, string folder, string userName, string password)
1515
{
1616

1717
using (var sftp = new SftpClient(host, userName, password))

‎FRBDK/BuildServerUploader/BuildServerUploaderConsole/packages.config‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net471" />
3+
<package id="BouncyCastle.Cryptography" version="2.4.0" targetFramework="net471" />
4+
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net471" />
5+
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net471" />
6+
<package id="SSH.NET" version="2024.2.0" targetFramework="net471" />
7+
<package id="System.Buffers" version="4.5.1" targetFramework="net471" />
8+
<package id="System.Formats.Asn1" version="8.0.1" targetFramework="net471" />
49
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net471" />
10+
<package id="System.Memory" version="4.5.5" targetFramework="net471" />
11+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net471" />
12+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net471" />
13+
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net471" />
14+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />
515
</packages>

0 commit comments

Comments
 (0)