Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey Ovsiankin committed Dec 8, 2020
2 parents 90e0352 + cf482f6 commit 5f6261e
Show file tree
Hide file tree
Showing 94 changed files with 941 additions and 485 deletions.
59 changes: 59 additions & 0 deletions .github/workflows/dotnet-core.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Build .NET Core

on:
push:
branches:
- master
- develop
- GA-*

env:
MAIN_PROJECT: OneScript/OneScriptWeb.csproj
TEST_PROJECT: OneScriptWeb.Tests/OneScriptWeb.Tests.csproj
SOLUTION: OneScript.sln

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest]
dotnet-version: [3.1.301]
include:
- os: windows-latest
RID: win-x64
target: netcoreapp3.1
- os: ubuntu-latest
RID: linux-x64
target: netcoreapp3.1
defaults:
run:
working-directory: src
steps:

# актуализация с сабмодулями
- uses: actions/checkout@v2
with:
submodules: true

# установка дотнет
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{ matrix.dotnet-version }}

# Сборка
- name: Build
run: dotnet build ${{env.MAIN_PROJECT}} -c Release -r ${{matrix.RID}} -f ${{ matrix.target }} -o ../artifact/${{matrix.target}}/${{matrix.RID}}

# Тесты
- name: Test
run: dotnet test ${{env.TEST_PROJECT}} -c Release --runtime=${{matrix.RID}} -f ${{ matrix.target }} --logger="trx;LogFileName=${{matrix.RID}}.trx" --results-directory=testResults

# Заливка в артефакты
- name: Artifact
uses: actions/upload-artifact@v2
with:
name: oscript.web-${{matrix.RID}}.zip
path: ./artifact/${{matrix.target}}/${{matrix.RID}}
19 changes: 2 additions & 17 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
WORKDIR /app

# Copy everything else and build

COPY . ./
RUN dotnet restore OneScript/OneScriptWeb.csproj
RUN dotnet publish OneScript/OneScriptWeb.csproj -c Release -o /app/out -f netcoreapp2.2 -r debian-x64

# RUNTIME
#FROM mcr.microsoft.com/dotnet/core/aspnet:2.2
FROM ubuntu:18.04

RUN apt update
RUN apt install -y --no-install-recommends liblttng-ust0 libcurl4 libssl1.0.0 libkrb5-3 zlib1g libicu60 && \
rm -rf /var/lib/apt/lists/*
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1

ENV LANG ru_RU.UTF-8

Expand All @@ -22,7 +7,7 @@ ENV ASPNETCORE_ENVIRONMENT=Production
ENV ASPNETCORE_URLS=http://0.0.0.0:5000

WORKDIR /app
COPY --from=build-env /app/out /var/osp.net
COPY . /var/osp.net
ENTRYPOINT ["/var/osp.net/OneScript.WebHost"]

EXPOSE 5000
93 changes: 59 additions & 34 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
pipeline {

agent none
environment {
ReleaseNumber = '0.7.0'

environment {
ReleaseNumber = '0.8.0'
}
stages {
stage('Build everything')
{

stage('Build and test'){
options { skipDefaultCheckout() }
agent {
label 'windows'
}
agent {
docker {
image 'mcr.microsoft.com/dotnet/core/sdk:3.1'
label 'linux'
}
}
environment {
DOTNET_CLI_HOME = "/tmp/DOTNET_CLI_HOME"
}
steps {

checkout(
[$class: 'GitSCM', branches: [[name: "${env.BRANCH_NAME}"]],
doGenerateSubmoduleConfigurations: false,
Expand All @@ -24,39 +32,54 @@ pipeline {
trackingSubmodules: false]],
submoduleCfg: [],
userRemoteConfigs: [[url: 'https://github.com/EvilBeaver/OneScript.Web.git']]])

sh "dotnet build src/OneScript/OneScriptWeb.csproj -r linux-x64 /p:ReleaseNumber=${ReleaseNumber} -c Release -f netcoreapp3.1"
sh "dotnet build src/OneScript/OneScriptWeb.csproj -r win-x64 /p:ReleaseNumber=${ReleaseNumber} -c Release -f netcoreapp3.1"
sh '''
rm -rf testResults
dotnet test src/OneScriptWeb.Tests/OneScriptWeb.Tests.csproj \
-c Release \
-f netcoreapp3.1 \
--runtime win-x64 --logger="trx;LogFileName=win.trx" --results-directory=testResults
/*dir('src/OneScriptWeb.Tests'){
bat '''
@echo off
dotnet restore
dotnet xunit -nunit testresult.xml -configuration Release
'''
nunit testResultsPattern: 'testresult.xml'
}*/
src/OneScriptWeb.Tests/OneScriptWeb.Tests.csproj \
-c Release \
-f netcoreapp3.1 \
--runtime linux-x64 --logger="trx;LogFileName=linux.trx" --results-directory=testResults
'''.stripIndent()

dir('artifact'){
deleteDir()
}

dir('src'){
bat '''
@echo off
dotnet publish OneScript/OneScriptWeb.csproj -c Release -f net461 -o ../artifact/net461/win7-x64 -r win7-x64
dotnet publish OneScript/OneScriptWeb.csproj -c Release -f net461 -o ../artifact/net461/debian-x64 -r debian-x64
dotnet publish OneScript/OneScriptWeb.csproj -c Release -f netcoreapp2.2 -o ../artifact/core22/debian-x64 -r debian-x64
'''
}
mstest testResultsFile: 'testResults/*.trx'

sh '''dotnet publish src/OneScript/OneScriptWeb.csproj \
--no-build \
-c Release
-f netcoreapp3.1
-r win-x64
-o artifact/core/win-x64
'''.stripIndent()

sh '''dotnet publish src/OneScript/OneScriptWeb.csproj \
--no-build \
-c Release
-f netcoreapp3.1
-r linux-x64
-o artifact/core/linux-x64
'''.stripIndent()

stash includes: 'artifact/**', name: 'buildResults'

// новые версии дженкинса падают, если есть ранее зипованый артефакт
fileOperations([fileDeleteOperation(excludes: '', includes: '*.zip')])

zip archive: true, dir: 'artifact/net461/win7-x64', glob: '', zipFile: 'oscript.web-win7-x64.zip'
zip archive: true, dir: 'artifact/net461/debian-x64', glob: '', zipFile: 'oscript.web-debian-x64.zip'
zip archive: true, dir: 'artifact/core22/debian-x64', glob: '', zipFile: 'oscript.web-debian-x64-core.zip'
zip archive: true, dir: 'artifact/core/win-x64', glob: '', zipFile: 'oscript.web-win-x64.zip'
zip archive: true, dir: 'artifact/core/linux-x64', glob: '', zipFile: 'oscript.web-linux-x64.zip'
}
}
stage('Create docker image'){

stage('Create docker image') {
when { branch 'master' }
options { skipDefaultCheckout() }
agent {
label 'linux'
Expand All @@ -75,9 +98,11 @@ pipeline {
submoduleCfg: [],
userRemoteConfigs: [[url: 'https://github.com/EvilBeaver/OneScript.Web.git']]])

unstash 'buildResults'

withCredentials([usernamePassword(credentialsId: 'docker-hub', passwordVariable: 'dockerpassword', usernameVariable: 'dockeruser')]) {
sh "docker build -t evilbeaver/oscript-web:${ReleaseNumber} --file Dockerfile src"
sh "docker login -p $dockerpassword -u $dockeruser && docker push evilbeaver/oscript-web:${ReleaseNumber}"
sh "docker build -t evilbeaver/oscript-web:${ReleaseNumber} --file Dockerfile src"
sh "docker login -p $dockerpassword -u $dockeruser && docker push evilbeaver/oscript-web:${ReleaseNumber}"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Include/OneScript
Submodule OneScript updated 82 files
+21 −8 Build.csproj
+56 −38 Jenkinsfile
+2 −1 install/install.iss
+ − install/oscript-config.exe
+139 −68 src/1Script.sln
+2 −1 src/OneScript.Language.Tests/LexerTests.cs
+279 −0 src/OneScript.Language.Tests/PreprocessorTests.cs
+4 −3 src/OneScript.Language/CodePositionInfo.cs
+21 −0 src/OneScript.Language/LanguageDef.cs
+1 −16 src/OneScript.Language/LexicalAnalysis/CommentLexerState.cs
+137 −92 src/OneScript.Language/LexicalAnalysis/PreprocessingLexer.cs
+10 −4 src/OneScript.Language/LexicalAnalysis/PreprocessorDirectiveLexerState.cs
+33 −4 src/OneScript.Language/LexicalAnalysis/SourceCodeIterator.cs
+50 −0 src/OneScriptDocumenter/toc_layout.md
+16 −2 src/ScriptEngine.HostedScript/Library/ConsoleContext.cs
+10 −10 src/ScriptEngine.HostedScript/Library/FileContext.cs
+246 −0 src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiComponent.cs
+18 −0 src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiEnums.cs
+54 −0 src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiFactory.cs
+40 −0 src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiKernel.cs
+82 −0 src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiLibrary.cs
+84 −0 src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiPackage.cs
+86 −0 src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiProxy.cs
+101 −0 src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiValue.cs
+245 −0 src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiVariant.cs
+24 −6 src/ScriptEngine.HostedScript/Library/Regex/MatchCollectionImpl.cs
+18 −3 src/ScriptEngine.HostedScript/Library/Regex/MatchImpl.cs
+1 −1 src/ScriptEngine.HostedScript/Library/Regex/Regex.cs
+34 −6 src/ScriptEngine.HostedScript/Library/SystemGlobalContext.cs
+5 −3 src/ScriptEngine.HostedScript/Library/ValueTable/ValueTable.cs
+37 −11 src/ScriptEngine.HostedScript/LibraryResolver.cs
+10 −0 src/ScriptEngine.NativeApi/.gitignore
+28 −0 src/ScriptEngine.NativeApi/CMakeLists.txt
+32 −0 src/ScriptEngine.NativeApi/DetectUnionOffset.cpp
+244 −0 src/ScriptEngine.NativeApi/NativeApiProxy.cpp
+58 −0 src/ScriptEngine.NativeApi/NativeInterface.cpp
+49 −0 src/ScriptEngine.NativeApi/NativeInterface.h
+175 −0 src/ScriptEngine.NativeApi/ScriptEngine.NativeApi.vcxproj
+11 −0 src/ScriptEngine.NativeApi/ScriptEngine.NativeApi.vcxproj.filters
+5 −0 src/ScriptEngine.NativeApi/cpp.hint
+159 −0 src/ScriptEngine.NativeApi/include/AddInDefBase.h
+234 −0 src/ScriptEngine.NativeApi/include/ComponentBase.h
+34 −0 src/ScriptEngine.NativeApi/include/IMemoryManager.h
+140 −0 src/ScriptEngine.NativeApi/include/com.h
+233 −0 src/ScriptEngine.NativeApi/include/types.h
+26 −24 src/ScriptEngine/Compiler/Compiler.cs
+11 −1 src/ScriptEngine/Compiler/CompilerExceptions.cs
+0 −40 src/ScriptEngine/Compiler/DirectiveIgnorer.cs
+1 −7 src/ScriptEngine/Environment/CodeSources.cs
+6 −0 src/ScriptEngine/Environment/ModuleInformation.cs
+14 −16 src/ScriptEngine/Machine/Contexts/UnmanagedCOMWrapperContext.cs
+2 −0 src/ScriptEngine/Machine/MachineInstance.cs
+6 −0 src/ScriptEngine/Machine/Rcw/RcwMembersMetadataCollection.cs
+9 −9 src/ScriptEngine/Machine/Rcw/RcwMetadata.cs
+0 −13 src/ScriptEngine/ScriptingEngine.cs
+ − tests/component/Component.dll
+0 −8 tests/constructor.os
+18 −0 tests/directives.os
+19 −0 tests/global-funcs.os
+2 −2 tests/http.os
+163 −0 tests/native-api.os
+10 −0 tests/native-api/.gitignore
+756 −0 tests/native-api/AddInNative.cpp
+7 −0 tests/native-api/AddInNative.def
+95 −0 tests/native-api/AddInNative.h
+230 −0 tests/native-api/AddInNative.vcxproj
+41 −0 tests/native-api/AddInNative.vcxproj.filters
+45 −0 tests/native-api/CMakeLists.txt
+7 −0 tests/native-api/MANIFEST.XML
+19 −0 tests/native-api/dllmain.cpp
+159 −0 tests/native-api/include/AddInDefBase.h
+243 −0 tests/native-api/include/ComponentBase.h
+34 −0 tests/native-api/include/IMemoryManager.h
+140 −0 tests/native-api/include/com.h
+233 −0 tests/native-api/include/types.h
+8 −0 tests/native-api/stdafx.cpp
+16 −0 tests/native-api/stdafx.h
+11 −0 tests/preprocessor/excluded.os
+5 −0 tests/preprocessor/multiline-fail.os
+2 −3 tests/preprocessor/regions.os
+70 −1 tests/regex.os
+307 −121 tests/valuetable.os
15 changes: 0 additions & 15 deletions src/OneScript.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,51 +21,36 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
ReleaseNetStandard|Any CPU = ReleaseNetStandard|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{082351A7-DB5F-41F3-8337-CBAA7C877EC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{082351A7-DB5F-41F3-8337-CBAA7C877EC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{082351A7-DB5F-41F3-8337-CBAA7C877EC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{082351A7-DB5F-41F3-8337-CBAA7C877EC6}.Release|Any CPU.Build.0 = Release|Any CPU
{082351A7-DB5F-41F3-8337-CBAA7C877EC6}.ReleaseNetStandard|Any CPU.ActiveCfg = Release|Any CPU
{082351A7-DB5F-41F3-8337-CBAA7C877EC6}.ReleaseNetStandard|Any CPU.Build.0 = Release|Any CPU
{894A3A1B-D6FC-4FA2-8712-953A1CA96875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{894A3A1B-D6FC-4FA2-8712-953A1CA96875}.Debug|Any CPU.Build.0 = Debug|Any CPU
{894A3A1B-D6FC-4FA2-8712-953A1CA96875}.Release|Any CPU.ActiveCfg = Release|Any CPU
{894A3A1B-D6FC-4FA2-8712-953A1CA96875}.Release|Any CPU.Build.0 = Release|Any CPU
{894A3A1B-D6FC-4FA2-8712-953A1CA96875}.ReleaseNetStandard|Any CPU.ActiveCfg = Release|Any CPU
{894A3A1B-D6FC-4FA2-8712-953A1CA96875}.ReleaseNetStandard|Any CPU.Build.0 = Release|Any CPU
{59C56111-1C71-475C-8BE9-1173C9E7B7E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59C56111-1C71-475C-8BE9-1173C9E7B7E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59C56111-1C71-475C-8BE9-1173C9E7B7E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59C56111-1C71-475C-8BE9-1173C9E7B7E0}.Release|Any CPU.Build.0 = Release|Any CPU
{59C56111-1C71-475C-8BE9-1173C9E7B7E0}.ReleaseNetStandard|Any CPU.ActiveCfg = ReleaseNetStandard|Any CPU
{59C56111-1C71-475C-8BE9-1173C9E7B7E0}.ReleaseNetStandard|Any CPU.Build.0 = ReleaseNetStandard|Any CPU
{E0753066-45FE-4A74-9E25-D1D0A6EE1162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E0753066-45FE-4A74-9E25-D1D0A6EE1162}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E0753066-45FE-4A74-9E25-D1D0A6EE1162}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E0753066-45FE-4A74-9E25-D1D0A6EE1162}.Release|Any CPU.Build.0 = Release|Any CPU
{E0753066-45FE-4A74-9E25-D1D0A6EE1162}.ReleaseNetStandard|Any CPU.ActiveCfg = ReleaseNetStandard|Any CPU
{E0753066-45FE-4A74-9E25-D1D0A6EE1162}.ReleaseNetStandard|Any CPU.Build.0 = ReleaseNetStandard|Any CPU
{778596E5-05C4-4775-A88B-34B3B48B56BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{778596E5-05C4-4775-A88B-34B3B48B56BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{778596E5-05C4-4775-A88B-34B3B48B56BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{778596E5-05C4-4775-A88B-34B3B48B56BA}.Release|Any CPU.Build.0 = Release|Any CPU
{778596E5-05C4-4775-A88B-34B3B48B56BA}.ReleaseNetStandard|Any CPU.ActiveCfg = Debug|Any CPU
{778596E5-05C4-4775-A88B-34B3B48B56BA}.ReleaseNetStandard|Any CPU.Build.0 = Debug|Any CPU
{272DC28D-54B6-4D4D-9970-D3BA324DBECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{272DC28D-54B6-4D4D-9970-D3BA324DBECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{272DC28D-54B6-4D4D-9970-D3BA324DBECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{272DC28D-54B6-4D4D-9970-D3BA324DBECF}.Release|Any CPU.Build.0 = Release|Any CPU
{272DC28D-54B6-4D4D-9970-D3BA324DBECF}.ReleaseNetStandard|Any CPU.ActiveCfg = Debug|Any CPU
{272DC28D-54B6-4D4D-9970-D3BA324DBECF}.ReleaseNetStandard|Any CPU.Build.0 = Debug|Any CPU
{E8530889-A741-4A5E-B606-6C25FE4B8EA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E8530889-A741-4A5E-B606-6C25FE4B8EA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E8530889-A741-4A5E-B606-6C25FE4B8EA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E8530889-A741-4A5E-B606-6C25FE4B8EA4}.Release|Any CPU.Build.0 = Release|Any CPU
{E8530889-A741-4A5E-B606-6C25FE4B8EA4}.ReleaseNetStandard|Any CPU.ActiveCfg = Debug|Any CPU
{E8530889-A741-4A5E-B606-6C25FE4B8EA4}.ReleaseNetStandard|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
33 changes: 17 additions & 16 deletions src/OneScript/Application/ApplicationInstance.cs
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
using ScriptEngine.Environment;
/*----------------------------------------------------------
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
at http://mozilla.org/MPL/2.0/.
----------------------------------------------------------*/
using ScriptEngine.Environment;
using ScriptEngine.Machine.Contexts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Hangfire;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Routing;
using OneScript.WebHost.BackgroundJobs;
using OneScript.WebHost.Infrastructure;
using ScriptEngine;
using ScriptEngine.HostedScript.Library;
using ScriptEngine.Machine;
using Microsoft.Extensions.FileProviders;

namespace OneScript.WebHost.Application
{
Expand Down Expand Up @@ -145,10 +147,15 @@ public void UseStaticFiles()
[ContextMethod("ИспользоватьМаршруты")]
public void UseMvcRoutes(string handler = null)
{
if (handler == null)
_startupBuilder.UseMvcWithDefaultRoute();
_startupBuilder.UseRouting();
if (handler == default)
{
_startupBuilder.UseEndpoints(x => x.MapDefaultControllerRoute());
}
else
{
CallRoutesRegistrationHandler(handler);
}
}

/// <summary>
Expand Down Expand Up @@ -219,14 +226,13 @@ private void CallRoutesRegistrationHandler(string handler)
var handlerIndex = GetScriptMethod(handler);

var routesCol = new RoutesCollectionContext();

CallScriptMethod(handlerIndex, new IValue[]{routesCol});

_startupBuilder.UseMvc(routes =>
_startupBuilder.UseEndpoints(routes =>
{
foreach (var route in routesCol)
{
routes.MapRoute(route.Name, route.Template, route.Defaults?.Select(x=>
routes.MapControllerRoute(route.Name, route.Template, route.Defaults?.Select(x=>
{
var kv = new KeyValuePair<string,object>(x.Key.AsString(),ContextValuesMarshaller.ConvertToCLRObject(x.Value));
return kv;
Expand Down Expand Up @@ -258,15 +264,10 @@ public static ApplicationInstance Create(ICodeSource src, IApplicationRuntime we
var bc = compiler.Compile(src);
var app = new ApplicationInstance(new LoadedModule(bc));
var machine = MachineInstance.Current;
webApp.Environment.LoadMemory(machine);
machine.PrepareThread(webApp.Environment);
webApp.Engine.InitializeSDO(app);

return app;
}

public void UseServices(IServiceProvider services)
{
//throw new NotImplementedException();
}
}
}
11 changes: 7 additions & 4 deletions src/OneScript/Application/ContentActionResult.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
/*----------------------------------------------------------
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
at http://mozilla.org/MPL/2.0/.
----------------------------------------------------------*/

using Microsoft.AspNetCore.Mvc;
using ScriptEngine.Machine.Contexts;

Expand Down
11 changes: 7 additions & 4 deletions src/OneScript/Application/CookieOptionsWraper.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
/*----------------------------------------------------------
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
at http://mozilla.org/MPL/2.0/.
----------------------------------------------------------*/
using System;
using Microsoft.AspNetCore.Http;
using ScriptEngine.Machine;
using ScriptEngine.Machine.Contexts;
Expand Down
10 changes: 7 additions & 3 deletions src/OneScript/Application/FileActionResult.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
using System;
using System.Collections.Generic;
/*----------------------------------------------------------
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
at http://mozilla.org/MPL/2.0/.
----------------------------------------------------------*/

using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using ScriptEngine.HostedScript.Library.Binary;
Expand Down
Loading

0 comments on commit 5f6261e

Please sign in to comment.