Skip to content

Preserve Portable PDB embedded in the DLL. Update the dependencies to… #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WenningQiu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve Portable PDB embedded in the DLL. Update the dependencies to… #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions InjectModuleInitializer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>EinarEgilsson.Utilities.InjectModuleInitializer</RootNamespace>
<AssemblyName>InjectModuleInitializer</AssemblyName>
<TargetFramework>net35</TargetFramework>
<TargetFramework>net40</TargetFramework>
<DefaultItemExcludes>*.binlog;Test\**\*.*;nuget\**\*.*</DefaultItemExcludes>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand All @@ -26,8 +26,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Mono.Cecil" Version="0.10.0" PrivateAssets="all" />
<PackageReference Include="GitInfo" Version="2.0.10" PrivateAssets="all" />
<PackageReference Include="Mono.Cecil" Version="0.11.4" PrivateAssets="all" />
<PackageReference Include="GitInfo" Version="2.2.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
25 changes: 15 additions & 10 deletions Injector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,16 @@ private void InjectInitializer(MethodReference callee)
private void WriteAssembly(string assemblyFile, string keyfile)
{
Debug.Assert(Assembly != null);
var writeParams = new WriterParameters();
var writeParams = new WriterParameters()
{
WriteSymbols = true, // this takes care of embedded Portable PDB
};

if (PdbFile(assemblyFile) != null)
{
writeParams.WriteSymbols = true;
writeParams.SymbolWriterProvider = new PdbWriterProvider();
}

if (keyfile != null)
{
writeParams.StrongNameKeyPair = new StrongNameKeyPair(File.ReadAllBytes(keyfile));
Expand All @@ -106,19 +110,20 @@ private void ReadAssembly(string assemblyFile)
Debug.Assert(Assembly == null);

var resolver = new DefaultAssemblyResolver();
resolver.AddSearchDirectory(Path.GetDirectoryName(assemblyFile));
resolver.AddSearchDirectory(Path.GetDirectoryName(assemblyFile));

var readParams = new ReaderParameters(ReadingMode.Immediate)
{
AssemblyResolver = resolver,
InMemory = true,
ReadSymbols = true, // this takes care of embedded Portable PDB
};

var readParams = new ReaderParameters(ReadingMode.Immediate)
{
AssemblyResolver = resolver,
InMemory = true
};

if (PdbFile(assemblyFile) != null)
{
readParams.ReadSymbols = true;
readParams.SymbolReaderProvider = new PdbReaderProvider();
}

Assembly = AssemblyDefinition.ReadAssembly(assemblyFile, readParams);
}

Expand Down