Skip to content

Commit 233e551

Browse files
[installer] add missing .pdb files to Xamarin.Android (#6799)
Partially fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1467817 Changes: dotnet/java-interop@cbd9666...aae23c9 * dotnet/java-interop@aae23c97: [Java.Interop] use $(DebugType)=portable (#958) * dotnet/java-interop@1987829f: [ci] Move CI builds to 1ES's hardened images. (#953) A warning is printed when building with `-p:MonoSymbolArchive=true`: Warning: Directory obj\Release\120\android\assets contains Java.Interop.dll but no debug symbols file was found. It turns out we are missing `Java.Interop.pdb` from our installer! Update to dotnet/java-interop@aae23c97, which allows `Java.Interop.pdb` to be built, and add `Java.Interop.pdb`, `Mono.Posix.pdb`, and `System.EnterpriseServices.pdb` to our `.vsix` installer.
1 parent 7e8cc34 commit 233e551

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

build-tools/installers/create-installers.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,13 @@
134134
<_FrameworkFiles Include="@(MonoProfileAssembly->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\%(Identity)')" />
135135
<_FrameworkFiles Include="@(MonoProfileAssemblySymbol->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\%(Identity)')" />
136136
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Java.Interop.dll" />
137+
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Java.Interop.pdb" />
137138
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Mono.Data.Sqlite.dll.config" />
138139
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Mono.Posix.dll" />
140+
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Mono.Posix.pdb" />
139141
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\RedistList\FrameworkList.xml" />
140142
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\System.EnterpriseServices.dll" />
143+
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\System.EnterpriseServices.pdb" />
141144
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Xamarin.Android.NUnitLite.dll" />
142145
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Xamarin.Android.NUnitLite.pdb" />
143146
<_FrameworkFilesWin Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\OpenTK-1.0.xml" />

external/Java.Interop

src/Mono.Android/Mono.Android.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
Properties="$(_GlobalProperties)"
3535
/>
3636
<ItemGroup>
37-
<Assembly Include="$(JavaInteropFullPath)\bin\$(Configuration)Net45\*.dll*" />
37+
<Assembly Include="$(JavaInteropFullPath)\bin\$(Configuration)Net45\*.dll" />
38+
<Assembly Include="$(JavaInteropFullPath)\bin\$(Configuration)Net45\*.pdb" />
3839
</ItemGroup>
3940
<Copy
4041
SourceFiles="@(Assembly)"

0 commit comments

Comments
 (0)