Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 65906ab

Browse filesBrowse files
committed
Use assembly name as symbol path name
1 parent fc8d8c4 commit 65906ab
Copy full SHA for 65906ab

File tree

5 files changed

+9
-6
lines changed
Filter options

5 files changed

+9
-6
lines changed

‎src/Dotnet.Script.Core/Dotnet.Script.Core.csproj

Copy file name to clipboardExpand all lines: src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>A cross platform library allowing you to run C# (CSX) scripts with support for debugging and inline NuGet packages. Based on Roslyn.</Description>
5-
<VersionPrefix>0.30.0</VersionPrefix>
5+
<VersionPrefix>0.30.1</VersionPrefix>
66
<Authors>filipw</Authors>
77
<TargetFrameworks>netstandard2.0</TargetFrameworks>
88
<AssemblyName>Dotnet.Script.Core</AssemblyName>

‎src/Dotnet.Script.Core/ScriptEmitter.cs

Copy file name to clipboardExpand all lines: src/Dotnet.Script.Core/ScriptEmitter.cs
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public ScriptEmitter(ScriptConsole scriptConsole, ScriptCompiler scriptCompiler)
1818
_scriptCompiler = scriptCompiler;
1919
}
2020

21-
public virtual ScriptEmitResult Emit<TReturn, THost>(ScriptContext context)
21+
public virtual ScriptEmitResult Emit<TReturn, THost>(ScriptContext context, string assemblyName)
2222
{
2323
var compilationContext = _scriptCompiler.CreateCompilationContext<TReturn, THost>(context);
2424
foreach (var warning in compilationContext.Warnings)
@@ -43,7 +43,9 @@ public virtual ScriptEmitResult Emit<TReturn, THost>(ScriptContext context)
4343
if (context.OptimizationLevel == Microsoft.CodeAnalysis.OptimizationLevel.Debug)
4444
{
4545
emitOptions = new EmitOptions()
46-
.WithDebugInformationFormat(DebugInformationFormat.Embedded);
46+
.WithDebugInformationFormat(DebugInformationFormat.Embedded)
47+
.WithPdbFilePath($"{assemblyName}.pdb");
48+
4749
}
4850

4951
var result = compilation.Emit(peStream, options: emitOptions);

‎src/Dotnet.Script.Core/ScriptPublisher.cs

Copy file name to clipboardExpand all lines: src/Dotnet.Script.Core/ScriptPublisher.cs
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory l
9696

9797
private string CreateScriptAssembly<TReturn, THost>(ScriptContext context, string outputDirectory, string assemblyFileName)
9898
{
99-
var emitResult = _scriptEmitter.Emit<TReturn, THost>(context);
99+
var assemblyName = Path.GetFileNameWithoutExtension(assemblyFileName);
100+
var emitResult = _scriptEmitter.Emit<TReturn, THost>(context, assemblyName);
100101
var assemblyPath = Path.Combine(outputDirectory, $"{assemblyFileName}.dll");
101102
using (var peFileStream = new FileStream(assemblyPath, FileMode.Create))
102103
using (emitResult.PeStream)

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

Copy file name to clipboardExpand all lines: src/Dotnet.Script.Tests/ScriptExecutionTests.cs
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public ScriptExecutionTests(ITestOutputHelper testOutputHelper)
2424
[Fact]
2525
public void ShouldExecuteHelloWorld()
2626
{
27-
var result = ScriptTestRunner.Default.ExecuteFixture("HelloWorld");
27+
var result = ScriptTestRunner.Default.ExecuteFixture("HelloWorld", "--no-cache");
2828
Assert.Contains("Hello World", result.output);
2929
}
3030

‎src/Dotnet.Script/Dotnet.Script.csproj

Copy file name to clipboardExpand all lines: src/Dotnet.Script/Dotnet.Script.csproj
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Dotnet CLI tool allowing you to run C# (CSX) scripts.</Description>
4-
<VersionPrefix>0.30.0</VersionPrefix>
4+
<VersionPrefix>0.30.1</VersionPrefix>
55
<Authors>filipw</Authors>
66
<PackageId>Dotnet.Script</PackageId>
77
<TargetFramework>netcoreapp2.1</TargetFramework>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.