huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update GenerateMPACK to capture PDBs. 

- VS Mac expects pdbs to sit side-by-side.

#1968
This commit is contained in:
N. Taylor Mullen 2018-02-05 15:10:48 -08:00
parent ba7f955afa
commit 83c31f611f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/MPack.targets
View File

@ -44,13 +44,12 @@
3. All language service binaries 3. All language service binaries
--> -->
<MakeDir Directories="$(MPackIntermediateOutputPath)" Condition="!Exists('$(MPackIntermediateOutputPath)')" /> <MakeDir Directories="$(MPackIntermediateOutputPath)" Condition="!Exists('$(MPackIntermediateOutputPath)')" />
<Delete Files="$(MPackOutputPath)" Condition="Exists('$(MPackOutputPath)')" /> <Delete Files="$(MPackOutputPath)" Condition="Exists('$(MPackOutputPath)')" />
<!-- We need to resolve the language service assemblies to generate an addin.info for the mpack --> <!-- We need to resolve the language service assemblies to generate an addin.info for the mpack -->
<XmlPeek XmlInputPath="$(MPackManifest)" Query="/ExtensionModel/Runtime/Import/@assembly"> <XmlPeek XmlInputPath="$(MPackManifest)" Query="/ExtensionModel/Runtime/Import/@assembly">
<Output TaskParameter="Result" ItemName="LanguageServiceAssemblies" /> <Output TaskParameter="Result" ItemName="LanguageServiceAssemblyNames" />
</XmlPeek> </XmlPeek>
<!-- We need to resolve the addin dependencies to generate an addin.info for the mpack --> <!-- We need to resolve the addin dependencies to generate an addin.info for the mpack -->
@ -61,7 +60,7 @@
<ItemGroup> <ItemGroup>
<AddinInfoLines Include="&lt;Addin id=&quot;$(AddinId)&quot; namespace=&quot;$(AddinNamespace)&quot; version=&quot;$(AddinVersion)&quot; name=&quot;$(AddinDetailedName)&quot; author=&quot;$(Authors)&quot; description=&quot;$(Description)&quot; category=&quot;$(AddinCategory)&quot;&gt;" /> <AddinInfoLines Include="&lt;Addin id=&quot;$(AddinId)&quot; namespace=&quot;$(AddinNamespace)&quot; version=&quot;$(AddinVersion)&quot; name=&quot;$(AddinDetailedName)&quot; author=&quot;$(Authors)&quot; description=&quot;$(Description)&quot; category=&quot;$(AddinCategory)&quot;&gt;" />
<AddinInfoLines Include=" &lt;Runtime&gt;" /> <AddinInfoLines Include=" &lt;Runtime&gt;" />
<AddinInfoLines Include=" &lt;Import assembly=&quot;%(LanguageServiceAssemblies.Identity)&quot; /&gt;" /> <AddinInfoLines Include=" &lt;Import assembly=&quot;%(LanguageServiceAssemblyNames.Identity)&quot; /&gt;" />
<AddinInfoLines Include=" &lt;Import assembly=&quot;$(AddinName).dll&quot; /&gt;" /> <AddinInfoLines Include=" &lt;Import assembly=&quot;$(AddinName).dll&quot; /&gt;" />
<AddinInfoLines Include=" &lt;/Runtime&gt;" /> <AddinInfoLines Include=" &lt;/Runtime&gt;" />
<AddinInfoLines Include=" &lt;Dependencies&gt;" /> <AddinInfoLines Include=" &lt;Dependencies&gt;" />
@ -70,10 +69,17 @@
<AddinInfoLines Include="&lt;/Addin&gt;" /> <AddinInfoLines Include="&lt;/Addin&gt;" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<LanguageServiceAssemblies Include="$(LanguageServiceOutputPath)%(LanguageServiceAssemblyNames.Identity)" />
<LanguageServicePDBs Include="%(LanguageServiceAssemblies.RootDir)%(Directory)%(FileName).pdb" Condition="Exists('%(LanguageServiceAssemblies.RootDir)%(Directory)%(FileName).pdb')" />
</ItemGroup>
<!-- Generate the addin.info and gather sources for mpack zipping--> <!-- Generate the addin.info and gather sources for mpack zipping-->
<WriteLinesToFile File="$(AddinInfoFilePath)" Lines="@(AddinInfoLines)" Overwrite="true" /> <WriteLinesToFile File="$(AddinInfoFilePath)" Lines="@(AddinInfoLines)" Overwrite="true" />
<Copy SourceFiles="$(LanguageServiceOutputPath)\%(LanguageServiceAssemblies.Identity)" DestinationFolder="$(MPackIntermediateOutputPath)" /> <Copy SourceFiles="%(LanguageServiceAssemblies.Identity)" DestinationFolder="$(MPackIntermediateOutputPath)" />
<Copy SourceFiles="%(LanguageServicePDBs.Identity)" DestinationFolder="$(MPackIntermediateOutputPath)" />
<Copy SourceFiles="$(AddinOutputPath)$(AddinName).dll" DestinationFolder="$(MPackIntermediateOutputPath)" /> <Copy SourceFiles="$(AddinOutputPath)$(AddinName).dll" DestinationFolder="$(MPackIntermediateOutputPath)" />
<Copy SourceFiles="$(AddinOutputPath)$(AddinName).pdb" DestinationFolder="$(MPackIntermediateOutputPath)" />
<ItemGroup> <ItemGroup>
<MPackFiles Include="$(MPackIntermediateOutputPath)\*" /> <MPackFiles Include="$(MPackIntermediateOutputPath)\*" />