Skip to content

Commit 34f437d

Browse files
luhenryjonpryor
luhenry
authored and
jonpryor
committed
Bump to mono/2017-12/a0af42ab (#1263)
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=6339 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=6401 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=8477 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=19503 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=20562 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=31507 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=35661 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=40699 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=45893 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=49308 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=52675 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=53296 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56003 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56194 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57893 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57938 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58261 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58400 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58411 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58965 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59080 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59182 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59364 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59393 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59608 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59664 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59881 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59909 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59913 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59916 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59953 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59956 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59967 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60028 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60029 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60115 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60175 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60216 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60224 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60233 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60238 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60245 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60255 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60267 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60288 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60298 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60317 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60340 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60422 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60435 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60505 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60514 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60539 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60545 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60634 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60680 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60771 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60860 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60865 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60973 Context: https://bugzilla.xamarin.com/show_bug.cgi?id=61002 Bump minimum macOS Mono version to 5.10.0.47.
1 parent f279ad3 commit 34f437d

File tree

8 files changed

+73
-44
lines changed

8 files changed

+73
-44
lines changed

Diff for: ‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[submodule "external/mono"]
66
path = external/mono
77
url = https://github.com/mono/mono.git
8-
branch = 2017-10
8+
branch = 2017-12
99
[submodule "external/mxe"]
1010
path = external/mxe
1111
url = https://github.com/xamarin/mxe.git

Diff for: ‎Configuration.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
5555
<LlvmSourceDirectory Condition=" '$(LlvmSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\llvm</LlvmSourceDirectory>
5656
<MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
57-
<MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.8.0</MonoRequiredMinimumVersion>
58-
<MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">5.9.0</MonoRequiredMaximumVersion>
57+
<MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.10.0</MonoRequiredMinimumVersion>
58+
<MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">5.11.0</MonoRequiredMaximumVersion>
5959
<IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
6060
<MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).22</MonoRequiredDarwinMinimumVersion>
6161
<LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\mono\external\linker</LinkerSourceDirectory>

Diff for: ‎build-tools/dependencies/dependencies.projitems

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<_DarwinMonoFramework>MonoFramework-MDK-5.8.0.22.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
4+
<_DarwinMonoFramework>MonoFramework-MDK-5.10.0.47.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
55
<_AptGetInstall>apt-get -f -u install</_AptGetInstall>
66
</PropertyGroup>
77
<ItemGroup>
@@ -59,7 +59,7 @@
5959
<MaximumVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' Or '$(IgnoreMaxMonoVersion)' == 'False' " >$(MonoRequiredMaximumVersion)</MaximumVersion>
6060
<DarwinMinimumVersion>$(MonoRequiredDarwinMinimumVersion)</DarwinMinimumVersion>
6161
<CurrentVersionCommand>$(MSBuildThisFileDirectory)..\scripts\mono-version</CurrentVersionCommand>
62-
<DarwinMinimumUrl>https://bosstoragemirror.azureedge.net/wrench/mono-2017-10/7e/7e85cfa5d228cd5148e59cde1d4d663457f96966/$(_DarwinMonoFramework)</DarwinMinimumUrl>
62+
<DarwinMinimumUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2017-12/41/$(_DarwinMonoFramework)</DarwinMinimumUrl>
6363
<DarwinInstall>installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target /</DarwinInstall>
6464
</RequiredProgram>
6565
</ItemGroup>

Diff for: ‎build-tools/mono-runtimes/ProfileAssemblies.projitems

+5-2
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,11 @@
260260
<MonoTestAssembly Include="monodroid_System.Xml.Linq_test.dll">
261261
<SourcePath>System.Xml.Linq</SourcePath>
262262
</MonoTestAssembly>
263-
<MonoTestAssembly Include="nunitlite.dll">
264-
<SourcePath>lib/monodroid</SourcePath>
263+
<MonoTestAssembly Include="System.Runtime.CompilerServices.Unsafe.dll">
264+
<!-- This is referenced by monodroid_corlib_xunit-test.dll -->
265+
<SourcePath>System.Runtime.CompilerServices.Unsafe</SourcePath>
266+
<TestType>reference</TestType>
265267
</MonoTestAssembly>
268+
<MonoTestRunner Include="nunitlite.dll" />
266269
</ItemGroup>
267270
</Project>

Diff for: ‎build-tools/mono-runtimes/mono-runtimes.targets

+18-4
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@
5757
<_BclAssembly Include="@(MonoProfileAssembly)" />
5858
<_BclExcludeDebugSymbols Include="System.Windows.dll" />
5959
<_BclExcludeDebugSymbols Include="System.Xml.Serialization.dll" />
60-
<_BclTestAssemblySource Include="@(MonoTestAssembly->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Identity)')" />
61-
<_BclTestAssemblySource Include="@(MonoTestAssembly->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Filename).pdb')" />
6260
<_BclTestAssemblyDestination Include="@(MonoTestAssembly->'$(XAInstallPrefix)\..\..\bcl-tests\%(Identity)')" />
6361
<_BclTestAssemblyDestination Include="@(MonoTestAssembly->'$(XAInstallPrefix)\..\..\bcl-tests\%(Filename).pdb')" />
62+
<_BclTestAssemblyDestination Include="@(MonoTestRunner->'$(XAInstallPrefix)\..\..\bcl-tests\%(Identity)')" />
63+
<_BclTestAssemblyDestination Include="@(MonoTestRunner->'$(XAInstallPrefix)\..\..\bcl-tests\%(Filename).pdb')" />
6464
</ItemGroup>
6565
<ItemGroup>
6666
<_BclTestOutput Include="@(_BclTestAssemblyDestination)" />
@@ -335,12 +335,26 @@
335335
Command="make -C $(MonoSourceFullPath)\mcs\class\%(MonoTestAssembly.SourcePath) xunit-test-local"
336336
WorkingDirectory="$(MonoSourceFullPath)"
337337
/>
338+
339+
<ItemGroup>
340+
<_BclTestAssemblyReference Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == 'reference'" />
341+
<_BclTestAssemblyXUnit Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == 'xunit'" />
342+
<_BclTestAssemblyNUnit Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == ''" />
343+
<_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Identity)')" />
344+
<_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')" Condition="Exists('@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')')" />
345+
<_BclTestAssemblySource Include="@(_BclTestAssemblyXUnit->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Identity)')" />
346+
<_BclTestAssemblySource Include="@(_BclTestAssemblyXUnit->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Filename).pdb')" />
347+
<_BclTestAssemblySource Include="@(_BclTestAssemblyNUnit->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Identity)')" />
348+
<_BclTestAssemblySource Include="@(_BclTestAssemblyNUnit->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Filename).pdb')" />
349+
<_BclTestAssemblySource Include="@(MonoTestRunner->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Identity)')" />
350+
<_BclTestAssemblySource Include="@(MonoTestRunner->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')" />
351+
</ItemGroup>
338352
<Copy
339353
SourceFiles="@(_BclTestAssemblySource)"
340-
DestinationFiles="@(_BclTestAssemblyDestination)"
354+
DestinationFolder="$(XAInstallPrefix)\..\..\bcl-tests"
341355
/>
342356
<Touch
343-
Files="@(_BclTestAssemblyDestination)"
357+
Files="@(_BclTestAssemblySource->'$(XAInstallPrefix)\..\..\bcl-tests\%(Filename)%(Extension)')"
344358
/>
345359
<ItemGroup>
346360
<_BclTestContent Include="$(MonoSourceFullPath)\mcs\class\%(MonoTestAssembly.SourcePath)\Test\**\*.*" />

Diff for: ‎external/mono

Submodule mono updated 1888 files

Diff for: ‎src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj

+37-31
Original file line numberDiff line numberDiff line change
@@ -272,99 +272,105 @@
272272
<Compile Include="Tasks\ReadImportedLibrariesCache.cs" />
273273
<Compile Include="Utilities\XDocumentExtensions.cs" />
274274
<Compile Include="Linker\MonoDroid.Tuner\PreserveRuntimeSerialization.cs" />
275-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\Annotations.cs">
275+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\Annotations.cs">
276276
<Link>Linker\Mono.Linker\Annotations.cs</Link>
277277
</Compile>
278-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\AssemblyAction.cs">
278+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\AssemblyAction.cs">
279279
<Link>Linker\Mono.Linker\AssemblyAction.cs</Link>
280280
</Compile>
281-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\AssemblyResolver.cs">
281+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\AssemblyResolver.cs">
282282
<Link>Linker\Mono.Linker\AssemblyResolver.cs</Link>
283283
</Compile>
284-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\I18nAssemblies.cs">
284+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\I18nAssemblies.cs">
285285
<Link>Linker\Mono.Linker\I18nAssemblies.cs</Link>
286286
</Compile>
287-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\IXApiVisitor.cs">
287+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\IXApiVisitor.cs">
288288
<Link>Linker\Mono.Linker\IXApiVisitor.cs</Link>
289289
</Compile>
290-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\LinkContext.cs">
290+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\LinkContext.cs">
291291
<Link>Linker\Mono.Linker\LinkContext.cs</Link>
292292
</Compile>
293-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\MethodAction.cs">
293+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\MethodAction.cs">
294294
<Link>Linker\Mono.Linker\MethodAction.cs</Link>
295295
</Compile>
296-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\MethodReferenceExtensions.cs">
296+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\MethodReferenceExtensions.cs">
297297
<Link>Linker\Mono.Linker\MethodReferenceExtensions.cs</Link>
298298
</Compile>
299-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\Pipeline.cs">
299+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\Pipeline.cs">
300300
<Link>Linker\Mono.Linker\Pipeline.cs</Link>
301301
</Compile>
302-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\TypePreserve.cs">
302+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\TypePreserve.cs">
303303
<Link>Linker\Mono.Linker\TypePreserve.cs</Link>
304304
</Compile>
305-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\TypeReferenceExtensions.cs">
305+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\TypeReferenceExtensions.cs">
306306
<Link>Linker\Mono.Linker\TypeReferenceExtensions.cs</Link>
307307
</Compile>
308-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\XApiReader.cs">
308+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\XApiReader.cs">
309309
<Link>Linker\Mono.Linker\XApiReader.cs</Link>
310310
</Compile>
311-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\BlacklistStep.cs">
311+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\BlacklistStep.cs">
312312
<Link>Linker\Mono.Linker.Steps\BlacklistStep.cs</Link>
313313
</Compile>
314-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\BaseStep.cs">
314+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\BaseStep.cs">
315315
<Link>Linker\Mono.Linker.Steps\BaseStep.cs</Link>
316316
</Compile>
317-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\CleanStep.cs">
317+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\CleanStep.cs">
318318
<Link>Linker\Mono.Linker.Steps\CleanStep.cs</Link>
319319
</Compile>
320-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\IStep.cs">
320+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\IStep.cs">
321321
<Link>Linker\Mono.Linker.Steps\IStep.cs</Link>
322322
</Compile>
323-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\LoadI18nAssemblies.cs">
323+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\LoadI18nAssemblies.cs">
324324
<Link>Linker\Mono.Linker.Steps\LoadI18nAssemblies.cs</Link>
325325
</Compile>
326-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\LoadReferencesStep.cs">
326+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\LoadReferencesStep.cs">
327327
<Link>Linker\Mono.Linker.Steps\LoadReferencesStep.cs</Link>
328328
</Compile>
329-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\OutputStep.cs">
329+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\OutputStep.cs">
330330
<Link>Linker\Mono.Linker.Steps\OutputStep.cs</Link>
331331
</Compile>
332-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\RegenerateGuidStep.cs">
332+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\RegenerateGuidStep.cs">
333333
<Link>Linker\Mono.Linker.Steps\RegenerateGuidStep.cs</Link>
334334
</Compile>
335-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\ResolveFromAssemblyStep.cs">
335+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\ResolveFromAssemblyStep.cs">
336336
<Link>Linker\Mono.Linker.Steps\ResolveFromAssemblyStep.cs</Link>
337337
</Compile>
338-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\ResolveFromXApiStep.cs">
338+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\ResolveFromXApiStep.cs">
339339
<Link>Linker\Mono.Linker.Steps\ResolveFromXApiStep.cs</Link>
340340
</Compile>
341-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\ResolveFromXmlStep.cs">
341+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\ResolveFromXmlStep.cs">
342342
<Link>Linker\Mono.Linker.Steps\ResolveFromXmlStep.cs</Link>
343343
</Compile>
344-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\ResolveStep.cs">
344+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\ResolveStep.cs">
345345
<Link>Linker\Mono.Linker.Steps\ResolveStep.cs</Link>
346346
</Compile>
347-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\TypeMapStep.cs">
347+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\TypeMapStep.cs">
348348
<Link>Linker\Mono.Linker.Steps\TypeMapStep.cs</Link>
349349
</Compile>
350-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\SweepStep.cs">
350+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\SweepStep.cs">
351351
<Link>Linker\Mono.Linker.Steps\SweepStep.cs</Link>
352352
</Compile>
353-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker.Steps\MarkStep.cs">
353+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\MarkStep.cs">
354354
<Link>Linker\Mono.Linker.Steps\MarkStep.cs</Link>
355355
</Compile>
356-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\LoadException.cs">
356+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\LoadException.cs">
357357
<Link>Linker\Mono.Linker\LoadException.cs</Link>
358358
</Compile>
359-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\MarkException.cs">
359+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\MarkException.cs">
360360
<Link>Linker\Mono.Linker\MarkException.cs</Link>
361361
</Compile>
362-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\ConsoleLogger.cs">
362+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\ConsoleLogger.cs">
363363
<Link>Linker\Mono.Linker\ConsoleLogger.cs</Link>
364364
</Compile>
365-
<Compile Include="$(LinkerSourceFullPath)\linker\Mono.Linker\ILogger.cs">
365+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\ILogger.cs">
366366
<Link>Linker\Mono.Linker\ILogger.cs</Link>
367367
</Compile>
368+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\MarkingHelpers.cs">
369+
<Link>Linker\Mono.Linker\MarkingHelpers.cs</Link>
370+
</Compile>
371+
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\Tracer.cs">
372+
<Link>Linker\Mono.Linker\Tracer.cs</Link>
373+
</Compile>
368374
<Compile Include="Tasks\MergeResources.cs" />
369375
<Compile Include="Tasks\GetConvertedJavaLibraries.cs" />
370376
<Compile Include="Tasks\JavaCompileToolTask.cs" />

Diff for: ‎tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets

+7-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,14 @@
2828
<Exec
2929
Command="$(RemapAssemblyRefTool) &quot;%(_Source.Identity)&quot; &quot;$(IntermediateOutputPath)%(_Source.Filename)%(_Source.Extension)&quot; nunitlite &quot;$(_NUnit)&quot;"
3030
/>
31+
<ItemGroup>
32+
<_DebugSymbol
33+
Include="..\..\..\bin\$(Configuration)\bcl-tests\%(MonoTestAssembly.Filename).pdb"
34+
Condition="Exists('..\..\..\bin\$(Configuration)\bcl-tests\%(MonoTestAssembly.Filename).pdb')"
35+
/>
36+
</ItemGroup>
3137
<Copy
32-
SourceFiles="..\..\..\bin\$(Configuration)\bcl-tests\%(MonoTestAssembly.Filename).pdb"
38+
SourceFiles="@(_DebugSymbol)"
3339
DestinationFolder="$(IntermediateOutputPath)"
3440
/>
3541
</Target>

0 commit comments

Comments
 (0)