MasterBranch version -- Convert PDBS for portable PDBS (#6172)

* Convert PDBS for portable PDBS

* Typo

* Tweaks

build/targets/ConvertPortablePdbs.targets

@@ -7,16 +7,18 @@
   <Target Name="ConvertPortablePdbs"
           AfterTargets="AfterBuild"
           Condition="'$(OS)' != 'Unix' AND
+                     '$(SkipPDBConversion)' != 'true' AND
                      Exists('$(TargetPath)') AND
                      ('$(DebugType)' == 'portable' OR '$(DebugType)' == 'embedded') AND
-                     $(TargetFramework.StartsWith('net4')) AND
+                     $(TargetFramework.StartsWith('net')) AND
                      '$(Configuration)' != 'Proto'">
     <PropertyGroup>
+      <ConvertedPdbsDirectory>$(SymStoreDirectory)\$(TargetFramework)</ConvertedPdbsDirectory>
       <PdbConverterExe>$(NuGetPackageRoot)Pdb2Pdb\$(Pdb2PdbPackageVersion)\tools\Pdb2Pdb.exe</PdbConverterExe>
-      <PdbConverterArgs>"$(TargetPath)" /out "$(SymStoreDirectory)\$(TargetName).pdb" /srcsvrvar SRC_INDEX=public</PdbConverterArgs>
+      <PdbConverterArgs>"$(TargetPath)" /out "$(ConvertedPdbsDirectory)\$(TargetName).pdb" /srcsvrvar SRC_INDEX=public</PdbConverterArgs>
     </PropertyGroup>
 
-    <MakeDir Directories="$(SymStoreDirectory)" />
+    <MakeDir Directories="$(ConvertedPdbsDirectory)" />
     <Exec Command='"$(PdbConverterExe)" $(PdbConverterArgs)' />
   </Target>
 

src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj

@@ -14,6 +14,7 @@
     <UseFSharpProductVersion>true</UseFSharpProductVersion>
     <UseAssetTargetFallback>true</UseAssetTargetFallback>
     <Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
+    <SkipPDBConversion>true</SkipPDBConversion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net46' AND '$(OS)' == 'Windows_NT'">