Skip to content

Commit fb80e2d

Browse files
dmpasdmpas
authored
Merge pull request #21 from dmpas/develop
Feature/fix 17 (#20)
2 parents 11e81fd + e3f2aaf commit fb80e2d

26 files changed

+36
-24
lines changed

‎.travis.yml

100755100644
File mode changed.

‎MailComponent.sln

100755100644
File mode changed.

‎MailComponent/Mail/IMailReceiver.cs

100755100644
File mode changed.

‎MailComponent/Mail/IMailSender.cs

100755100644
File mode changed.

‎MailComponent/Mail/ImapReceiver.cs

100755100644
File mode changed.

‎MailComponent/Mail/ImapSearchFilter.cs

100755100644
File mode changed.

‎MailComponent/Mail/NotSupportedInSelectedProtocol.cs

100755100644
File mode changed.

‎MailComponent/Mail/Pop3Receiver.cs

100755100644
File mode changed.

‎MailComponent/Mail/SmtpSender.cs

100755100644
File mode changed.

‎MailComponent/MailComponent.csproj

+6-4
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@
3333
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
3434
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
3535
</Reference>
36-
<Reference Include="ScriptEngine, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
37-
<HintPath>..\packages\OneScript.1.0.19\lib\net452\ScriptEngine.dll</HintPath>
36+
<Reference Include="ScriptEngine, Version=1.0.20.107, Culture=neutral, PublicKeyToken=null">
37+
<HintPath>..\packages\OneScript.1.0.20\lib\net452\ScriptEngine.dll</HintPath>
38+
<Private>True</Private>
3839
</Reference>
39-
<Reference Include="ScriptEngine.HostedScript, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
40-
<HintPath>..\packages\OneScript.StandardLibrary.1.0.19\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
40+
<Reference Include="ScriptEngine.HostedScript, Version=1.0.20.107, Culture=neutral, PublicKeyToken=null">
41+
<HintPath>..\packages\OneScript.StandardLibrary.1.0.20\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
42+
<Private>True</Private>
4143
</Reference>
4244
<Reference Include="System" />
4345
<Reference Include="DotNetZip">

‎MailComponent/Properties/AssemblyInfo.cs

100755100644
File mode changed.

‎MailComponent/packages.config

100755100644
+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<package id="MailKit" version="1.10.1" targetFramework="net45" />
66
<package id="MimeKit" version="1.10.0" targetFramework="net45" />
77
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
8-
<package id="OneScript" version="1.0.19" targetFramework="net452" />
9-
<package id="OneScript.StandardLibrary" version="1.0.19" targetFramework="net452" />
8+
<package id="OneScript" version="1.0.20" targetFramework="net452" />
9+
<package id="OneScript.StandardLibrary" version="1.0.20" targetFramework="net452" />
1010
</packages>

‎NUnitTests/EngineHelpWrapper.cs

100755100644
File mode changed.

‎NUnitTests/MainTestClass.cs

100755100644
File mode changed.

‎NUnitTests/NUnitTests.csproj

100755100644
+6-4
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@
2828
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
2929
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
3030
</Reference>
31-
<Reference Include="ScriptEngine, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
32-
<HintPath>..\packages\OneScript.1.0.19\lib\net452\ScriptEngine.dll</HintPath>
31+
<Reference Include="ScriptEngine, Version=1.0.20.107, Culture=neutral, PublicKeyToken=null">
32+
<HintPath>..\packages\OneScript.1.0.20\lib\net452\ScriptEngine.dll</HintPath>
33+
<Private>True</Private>
3334
</Reference>
34-
<Reference Include="ScriptEngine.HostedScript, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
35-
<HintPath>..\packages\OneScript.StandardLibrary.1.0.19\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
35+
<Reference Include="ScriptEngine.HostedScript, Version=1.0.20.107, Culture=neutral, PublicKeyToken=null">
36+
<HintPath>..\packages\OneScript.StandardLibrary.1.0.20\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
37+
<Private>True</Private>
3638
</Reference>
3739
<Reference Include="System" />
3840
<Reference Include="nunit.framework">

‎NUnitTests/Tests/external.os

100755100644
File mode changed.

‎NUnitTests/Tests/testrunner.os

100755100644
File mode changed.

‎NUnitTests/packages.config

100755100644
+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<package id="DotNetZip" version="1.10.1" targetFramework="net45" />
44
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
55
<package id="NUnit" version="3.4.1" targetFramework="net45" />
6-
<package id="OneScript" version="1.0.19" targetFramework="net452" />
7-
<package id="OneScript.StandardLibrary" version="1.0.19" targetFramework="net452" />
6+
<package id="OneScript" version="1.0.20" targetFramework="net452" />
7+
<package id="OneScript.StandardLibrary" version="1.0.20" targetFramework="net452" />
88
</packages>

‎README.md

100755100644
File mode changed.

‎TestApp/Program.cs

100755100644
File mode changed.

‎TestApp/Properties/AssemblyInfo.cs

100755100644
File mode changed.

‎TestApp/TestApp.csproj

100755100644
+6-4
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@
3030
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
3131
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
3232
</Reference>
33-
<Reference Include="ScriptEngine, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
34-
<HintPath>..\packages\OneScript.1.0.19\lib\net452\ScriptEngine.dll</HintPath>
33+
<Reference Include="ScriptEngine, Version=1.0.20.107, Culture=neutral, PublicKeyToken=null">
34+
<HintPath>..\packages\OneScript.1.0.20\lib\net452\ScriptEngine.dll</HintPath>
35+
<Private>True</Private>
3536
</Reference>
36-
<Reference Include="ScriptEngine.HostedScript, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
37-
<HintPath>..\packages\OneScript.StandardLibrary.1.0.19\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
37+
<Reference Include="ScriptEngine.HostedScript, Version=1.0.20.107, Culture=neutral, PublicKeyToken=null">
38+
<HintPath>..\packages\OneScript.StandardLibrary.1.0.20\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
39+
<Private>True</Private>
3840
</Reference>
3941
<Reference Include="System" />
4042
<Reference Include="DotNetZip">

‎TestApp/TestSendReceive.os

100755100644
File mode changed.

‎TestApp/packages.config

100755100644
+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<packages>
33
<package id="DotNetZip" version="1.10.1" targetFramework="net45" />
44
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
5-
<package id="OneScript" version="1.0.19" targetFramework="net452" />
6-
<package id="OneScript.StandardLibrary" version="1.0.19" targetFramework="net452" />
5+
<package id="OneScript" version="1.0.20" targetFramework="net452" />
6+
<package id="OneScript.StandardLibrary" version="1.0.20" targetFramework="net452" />
77
</packages>

‎appveyor.yml

100755100644
+10-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
version: 1.0.5-{build}
1+
version: 1.0.6-{build}
22
image: Visual Studio 2017
33
environment:
44
main_project: MailComponent
5-
before_build:
6-
- ps: nuget restore
75
init:
86
- ps: Set-WinSystemLocale ru-RU
97
- ps: Start-Sleep -s 5
108
- ps: Restart-Computer
119
install:
1210
- cmd: >-
11+
cd ..
12+
1313
mkdir engine
1414
1515
cd engine
@@ -30,6 +30,12 @@ install:
3030
3131
opm install opm
3232
33+
cd %APPVEYOR_BUILD_FOLDER%
34+
35+
before_build:
36+
- cmd: >-
37+
nuget restore
38+
3339
build:
3440
verbosity: minimal
3541
configuration: Release
@@ -40,7 +46,7 @@ after_build:
4046
- cmd: >-
4147
mkdir bin
4248
43-
OneScriptDocumenter.exe json bin\syntaxHelp.json %main_project%\bin\%CONFIGURATION%\%main_project%.dll
49+
..\OneScriptDocumenter.exe json bin\syntaxHelp.json %main_project%\bin\%CONFIGURATION%\%main_project%.dll
4450
4551
del %main_project%\bin\%CONFIGURATION%\*.pdb
4652

‎packagedef

100755100644
+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
//
55

66
Описание.Имя("InternetMail")
7-
.Версия("1.0.5")
7+
.Версия("1.0.6")
88
.Автор("Батанов Сергей")
99
.АдресАвтора("[email protected]")
1010
.Описание("Реализация стандартных объектов из раздела ИнтернетПочта")
11-
.ВерсияСреды("1.0.19")
11+
.ВерсияСреды("1.0.20")
1212
.ВключитьФайл("bin")
1313
.ВключитьФайл("README.md")
1414
.ВключитьФайл("package-loader.os")

0 commit comments

Comments
 (0)