Skip to content

Commit 268f388

Browse files
dmpasdmpas
authored
Merge pull request #12 from dmpas/develop
v1.0.4
2 parents 67dd8f2 + 18f05d1 commit 268f388

File tree

15 files changed

+95
-49
lines changed

15 files changed

+95
-49
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
packages/
2+
13
.vs/
24
.idea/
35

‎NUnitTests/EngineHelpWrapper.cs

100755100644
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
using System;
1+
/*----------------------------------------------------------
2+
This Source Code Form is subject to the terms of the
3+
Mozilla Public License, v.2.0. If a copy of the MPL
4+
was not distributed with this file, You can obtain one
5+
at http://mozilla.org/MPL/2.0/.
6+
----------------------------------------------------------*/
7+
using System;
28
using System.IO;
39
using NUnit.Framework;
410
using ScriptEngine.Machine.Contexts;

‎NUnitTests/MainTestClass.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
using System;
1+
/*----------------------------------------------------------
2+
This Source Code Form is subject to the terms of the
3+
Mozilla Public License, v.2.0. If a copy of the MPL
4+
was not distributed with this file, You can obtain one
5+
at http://mozilla.org/MPL/2.0/.
6+
----------------------------------------------------------*/
7+
using System;
28
using System.IO;
39
using NUnit.Framework;
410
using ScriptEngine.HostedScript;

‎NUnitTests/NUnitTests.csproj

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,25 @@
2525
<WarningLevel>4</WarningLevel>
2626
</PropertyGroup>
2727
<ItemGroup>
28-
<Reference Include="System" />
29-
<Reference Include="DotNetZip">
30-
<HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
28+
<Reference Include="DotNetZip, Version=1.13.3.0, Culture=neutral, PublicKeyToken=6583c7c814667745">
29+
<HintPath>..\packages\DotNetZip.1.13.3\lib\net40\DotNetZip.dll</HintPath>
30+
<Private>True</Private>
3131
</Reference>
32-
<Reference Include="Newtonsoft.Json">
33-
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
32+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
33+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
34+
<Private>True</Private>
3435
</Reference>
35-
<Reference Include="nunit.framework">
36-
<HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
36+
<Reference Include="ScriptEngine, Version=1.1.1.42, Culture=neutral, PublicKeyToken=null">
37+
<HintPath>..\packages\OneScript.1.1.1\lib\net452\ScriptEngine.dll</HintPath>
38+
<Private>True</Private>
3739
</Reference>
38-
<Reference Include="ScriptEngine">
39-
<HintPath>..\packages\OneScript.1.0.19\lib\net452\ScriptEngine.dll</HintPath>
40+
<Reference Include="ScriptEngine.HostedScript, Version=1.1.1.42, Culture=neutral, PublicKeyToken=null">
41+
<HintPath>..\packages\OneScript.StandardLibrary.1.1.1\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
42+
<Private>True</Private>
4043
</Reference>
41-
<Reference Include="ScriptEngine.HostedScript">
42-
<HintPath>..\packages\OneScript.StandardLibrary.1.0.19\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
44+
<Reference Include="System" />
45+
<Reference Include="nunit.framework">
46+
<HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
4347
</Reference>
4448
</ItemGroup>
4549
<ItemGroup>

‎NUnitTests/packages.config

100755100644
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="DotNetZip" version="1.10.1" targetFramework="net45" />
4-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
3+
<package id="DotNetZip" version="1.13.3" targetFramework="net452" />
4+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
55
<package id="NUnit" version="3.5.0" targetFramework="net45" />
6-
<package id="OneScript" version="1.0.19" targetFramework="net45" />
7-
<package id="OneScript.StandardLibrary" version="1.0.19" targetFramework="net45" />
6+
<package id="OneScript" version="1.1.1" targetFramework="net452" />
7+
<package id="OneScript.StandardLibrary" version="1.1.1" targetFramework="net452" />
88
</packages>

‎TestApp/Program.cs

100755100644
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
using System;
1+
/*----------------------------------------------------------
2+
This Source Code Form is subject to the terms of the
3+
Mozilla Public License, v.2.0. If a copy of the MPL
4+
was not distributed with this file, You can obtain one
5+
at http://mozilla.org/MPL/2.0/.
6+
----------------------------------------------------------*/
7+
using System;
28
using ScriptEngine.HostedScript;
39
using ScriptEngine.HostedScript.Library;
410

‎TestApp/Properties/AssemblyInfo.cs

100755100644
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
using System.Reflection;
1+
/*----------------------------------------------------------
2+
This Source Code Form is subject to the terms of the
3+
Mozilla Public License, v.2.0. If a copy of the MPL
4+
was not distributed with this file, You can obtain one
5+
at http://mozilla.org/MPL/2.0/.
6+
----------------------------------------------------------*/
7+
using System.Reflection;
28
using System.Runtime.CompilerServices;
39

410
// Information about this assembly is defined by the following attributes.

‎TestApp/TestApp.csproj

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,23 @@
2727
<ExternalConsole>true</ExternalConsole>
2828
</PropertyGroup>
2929
<ItemGroup>
30-
<Reference Include="System" />
31-
<Reference Include="DotNetZip">
32-
<HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
30+
<Reference Include="DotNetZip, Version=1.13.3.0, Culture=neutral, PublicKeyToken=6583c7c814667745">
31+
<HintPath>..\packages\DotNetZip.1.13.3\lib\net40\DotNetZip.dll</HintPath>
32+
<Private>True</Private>
3333
</Reference>
34-
<Reference Include="Newtonsoft.Json">
35-
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
34+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
35+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
36+
<Private>True</Private>
3637
</Reference>
37-
<Reference Include="ScriptEngine">
38-
<HintPath>..\packages\OneScript.1.0.19\lib\net452\ScriptEngine.dll</HintPath>
38+
<Reference Include="ScriptEngine, Version=1.1.1.42, Culture=neutral, PublicKeyToken=null">
39+
<HintPath>..\packages\OneScript.1.1.1\lib\net452\ScriptEngine.dll</HintPath>
40+
<Private>True</Private>
3941
</Reference>
40-
<Reference Include="ScriptEngine.HostedScript">
41-
<HintPath>..\packages\OneScript.StandardLibrary.1.0.19\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
42+
<Reference Include="ScriptEngine.HostedScript, Version=1.1.1.42, Culture=neutral, PublicKeyToken=null">
43+
<HintPath>..\packages\OneScript.StandardLibrary.1.1.1\lib\net452\ScriptEngine.HostedScript.dll</HintPath>
44+
<Private>True</Private>
4245
</Reference>
46+
<Reference Include="System" />
4347
</ItemGroup>
4448
<ItemGroup>
4549
<Compile Include="Program.cs" />

‎TestApp/packages.config

100755100644
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="DotNetZip" version="1.10.1" targetFramework="net45" />
4-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
5-
<package id="OneScript" version="1.0.19" targetFramework="net45" />
6-
<package id="OneScript.StandardLibrary" version="1.0.19" targetFramework="net45" />
3+
<package id="DotNetZip" version="1.13.3" targetFramework="net452" />
4+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
5+
<package id="OneScript" version="1.1.1" targetFramework="net452" />
6+
<package id="OneScript.StandardLibrary" version="1.1.1" targetFramework="net452" />
77
</packages>

‎appveyor.yml

100755100644
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
image: Visual Studio 2017
2-
version: 1.0.3-{build}
2+
version: 1.0.4-{build}
33
before_build:
44
- ps: nuget restore
55
init:
66
- ps: Set-WinSystemLocale ru-RU
7-
- ps: Start-Sleep -s 5
7+
- ps: Start-Sleep -s 15
88
- ps: Restart-Computer
99
install:
1010
- cmd: >-
11-
choco install onescript.cli -source https://www.myget.org/F/onescript -y
11+
choco install onescript-cli -y
1212
1313
refreshenv
1414

0 commit comments

Comments
 (0)