Skip to content

Commit 265fc10

Browse files
committed
Removed VS2012 solution file, added Sylwester Zaluga's object disposed exception fix in FtpDataStream and fixed the codeplex release build script so that it includes the Extensions source.
1 parent 3687445 commit 265fc10

4 files changed

Lines changed: 26 additions & 85 deletions

File tree

FtpClient.VS2012.sln

Lines changed: 0 additions & 69 deletions
This file was deleted.

FtpClient.sln

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Studio 2010
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.30110.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.FtpClient", "System.Net.FtpClient\System.Net.FtpClient.csproj", "{E963B766-56BF-4966-8917-88C1EE69D61A}"
57
EndProject
68
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Examples", "Examples\Examples.csproj", "{49B11591-C942-479F-A864-AB2738E50EF0}"
@@ -15,26 +17,27 @@ Global
1517
Release|Any CPU = Release|Any CPU
1618
EndGlobalSection
1719
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20+
{E963B766-56BF-4966-8917-88C1EE69D61A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{E963B766-56BF-4966-8917-88C1EE69D61A}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{E963B766-56BF-4966-8917-88C1EE69D61A}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{E963B766-56BF-4966-8917-88C1EE69D61A}.Release|Any CPU.Build.0 = Release|Any CPU
24+
{49B11591-C942-479F-A864-AB2738E50EF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25+
{49B11591-C942-479F-A864-AB2738E50EF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
26+
{49B11591-C942-479F-A864-AB2738E50EF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
27+
{49B11591-C942-479F-A864-AB2738E50EF0}.Release|Any CPU.Build.0 = Release|Any CPU
1828
{28AA032E-CACF-4C07-BF12-C4FBE71BC8BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1929
{28AA032E-CACF-4C07-BF12-C4FBE71BC8BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
20-
{28AA032E-CACF-4C07-BF12-C4FBE71BC8BD}.Release|Any CPU.ActiveCfg = Release|x86
30+
{28AA032E-CACF-4C07-BF12-C4FBE71BC8BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{28AA032E-CACF-4C07-BF12-C4FBE71BC8BD}.Release|Any CPU.Build.0 = Release|Any CPU
2132
{2E4F2A25-7133-455A-AC1D-FBE3E56CA1A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2233
{2E4F2A25-7133-455A-AC1D-FBE3E56CA1A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
2334
{2E4F2A25-7133-455A-AC1D-FBE3E56CA1A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
2435
{2E4F2A25-7133-455A-AC1D-FBE3E56CA1A1}.Release|Any CPU.Build.0 = Release|Any CPU
25-
{49B11591-C942-479F-A864-AB2738E50EF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{49B11591-C942-479F-A864-AB2738E50EF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{49B11591-C942-479F-A864-AB2738E50EF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{49B11591-C942-479F-A864-AB2738E50EF0}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{E963B766-56BF-4966-8917-88C1EE69D61A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{E963B766-56BF-4966-8917-88C1EE69D61A}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{E963B766-56BF-4966-8917-88C1EE69D61A}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{E963B766-56BF-4966-8917-88C1EE69D61A}.Release|Any CPU.Build.0 = Release|Any CPU
33-
EndGlobalSection
34-
GlobalSection(MonoDevelopProperties) = preSolution
35-
StartupItem = Tests\Tests.csproj
3636
EndGlobalSection
3737
GlobalSection(SolutionProperties) = preSolution
3838
HideSolutionNode = FALSE
3939
EndGlobalSection
40+
GlobalSection(MonoDevelopProperties) = preSolution
41+
StartupItem = Tests\Tests.csproj
42+
EndGlobalSection
4043
EndGlobal

System.Net.FtpClient/FtpDataStream.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,12 @@ public FtpDataStream(FtpClient conn) {
157157
/// Finalizer
158158
/// </summary>
159159
~FtpDataStream() {
160-
Dispose();
160+
try {
161+
Dispose();
162+
}
163+
catch (Exception ex) {
164+
FtpTrace.WriteLine("[Finalizer] Caught and discarded an exception while disposing the FtpDataStream: {0}", ex.ToString());
165+
}
161166
}
162167
}
163168
}

create_codeplex_release.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ if exist "%archive%" del /q "%archive%"
1414
md "%release%"
1515
md "%release%\bin"
1616
md "%release%\source"
17+
md "%release%\source\Extensions"
1718
md "%release%\examples"
1819
md "%release%\help"
1920

@@ -24,6 +25,7 @@ rd /q /s System.Net.FtpClient\bin
2425

2526
xcopy /s "System.Net.FtpClient\bin" "%release%\bin\"
2627
xcopy "System.Net.FtpClient\*.cs" "%release%\source\"
28+
xcopy "System.Net.FtpClient\Extensions\*.cs" "%release%\source\Extensions\"
2729
xcopy "System.Net.FtpClient\*.csproj" "%release%\source\"
2830
xcopy "Examples\*.cs" "%release%\examples\"
2931
xcopy "Examples\*.csproj" "%release%\examples\"
@@ -33,7 +35,7 @@ xcopy /s "Sandcastle\HTML\*" "%release%\help\html\"
3335
xcopy "LICENSE.TXT" "%release%\"
3436

3537
cd "%release%"
36-
7za.exe a -tzip "..\%archive%" *
38+
"C:\Program Files\7-Zip\7z.exe" a -tzip "..\%archive%" *
3739
cd ..
3840
rd /s /q "%release%"
3941

0 commit comments

Comments
 (0)