Commit7453587

authored

Merge pull requestdotnet#4536 from brettfo/windows-pdb

build portable PDBs from SDK projects and convert to Windows PDBs after build

2 parents351a481 +db7758f commit7453587Copy full SHA for 7453587

File tree

+24

-1

lines changed

+24

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`
`47`	`47`	`<!-- other-->`
`48`	`48`	`<PropertyGroup>`
`49`		`- <DebugType>full</DebugType>`
	`49`	`+ <DebugType>portable</DebugType>`
`50`	`50`	`<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>`
`51`	`51`	`<UseStandardResourceNames>false</UseStandardResourceNames>`
`52`	`52`	`<GenerateDocumentationFile>true</GenerateDocumentationFile>`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`</Target>`
`35`	`35`
`36`	`36`	`<ImportProject="build\targets\AssemblyVersions.props" />`
	`37`	`+ <ImportProject="build\targets\ConvertPortablePdbs.targets" />`
`37`	`38`	`<ImportProject="build\targets\GenerateAssemblyAttributes.targets" />`
`38`	`39`	`<ImportProject="build\targets\GenerateInternalsVisibleTo.targets" />`
`39`	`40`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`<addkey="api.nuget.org"value="https://api.nuget.org/v3/index.json" />`
`18`	`18`	`<addkey="myget.org roslyn tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />`
`19`	`19`	`<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn-for-vs-for-mac/api/v3/index.json" />`
	`20`	`+ <addkey="myget.org symreader-converter"value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />`
`20`	`21`	`</packageSources>`
`21`	`22`
`22`	`23`	`</configuration>`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,20 @@`
	`1`	`+<Project>`
	`2`	`+`
	`3`	`+ <ItemGroup>`
	`4`	`+ <PackageReferenceInclude="Microsoft.DiaSymReader.Pdb2Pdb"Version="$(MicrosoftDiaSymReaderPdb2PdbPackageVersion)" />`
	`5`	`+ </ItemGroup>`
	`6`	`+`
	`7`	`+ <TargetName="ConvertPortablePdbs"`
	`8`	`+AfterTargets="AfterBuild"`
	`9`	`+Condition="Exists('$(TargetPath)') AND ('$(DebugType)' == 'portable' OR '$(DebugType)' == 'embedded')">`
	`10`	`+ <PropertyGroup>`
	`11`	`+ <ConvertedPdbsDirectory>$(FinalOutputPath)\ConvertedPdbs</ConvertedPdbsDirectory>`
	`12`	`+ <PdbConverterExe>$(NuGetPackageRoot)Microsoft.DiaSymReader.Pdb2Pdb\$(MicrosoftDiaSymReaderPdb2PdbPackageVersion)\tools\Pdb2Pdb.exe</PdbConverterExe>`
	`13`	`+ <PdbConverterArgs>"$(TargetPath)" /out "$(ConvertedPdbsDirectory)\$(TargetName).pdb" /verbose /srcsvrvar SRC_INDEX=public</PdbConverterArgs>`
	`14`	`+ </PropertyGroup>`
	`15`	`+`
	`16`	`+ <MakeDirDirectories="$(ConvertedPdbsDirectory)" />`
	`17`	`+ <ExecCommand='"$(PdbConverterExe)" $(PdbConverterArgs)' />`
	`18`	`+ </Target>`
	`19`	`+`
	`20`	`+</Project>`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`
`49`	`49`	`<!-- other packages-->`
`50`	`50`	`<MicrosoftCompositionPackageVersion>1.0.30</MicrosoftCompositionPackageVersion>`
	`51`	`+ <MicrosoftDiaSymReaderPdb2PdbPackageVersion>1.1.0-roslyn-62714-01</MicrosoftDiaSymReaderPdb2PdbPackageVersion>`
`51`	`52`	`<MicrosoftMSXMLPackageVersion>8.0.0-alpha</MicrosoftMSXMLPackageVersion>`
`52`	`53`	`<MicrosoftVisualFSharpMSBuild150PackageVersion>1.0.1</MicrosoftVisualFSharpMSBuild150PackageVersion>`
`53`	`54`	`<NewtonsoftJsonPackageVersion>9.0.1</NewtonsoftJsonPackageVersion>`

Comments

(0)