Merge branch 'hotfix/zip-bundle'

Author: EvilBeaver

Jenkinsfile

@@ -4,7 +4,7 @@ pipeline {
     agent none
 
     environment {
-        ReleaseNumber = '1.1.0'
+        ReleaseNumber = '1.1.1'
         outputEnc = '65001'
     }
 
@@ -273,7 +273,7 @@ pipeline {
                 TARGET="/var/www/oscript.io/download/versions/latest/"
                 sudo rsync -rv --delete --exclude mddoc*.zip --exclude *.src.rpm . \$TARGET
                 
-                TARGET="/var/www/oscript.io/download/versions/$ReleaseNumber/"
+                TARGET="/var/www/oscript.io/download/versions/" + ReleaseNumber.replace('.', '_') + "/"
                 sudo rsync -rv --delete --exclude mddoc*.zip --exclude *.src.rpm . \$TARGET
 
                 """.stripIndent()
@@ -282,4 +282,4 @@ pipeline {
 
     }
 
-}
+}

src/ScriptEngine.HostedScript/Library/Zip/ZipReader.cs

@@ -1,4 +1,4 @@
-/*----------------------------------------------------------
+/*----------------------------------------------------------
 This Source Code Form is subject to the terms of the 
 Mozilla Public License, v.2.0. If a copy of the MPL 
 was not distributed with this file, You can obtain one 
@@ -54,10 +54,11 @@ public void Open(string filename, string password = null, FileNamesEncodingInZip
 
         private Encoding ChooseEncoding(FileNamesEncodingInZipFile encoding)
         {
-            if(encoding != FileNamesEncodingInZipFile.OsEncodingWithUtf8)
-                return Encoding.UTF8;
+            if (encoding == FileNamesEncodingInZipFile.Auto || encoding == FileNamesEncodingInZipFile.OsEncodingWithUtf8) 
+                return null;
+            
+            return Encoding.UTF8;
 
-            return null;
         }
 
 

src/ScriptEngine.HostedScript/Library/Zip/ZipWriter.cs

@@ -324,16 +324,23 @@ public static ZipWriter Construct()
         }
 
         [ScriptConstructor(Name = "На основании имени файла")]
-        public static ZipWriter ConstructByFileOptions(IValue filename, IValue password = null, IValue comment = null, IValue compressionMethod = null, IValue compressionLevel = null, IValue encryptionMethod = null)
+        public static ZipWriter ConstructByFileOptions(
+            IValue filename, 
+            IValue password = null,
+            IValue comment = null,
+            IValue compressionMethod = null,
+            IValue compressionLevel = null,
+            IValue encryptionMethod = null,
+            FileNamesEncodingInZipFile encoding = FileNamesEncodingInZipFile.Auto)
         {
             var zip = new ZipWriter();
             zip.Open(filename.AsString(),
                 ConvertParam<string>(password),
                 ConvertParam<string>(comment),
                 ConvertParam<SelfAwareEnumValue<ZipCompressionMethodEnum>>(compressionMethod),
                 ConvertParam<SelfAwareEnumValue<ZipCompressionLevelEnum>>(compressionLevel),
-                ConvertParam<SelfAwareEnumValue<ZipEncryptionMethodEnum>>(encryptionMethod)
-                    );
+                ConvertParam<SelfAwareEnumValue<ZipEncryptionMethodEnum>>(encryptionMethod),
+                    encoding);
             return zip;
         }
 

src/TestApp/TestApp.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <!--Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" /-->
+  <Import Project="$(MSBuildProjectDirectory)/../oscommon.targets" />
 
   <PropertyGroup>
     <TargetFramework>net452</TargetFramework>

src/oscommon.targets

@@ -2,7 +2,7 @@
 
     <!--Свойства сборки по умолчанию-->
     <PropertyGroup>
-        <ReleaseNumber Condition="'$(ReleaseNumber)' == ''">1.1.0</ReleaseNumber>
+        <ReleaseNumber Condition="'$(ReleaseNumber)' == ''">1.1.1</ReleaseNumber>
         <BuildNumber Condition="'$(BUILD_NUMBER)' != ''">$(BUILD_NUMBER)</BuildNumber>
         <BuildNumber Condition="'$(BUILD_NUMBER)' == ''">0</BuildNumber>
         <Configuration Condition="'$(Release)' == ''">Release</Configuration>