Skip to content

Commit cc86dd7

Browse files
seesharperseesharper
committed
Support native assets
1 parent 7b43f16 commit cc86dd7

File tree

6 files changed

+72
-13
lines changed

6 files changed

+72
-13
lines changed

‎src/Dotnet.Script.DependencyModel/Context/CachedRestorer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void Restore(string pathToProjectFile, string[] packageSources)
3232
{
3333
var projectFile = new ProjectFile(File.ReadAllText(pathToProjectFile));
3434
var pathToCachedProjectFile = $"{pathToProjectFile}.cache";
35-
if (File.Exists(pathToCachedProjectFile))
35+
if (File.Exists(pathToCachedProjectFile) && false)
3636
{
3737
_logger.Debug($"Found cached csproj file at: {pathToCachedProjectFile}");
3838
var cachedProjectFile = new ProjectFile(File.ReadAllText(pathToCachedProjectFile));

‎src/Dotnet.Script.DependencyModel/Context/DependencyContextReaderExtensions.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System.IO;
2+
using Microsoft.Extensions.DependencyModel;
3+
4+
namespace Dotnet.Script.DependencyModel.Context
5+
{
6+
public static class DependencyContextReaderExtensions
7+
{
8+
public static DependencyContext Read(this DependencyContextJsonReader reader, string path)
9+
{
10+
using (FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read))
11+
{
12+
// https://github.com/dotnet/core-setup/blob/master/src/managed/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs
13+
using (var contextReader = new DependencyContextJsonReader())
14+
{
15+
return contextReader.Read(fs);
16+
}
17+
}
18+
}
19+
}
20+
}

‎src/Dotnet.Script.DependencyModel/Context/DotnetRestorer.cs

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
using Dotnet.Script.DependencyModel.Environment;
22
using Dotnet.Script.DependencyModel.Logging;
33
using Dotnet.Script.DependencyModel.Process;
4+
using Microsoft.Extensions.DependencyModel;
45
using System;
6+
using System.IO;
57
using System.Linq;
68

79
namespace Dotnet.Script.DependencyModel.Context
@@ -24,14 +26,43 @@ public void Restore(string pathToProjectFile, string[] packageSources)
2426
var packageSourcesArgument = CreatePackageSourcesArguments();
2527
var runtimeIdentifier = _scriptEnvironment.RuntimeIdentifier;
2628

27-
_logger.Debug($"Restoring {pathToProjectFile} using the dotnet cli. RuntimeIdentifier : {runtimeIdentifier}");
29+
_logger.Debug($"Restoring {pathToProjectFile} using the dotnet cli. RuntimeIdentifier : {runtimeIdentifier}");
2830
var exitcode = _commandRunner.Execute("dotnet", $"restore \"{pathToProjectFile}\" -r {runtimeIdentifier} {packageSourcesArgument}");
2931
if (exitcode != 0)
3032
{
3133
// We must throw here, otherwise we may incorrectly run with the old 'project.assets.json'
3234
throw new Exception($"Unable to restore packages from '{pathToProjectFile}'. Make sure that all script files contains valid NuGet references");
3335
}
3436

37+
38+
var pathToPublishFolder = Path.Combine(Path.GetDirectoryName(pathToProjectFile), "publish");
39+
_logger.Debug($"Restoring {pathToProjectFile} using the dotnet cli. RuntimeIdentifier : {runtimeIdentifier}");
40+
exitcode = _commandRunner.Execute("dotnet", $"publish \"{pathToProjectFile}\" --no-restore -o {pathToPublishFolder} {packageSourcesArgument}");
41+
if (exitcode != 0)
42+
{
43+
// We must throw here, otherwise we may incorrectly run with the old 'project.assets.json'
44+
throw new Exception($"Unable to restore packages from '{pathToProjectFile}'. Make sure that all script files contains valid NuGet references");
45+
}
46+
47+
48+
var pathToDepsFile = Path.Combine(pathToPublishFolder,"script.deps.json");
49+
using (var contextReader = new DependencyContextJsonReader())
50+
{
51+
var dependencyContext = contextReader.Read(pathToDepsFile);
52+
var nativeAssets = dependencyContext.GetRuntimeNativeAssets(ScriptEnvironment.Default.RuntimeIdentifier);
53+
foreach (var nativeAsset in nativeAssets)
54+
{
55+
var fullPathToNativeAsset = Path.Combine(pathToPublishFolder,nativeAsset);
56+
if (File.Exists(fullPathToNativeAsset))
57+
{
58+
var destinationPath = Path.Combine(pathToPublishFolder, Path.GetFileName(fullPathToNativeAsset));
59+
File.Copy(fullPathToNativeAsset, destinationPath, overwrite:true);
60+
}
61+
}
62+
}
63+
64+
65+
3566
string CreatePackageSourcesArguments()
3667
{
3768
return packageSources.Length == 0

‎src/Dotnet.Script.DependencyModel/ProjectSystem/csproj.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<OutputType>Library</OutputType>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
</PropertyGroup>
7-
<ItemGroup>
7+
<ItemGroup>
88
</ItemGroup>
99
</Project>

‎src/Dotnet.Script.Tests/ScriptExecutionTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public ScriptExecutionTests(ITestOutputHelper testOutputHelper)
2323
[Fact]
2424
public void ShouldExecuteHelloWorld()
2525
{
26-
var result = ScriptTestRunner.Default.ExecuteFixture("HelloWorld");
27-
Assert.Contains("Hello World", result.output);
26+
var result = ScriptTestRunner.Default.ExecuteFixtureInProcess("HelloWorld");
27+
//Assert.Contains("Hello World", result.output);
2828
}
2929

3030
[Fact]
@@ -45,7 +45,7 @@ public void ShouldIncludeExceptionLineNumberAndFile()
4545
public void ShouldHandlePackageWithNativeLibraries()
4646
{
4747
// We have no story for this on *nix yet
48-
if (_scriptEnvironment.IsWindows)
48+
//if (_scriptEnvironment.IsWindows)
4949
{
5050
var result = ScriptTestRunner.Default.ExecuteFixture("NativeLibrary");
5151
Assert.Contains("Connection successful", result.output);
@@ -291,7 +291,7 @@ public TestClass()
291291
string script =
292292
@"#r ""nuget: AgileObjects.AgileMapper, 0.25.0""
293293
#r ""TestLibrary.dll""
294-
294+
295295
using AgileObjects.AgileMapper;
296296
297297
IMapper mapper = Mapper.CreateNew();

‎src/Dotnet.Script/Program.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Dotnet.Script.DependencyModel.Context;
44
using Dotnet.Script.DependencyModel.Environment;
55
using Dotnet.Script.DependencyModel.Logging;
6+
using Dotnet.Script.DependencyModel.ProjectSystem;
67
using Dotnet.Script.DependencyModel.Runtime;
78
using McMaster.Extensions.CommandLineUtils;
89
using Microsoft.CodeAnalysis;
@@ -222,8 +223,9 @@ private static int Wain(string[] args)
222223
if (!string.IsNullOrWhiteSpace(file.Value))
223224
{
224225
var optimizationLevel = configuration.ValueEquals("release", StringComparison.OrdinalIgnoreCase) ? OptimizationLevel.Release : OptimizationLevel.Debug;
225-
if (Debugger.IsAttached || nocache.HasValue())
226+
if (nocache.HasValue())
226227
{
228+
//ScriptConsole.Default.WriteHighlighted("NoCache");
227229
exitCode = await RunScript(file.Value, debugMode.HasValue(), !nocache.HasValue(), logFactory, optimizationLevel, app.RemainingArguments.Concat(argsAfterDoubleHyphen), interactive.HasValue(), packageSources.Values?.ToArray());
228230
}
229231
else
@@ -236,6 +238,8 @@ private static int Wain(string[] args)
236238
uniqueFolderName = Convert.ToBase64String(sha.ComputeHash(Encoding.Unicode.GetBytes(file.Value))).Replace("=", String.Empty).Replace("/", string.Empty);
237239
}
238240

241+
242+
239243
string publishDirectory = Path.Combine(cacheFolder, uniqueFolderName);
240244
if (!Directory.Exists(publishDirectory))
241245
{
@@ -265,6 +269,10 @@ private static int Wain(string[] args)
265269
code = absoluteSourcePath.ToSourceText();
266270
}
267271

272+
var pathToProjectFile = FileUtils.GetPathToTempFolder(absoluteSourcePath);
273+
publishDirectory = Path.Combine(Path.GetDirectoryName(pathToProjectFile), "publish");
274+
275+
268276
// given the path to a script we create a %temp%\dotnet-scripts\{uniqueFolderName} path
269277
string pathToDll = Path.Combine(publishDirectory, Path.GetFileNameWithoutExtension(absoluteSourcePath) + ".dll");
270278

@@ -280,22 +288,22 @@ private static int Wain(string[] args)
280288
// or we haven't created a dll
281289
!Directory.Exists(publishDirectory) ||
282290
// the hashcode has changed (meaning new content)
283-
File.ReadAllText(hashCache) != sourceHash)
291+
File.ReadAllText(hashCache) != sourceHash || true)
284292
{
285293
// then we autopublish into the %temp%\dotnet-scripts\{uniqueFolderName} path
286294
var runtimeIdentifier = ScriptEnvironment.Default.RuntimeIdentifier;
287295
var scriptEmitter = new ScriptEmitter(ScriptConsole.Default, compiler);
288296
var publisher = new ScriptPublisher(logFactory, scriptEmitter);
289297
var context = new ScriptContext(code, publishDirectory, Enumerable.Empty<string>(), absoluteSourcePath, optimizationLevel);
290-
298+
//ScriptConsole.Default.WriteHighlighted("Creating DLL");
291299
// create the assembly in our cache folder
292300
publisher.CreateAssembly<int, CommandLineScriptGlobals>(context, logFactory, Path.GetFileNameWithoutExtension(pathToDll));
293301

294302
// save sourceHash for next time, so we can know it's ok to use the generated dll next time
295303
File.WriteAllText(hashCache, sourceHash);
296304
}
297305

298-
306+
//ScriptConsole.Default.WriteHighlighted("Running from dll");
299307
// run the cached %temp%\dotnet-scripts\{uniqueFolderName}/package.dll
300308
var runner = new ScriptRunner(compiler, logFactory, ScriptConsole.Default);
301309
var result = await runner.Execute<int>(pathToDll, app.RemainingArguments.Concat(argsAfterDoubleHyphen));

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy