Перевод на официальный ОдноСкрипт 1.0.15.

dmpas · Dec 28, 2016 · 8e14c09 · 8e14c09
1 parent a886ae8
commit 8e14c09
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 19 deletions.
diff --git a/MailComponent/Mail/InternetMailAttachment.cs b/MailComponent/Mail/InternetMailAttachment.cs
@@ -7,7 +7,7 @@ This Source Code Form is subject to the terms of the
 using System;
 using ScriptEngine.Machine.Contexts;
 using ScriptEngine.Machine;
-using ScriptEngine.HostedScript.Library;
+using ScriptEngine.HostedScript.Library.Binary;
 
 namespace OneScript.InternetMail
 {

diff --git a/MailComponent/Mail/InternetMailAttachments.cs b/MailComponent/Mail/InternetMailAttachments.cs
@@ -9,7 +9,7 @@ This Source Code Form is subject to the terms of the
 using ScriptEngine.Machine;
 using System.Collections.Generic;
 using System.Collections;
-using ScriptEngine.HostedScript.Library;
+using ScriptEngine.HostedScript.Library.Binary;
 
 namespace OneScript.InternetMail
 {

diff --git a/MailComponent/Mail/InternetMailMessage.cs b/MailComponent/Mail/InternetMailMessage.cs
@@ -8,6 +8,7 @@ This Source Code Form is subject to the terms of the
 using ScriptEngine.Machine.Contexts;
 using ScriptEngine.Machine;
 using ScriptEngine.HostedScript.Library;
+using ScriptEngine.HostedScript.Library.Binary;
 using System.IO;
 using MimeKit;
 

diff --git a/MailComponent/Mail/InternetMailText.cs b/MailComponent/Mail/InternetMailText.cs
@@ -6,7 +6,7 @@ This Source Code Form is subject to the terms of the
 ----------------------------------------------------------*/
 using System;
 using ScriptEngine.Machine.Contexts;
-using ScriptEngine.HostedScript.Library;
+using ScriptEngine.HostedScript.Library.Binary;
 using MimeKit;
 
 namespace OneScript.InternetMail

diff --git a/MailComponent/MailComponent.csproj b/MailComponent/MailComponent.csproj
@@ -32,12 +32,6 @@
     <Reference Include="DotNetZip">
       <HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
     </Reference>
-    <Reference Include="ScriptEngine">
-      <HintPath>..\packages\ScriptEngine.dll</HintPath>
-    </Reference>
-    <Reference Include="ScriptEngine.HostedScript">
-      <HintPath>..\packages\ScriptEngine.HostedScript.dll</HintPath>
-    </Reference>
     <Reference Include="BouncyCastle.Crypto">
       <HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
@@ -47,8 +41,17 @@
     <Reference Include="MimeKit">
       <HintPath>..\packages\MimeKit.1.10.0\lib\net45\MimeKit.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="ScriptEngine.HostedScript">
+      <HintPath>..\packages\OneScript.StandardLibrary.1.0.15\lib\net40\ScriptEngine.HostedScript.dll</HintPath>
+    </Reference>
+    <Reference Include="ScriptEngine">
+      <HintPath>..\packages\OneScript.1.0.15\lib\net40\ScriptEngine.dll</HintPath>
+    </Reference>
     <Reference Include="MailKit">
-      <HintPath>..\packages\MailKit.1.10.0\lib\net45\MailKit.dll</HintPath>
+      <HintPath>..\packages\MailKit.1.10.1\lib\net45\MailKit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/MailComponent/Properties/AssemblyInfo.cs b/MailComponent/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("1.0.2.*")]
+[assembly: AssemblyVersion("1.0.3.*")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.

diff --git a/MailComponent/packages.config b/MailComponent/packages.config
@@ -2,6 +2,9 @@
 <packages>
   <package id="BouncyCastle" version="1.8.1" targetFramework="net45" />
   <package id="DotNetZip" version="1.10.1" targetFramework="net45" />
-  <package id="MailKit" version="1.10.0" targetFramework="net45" />
+  <package id="MailKit" version="1.10.1" targetFramework="net45" />
   <package id="MimeKit" version="1.10.0" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="OneScript" version="1.0.15" targetFramework="net45" />
+  <package id="OneScript.StandardLibrary" version="1.0.15" targetFramework="net45" />
 </packages>
diff --git a/NUnitTests/NUnitTests.csproj b/NUnitTests/NUnitTests.csproj
@@ -32,11 +32,14 @@
     <Reference Include="DotNetZip">
       <HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
     </Reference>
-    <Reference Include="ScriptEngine">
-      <HintPath>..\packages\ScriptEngine.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="ScriptEngine.HostedScript">
-      <HintPath>..\packages\ScriptEngine.HostedScript.dll</HintPath>
+      <HintPath>..\packages\OneScript.StandardLibrary.1.0.15\lib\net40\ScriptEngine.HostedScript.dll</HintPath>
+    </Reference>
+    <Reference Include="ScriptEngine">
+      <HintPath>..\packages\OneScript.1.0.15\lib\net40\ScriptEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/NUnitTests/packages.config b/NUnitTests/packages.config
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.10.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="NUnit" version="3.4.1" targetFramework="net45" />
+  <package id="OneScript" version="1.0.15" targetFramework="net45" />
+  <package id="OneScript.StandardLibrary" version="1.0.15" targetFramework="net45" />
 </packages>
diff --git a/TestApp/TestApp.csproj b/TestApp/TestApp.csproj
@@ -31,13 +31,16 @@
     <Reference Include="DotNetZip">
       <HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
     </Reference>
+    <Reference Include="System.Configuration" />
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="ScriptEngine.HostedScript">
-      <HintPath>..\packages\ScriptEngine.HostedScript.dll</HintPath>
+      <HintPath>..\packages\OneScript.StandardLibrary.1.0.15\lib\net40\ScriptEngine.HostedScript.dll</HintPath>
     </Reference>
     <Reference Include="ScriptEngine">
-      <HintPath>..\packages\ScriptEngine.dll</HintPath>
+      <HintPath>..\packages\OneScript.1.0.15\lib\net40\ScriptEngine.dll</HintPath>
     </Reference>
-    <Reference Include="System.Configuration" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />

diff --git a/TestApp/packages.config b/TestApp/packages.config
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.10.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="OneScript" version="1.0.15" targetFramework="net45" />
+  <package id="OneScript.StandardLibrary" version="1.0.15" targetFramework="net45" />
 </packages>
diff --git a/lib/packagedef b/lib/packagedef
@@ -4,7 +4,7 @@
 //
 
 	Описание.Имя("InternetMail")
-			.Версия("1.0.2")
+			.Версия("1.0.3")
 			.Автор("Батанов Сергей")
 			.АдресАвтора("[email protected]")
 			.Описание("Реализация стандартных объектов из раздела ИнтернетПочта")