Merge pull request #21 from dmpas/develop

Feature/fix 17 (#20)
dmpas · Feb 6, 2019 · fb80e2d · fb80e2d
2 parents 11e81fd + e3f2aaf
commit fb80e2d
Show file tree

Hide file tree

Showing 26 changed files with 36 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/MailComponent.sln b/MailComponent.sln
diff --git a/MailComponent/Mail/IMailReceiver.cs b/MailComponent/Mail/IMailReceiver.cs
diff --git a/MailComponent/Mail/IMailSender.cs b/MailComponent/Mail/IMailSender.cs
diff --git a/MailComponent/Mail/ImapReceiver.cs b/MailComponent/Mail/ImapReceiver.cs
diff --git a/MailComponent/Mail/ImapSearchFilter.cs b/MailComponent/Mail/ImapSearchFilter.cs
diff --git a/MailComponent/Mail/NotSupportedInSelectedProtocol.cs b/MailComponent/Mail/NotSupportedInSelectedProtocol.cs
diff --git a/MailComponent/Mail/Pop3Receiver.cs b/MailComponent/Mail/Pop3Receiver.cs
diff --git a/MailComponent/Mail/SmtpSender.cs b/MailComponent/Mail/SmtpSender.cs
diff --git a/MailComponent/MailComponent.csproj b/MailComponent/MailComponent.csproj
@@ -33,11 +33,13 @@
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="ScriptEngine, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\OneScript.1.0.19\lib\net452\ScriptEngine.dll</HintPath>
+    <Reference Include="ScriptEngine, Version=1.0.20.107, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\OneScript.1.0.20\lib\net452\ScriptEngine.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="ScriptEngine.HostedScript, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\OneScript.StandardLibrary.1.0.19\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
+    <Reference Include="ScriptEngine.HostedScript, Version=1.0.20.107, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\OneScript.StandardLibrary.1.0.20\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="DotNetZip">

diff --git a/MailComponent/Properties/AssemblyInfo.cs b/MailComponent/Properties/AssemblyInfo.cs
diff --git a/MailComponent/packages.config b/MailComponent/packages.config
@@ -5,6 +5,6 @@
   <package id="MailKit" version="1.10.1" targetFramework="net45" />
   <package id="MimeKit" version="1.10.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
-  <package id="OneScript" version="1.0.19" targetFramework="net452" />
-  <package id="OneScript.StandardLibrary" version="1.0.19" targetFramework="net452" />
+  <package id="OneScript" version="1.0.20" targetFramework="net452" />
+  <package id="OneScript.StandardLibrary" version="1.0.20" targetFramework="net452" />
 </packages>
diff --git a/NUnitTests/EngineHelpWrapper.cs b/NUnitTests/EngineHelpWrapper.cs
diff --git a/NUnitTests/MainTestClass.cs b/NUnitTests/MainTestClass.cs
diff --git a/NUnitTests/NUnitTests.csproj b/NUnitTests/NUnitTests.csproj
@@ -28,11 +28,13 @@
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="ScriptEngine, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\OneScript.1.0.19\lib\net452\ScriptEngine.dll</HintPath>
+    <Reference Include="ScriptEngine, Version=1.0.20.107, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\OneScript.1.0.20\lib\net452\ScriptEngine.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="ScriptEngine.HostedScript, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\OneScript.StandardLibrary.1.0.19\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
+    <Reference Include="ScriptEngine.HostedScript, Version=1.0.20.107, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\OneScript.StandardLibrary.1.0.20\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="nunit.framework">

diff --git a/NUnitTests/Tests/external.os b/NUnitTests/Tests/external.os
diff --git a/NUnitTests/Tests/testrunner.os b/NUnitTests/Tests/testrunner.os
diff --git a/NUnitTests/packages.config b/NUnitTests/packages.config
@@ -3,6 +3,6 @@
   <package id="DotNetZip" version="1.10.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
   <package id="NUnit" version="3.4.1" targetFramework="net45" />
-  <package id="OneScript" version="1.0.19" targetFramework="net452" />
-  <package id="OneScript.StandardLibrary" version="1.0.19" targetFramework="net452" />
+  <package id="OneScript" version="1.0.20" targetFramework="net452" />
+  <package id="OneScript.StandardLibrary" version="1.0.20" targetFramework="net452" />
 </packages>
diff --git a/README.md b/README.md
diff --git a/TestApp/Program.cs b/TestApp/Program.cs
diff --git a/TestApp/Properties/AssemblyInfo.cs b/TestApp/Properties/AssemblyInfo.cs
diff --git a/TestApp/TestApp.csproj b/TestApp/TestApp.csproj
@@ -30,11 +30,13 @@
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="ScriptEngine, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\OneScript.1.0.19\lib\net452\ScriptEngine.dll</HintPath>
+    <Reference Include="ScriptEngine, Version=1.0.20.107, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\OneScript.1.0.20\lib\net452\ScriptEngine.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="ScriptEngine.HostedScript, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\OneScript.StandardLibrary.1.0.19\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
+    <Reference Include="ScriptEngine.HostedScript, Version=1.0.20.107, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\OneScript.StandardLibrary.1.0.20\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="DotNetZip">

diff --git a/TestApp/TestSendReceive.os b/TestApp/TestSendReceive.os
diff --git a/TestApp/packages.config b/TestApp/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="DotNetZip" version="1.10.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
-  <package id="OneScript" version="1.0.19" targetFramework="net452" />
-  <package id="OneScript.StandardLibrary" version="1.0.19" targetFramework="net452" />
+  <package id="OneScript" version="1.0.20" targetFramework="net452" />
+  <package id="OneScript.StandardLibrary" version="1.0.20" targetFramework="net452" />
 </packages>
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,15 +1,15 @@
-version: 1.0.5-{build}
+version: 1.0.6-{build}
 image: Visual Studio 2017
 environment:
   main_project: MailComponent
-before_build:
-- ps: nuget restore
 init:
 - ps: Set-WinSystemLocale ru-RU
 - ps: Start-Sleep -s 5
 - ps: Restart-Computer
 install:
 - cmd: >-
+    cd ..
+    
     mkdir engine
 
     cd engine
@@ -30,6 +30,12 @@ install:
 
     opm install opm
 
+    cd %APPVEYOR_BUILD_FOLDER%
+
+before_build:
+- cmd: >-
+    nuget restore
+
 build:
   verbosity: minimal
 configuration: Release
@@ -40,7 +46,7 @@ after_build:
 - cmd: >-
     mkdir bin
 
-    OneScriptDocumenter.exe json bin\syntaxHelp.json %main_project%\bin\%CONFIGURATION%\%main_project%.dll
+    ..\OneScriptDocumenter.exe json bin\syntaxHelp.json %main_project%\bin\%CONFIGURATION%\%main_project%.dll
     
     del %main_project%\bin\%CONFIGURATION%\*.pdb
 

diff --git a/packagedef b/packagedef
@@ -4,11 +4,11 @@
 //
 
 	Описание.Имя("InternetMail")
-			.Версия("1.0.5")
+			.Версия("1.0.6")
 			.Автор("Батанов Сергей")
 			.АдресАвтора("[email protected]")
 			.Описание("Реализация стандартных объектов из раздела ИнтернетПочта")
-			.ВерсияСреды("1.0.19")
+			.ВерсияСреды("1.0.20")
 			.ВключитьФайл("bin")
 			.ВключитьФайл("README.md")
 			.ВключитьФайл("package-loader.os")