Use assembly name as symbol path name

seesharper · seesharper · commit 65906ab7eb3e · 2019-07-04T22:53:56.000+02:00
diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>A cross platform library allowing you to run C# (CSX) scripts with support for debugging and inline NuGet packages. Based on Roslyn.</Description>
-    <VersionPrefix>0.30.0</VersionPrefix>
+    <VersionPrefix>0.30.1</VersionPrefix>
     <Authors>filipw</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>Dotnet.Script.Core</AssemblyName>
diff --git a/src/Dotnet.Script.Core/ScriptEmitter.cs b/src/Dotnet.Script.Core/ScriptEmitter.cs
@@ -18,7 +18,7 @@ public ScriptEmitter(ScriptConsole scriptConsole, ScriptCompiler scriptCompiler)
             _scriptCompiler = scriptCompiler;
         }
 
-        public virtual ScriptEmitResult Emit<TReturn, THost>(ScriptContext context)
+        public virtual ScriptEmitResult Emit<TReturn, THost>(ScriptContext context, string assemblyName)
         {
             var compilationContext = _scriptCompiler.CreateCompilationContext<TReturn, THost>(context);
             foreach (var warning in compilationContext.Warnings)
@@ -43,7 +43,9 @@ public virtual ScriptEmitResult Emit<TReturn, THost>(ScriptContext context)
             if (context.OptimizationLevel == Microsoft.CodeAnalysis.OptimizationLevel.Debug)
             {
                 emitOptions = new EmitOptions()
-                    .WithDebugInformationFormat(DebugInformationFormat.Embedded);
+                    .WithDebugInformationFormat(DebugInformationFormat.Embedded)
+                    .WithPdbFilePath($"{assemblyName}.pdb");
+
             }
 
             var result = compilation.Emit(peStream, options: emitOptions);
diff --git a/src/Dotnet.Script.Core/ScriptPublisher.cs b/src/Dotnet.Script.Core/ScriptPublisher.cs
@@ -96,7 +96,8 @@ public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory l
 
         private string CreateScriptAssembly<TReturn, THost>(ScriptContext context, string outputDirectory, string assemblyFileName)
         {
-            var emitResult = _scriptEmitter.Emit<TReturn, THost>(context);
+            var assemblyName = Path.GetFileNameWithoutExtension(assemblyFileName);
+            var emitResult = _scriptEmitter.Emit<TReturn, THost>(context, assemblyName);
             var assemblyPath = Path.Combine(outputDirectory, $"{assemblyFileName}.dll");
             using (var peFileStream = new FileStream(assemblyPath, FileMode.Create))
             using (emitResult.PeStream)
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -24,7 +24,7 @@ public ScriptExecutionTests(ITestOutputHelper testOutputHelper)
         [Fact]
         public void ShouldExecuteHelloWorld()
         {
-            var result = ScriptTestRunner.Default.ExecuteFixture("HelloWorld");
+            var result = ScriptTestRunner.Default.ExecuteFixture("HelloWorld", "--no-cache");
             Assert.Contains("Hello World", result.output);
         }
 
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>Dotnet CLI tool allowing you to run C# (CSX) scripts.</Description>
-        <VersionPrefix>0.30.0</VersionPrefix>
+        <VersionPrefix>0.30.1</VersionPrefix>
         <Authors>filipw</Authors>
         <PackageId>Dotnet.Script</PackageId>
         <TargetFramework>netcoreapp2.1</TargetFramework>

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public ScriptEmitter(ScriptConsole scriptConsole, ScriptCompiler scriptCompiler)`
`18`	`18`	`_scriptCompiler = scriptCompiler;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public virtual ScriptEmitResult Emit<TReturn, THost>(ScriptContext context)`
	`21`	`+ public virtual ScriptEmitResult Emit<TReturn, THost>(ScriptContext context, string assemblyName)`
`22`	`22`	`{`
`23`	`23`	`var compilationContext = _scriptCompiler.CreateCompilationContext<TReturn, THost>(context);`
`24`	`24`	`foreach (var warning in compilationContext.Warnings)`
`@@ -43,7 +43,9 @@ public virtual ScriptEmitResult Emit<TReturn, THost>(ScriptContext context)`
`43`	`43`	`if (context.OptimizationLevel == Microsoft.CodeAnalysis.OptimizationLevel.Debug)`
`44`	`44`	`{`
`45`	`45`	`emitOptions = new EmitOptions()`
`46`		`- .WithDebugInformationFormat(DebugInformationFormat.Embedded);`
	`46`	`+ .WithDebugInformationFormat(DebugInformationFormat.Embedded)`
	`47`	`+ .WithPdbFilePath($"{assemblyName}.pdb");`
	`48`	`+`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`var result = compilation.Emit(peStream, options: emitOptions);`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,8 @@ public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory l`
`96`	`96`
`97`	`97`	`private string CreateScriptAssembly<TReturn, THost>(ScriptContext context, string outputDirectory, string assemblyFileName)`
`98`	`98`	`{`
`99`		`- var emitResult = _scriptEmitter.Emit<TReturn, THost>(context);`
	`99`	`+ var assemblyName = Path.GetFileNameWithoutExtension(assemblyFileName);`
	`100`	`+ var emitResult = _scriptEmitter.Emit<TReturn, THost>(context, assemblyName);`
`100`	`101`	`var assemblyPath = Path.Combine(outputDirectory, $"{assemblyFileName}.dll");`
`101`	`102`	`using (var peFileStream = new FileStream(assemblyPath, FileMode.Create))`
`102`	`103`	`using (emitResult.PeStream)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public ScriptExecutionTests(ITestOutputHelper testOutputHelper)`
`24`	`24`	`[Fact]`
`25`	`25`	`public void ShouldExecuteHelloWorld()`
`26`	`26`	`{`
`27`		`- var result = ScriptTestRunner.Default.ExecuteFixture("HelloWorld");`
	`27`	`+ var result = ScriptTestRunner.Default.ExecuteFixture("HelloWorld", "--no-cache");`
`28`	`28`	`Assert.Contains("Hello World", result.output);`
`29`	`29`	`}`
`30`	`30`