Skip to content

Commit a855e2e

Browse files
filipwfilipw
committed
Merge remote-tracking branch 'remotes/upstream/dev' into feature/roslyn-engines-rc2
2 parents 8c1a46c + 5b6e25b commit a855e2e

14 files changed

Lines changed: 17 additions & 15 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ RavenDB started, listening on http://localhost:8080.
161161

162162
Script Packs can be used to further reduce the amount of code you need to write when working with common frameworks.
163163

164-
* In an empty directory, install the [ScriptCs.WebApi](https://nuget.org/packages/ScriptCs.WebApi/) script pack from NuGet. The script pack will automatically imports the Web API namespaces and provides a convenient factory method for initializing the Web API host. It also replaces the default `ControllerResolver` with a custom implementation that allows Web API to discover controllers declared in scripts.
164+
* In an empty directory, install the [ScriptCs.WebApi](https://nuget.org/packages/ScriptCs.WebApi/) script pack from NuGet. The script pack automatically imports the Web API namespaces and provides a convenient factory method for initializing the Web API host. It also replaces the default `ControllerResolver` with a custom implementation that allows Web API to discover controllers declared in scripts.
165165

166166
```batchfile
167167
scriptcs -install ScriptCs.WebApi

‎src/ScriptCs.Contracts/ScriptCs.Contracts.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<FileAlignment>512</FileAlignment>
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14-
<TargetFrameworkProfile />
1514
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1615
<WarningsNotAsErrors>414</WarningsNotAsErrors>
16+
<LangVersion>5</LangVersion>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1919
<DebugSymbols>true</DebugSymbols>

‎src/ScriptCs.Core/ScriptCs.Core.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<FileAlignment>512</FileAlignment>
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14-
<TargetFrameworkProfile />
1514
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
15+
<LangVersion>5</LangVersion>
1616
</PropertyGroup>
1717
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1818
<DebugSymbols>true</DebugSymbols>
@@ -118,7 +118,6 @@
118118
<Name>ScriptCs.Contracts</Name>
119119
</ProjectReference>
120120
</ItemGroup>
121-
<ItemGroup />
122121
<Import Project="..\..\build\ScriptCs.Common.props" />
123122
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
124123
<Import Project="..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" />

‎src/ScriptCs.Engine.Common/ScriptCs.Engine.Common.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
1616
<TargetFrameworkProfile />
17+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
18+
<LangVersion>5</LangVersion>
1719
</PropertyGroup>
1820
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1921
<DebugSymbols>true</DebugSymbols>

‎src/ScriptCs.Engine.Mono/ScriptCs.Engine.Mono.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<FileAlignment>512</FileAlignment>
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14-
<TargetFrameworkProfile />
1514
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
15+
<LangVersion>5</LangVersion>
1616
</PropertyGroup>
1717
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1818
<DebugSymbols>true</DebugSymbols>
@@ -124,5 +124,4 @@
124124
</ItemGroup>
125125
<Import Project="..\..\build\ScriptCs.Common.props" />
126126
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
127-
<ItemGroup />
128127
</Project>

‎src/ScriptCs.Hosting/ScriptCs.Hosting.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<FileAlignment>512</FileAlignment>
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14-
<TargetFrameworkProfile />
1514
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
15+
<LangVersion>5</LangVersion>
1616
</PropertyGroup>
1717
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1818
<DebugSymbols>true</DebugSymbols>

‎src/ScriptCs/Command/ExecuteScriptCommand.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ public CommandResult Execute()
6565
_composer.Compose(workingDirectory);
6666

6767
_scriptExecutor.Initialize(assemblyPaths, _scriptPackResolver.GetPacks(), ScriptArgs);
68+
69+
// HACK: This is a (dirty) fix for #1086. This might be a temporary solution until some further refactoring can be done.
70+
_scriptExecutor.ScriptEngine.CacheDirectory = Path.Combine(workingDirectory ?? _fileSystem.CurrentDirectory, _fileSystem.DllCacheFolder);
6871
var scriptResult = _scriptExecutor.Execute(_script, ScriptArgs);
6972
var commandResult = Inspect(scriptResult);
7073
_scriptExecutor.Terminate();

‎src/ScriptCs/ScriptCs.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<FileAlignment>512</FileAlignment>
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14-
<TargetFrameworkProfile />
1514
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1615
<PublishUrl>publish\</PublishUrl>
1716
<Install>true</Install>
@@ -28,6 +27,7 @@
2827
<IsWebBootstrapper>false</IsWebBootstrapper>
2928
<UseApplicationTrust>false</UseApplicationTrust>
3029
<BootstrapperEnabled>true</BootstrapperEnabled>
30+
<LangVersion>5</LangVersion>
3131
</PropertyGroup>
3232
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3333
<DebugSymbols>true</DebugSymbols>

‎test/ScriptCs.Core.Tests/ScriptCs.Core.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<FileAlignment>512</FileAlignment>
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14-
<TargetFrameworkProfile />
1514
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1615
<CodeAnalysisRuleSet>..\..\ScriptCs.Test.ruleset</CodeAnalysisRuleSet>
1716
<NoWarn>1701</NoWarn>
17+
<LangVersion>5</LangVersion>
1818
</PropertyGroup>
1919
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2020
<DebugSymbols>true</DebugSymbols>

‎test/ScriptCs.Engine.Mono.Tests/ScriptCs.Engine.Mono.Tests.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<FileAlignment>512</FileAlignment>
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14-
<TargetFrameworkProfile />
1514
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1615
<CodeAnalysisRuleSet>..\..\ScriptCs.Test.ruleset</CodeAnalysisRuleSet>
1716
<NoWarn>1701</NoWarn>
17+
<LangVersion>5</LangVersion>
1818
</PropertyGroup>
1919
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2020
<DebugSymbols>true</DebugSymbols>
@@ -108,5 +108,4 @@
108108
</PropertyGroup>
109109
<Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
110110
</Target>
111-
<ItemGroup />
112111
</Project>

0 commit comments

Comments
 (0)