Skip to content

Commit f4de2e0

Browse files
committed
Merge branch 'main' into dev/grendel/llvmir
* main: [xabuild] Remove xabuild, unused pipelines (#8720) Bump to xamarin/LibZipSharp/3.1.1@7abbbf4 (#8723) Bump to xamarin/java.interop/main@7d1e705 (#8722)
2 parents 3070fbf + e987ac4 commit f4de2e0

File tree

20 files changed

+3
-2162
lines changed

20 files changed

+3
-2162
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,3 @@
6464
/tools/jit-times @jonpryor
6565
/tools/setup-windows @jonathanpeppers @jonpryor
6666
/tools/tmt @grendello
67-
/tools/xabuild @jonathanpeppers @jonpryor

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<!-- Common <PackageReference/> versions -->
4343
<PropertyGroup>
44-
<LibZipSharpVersion>3.0.0</LibZipSharpVersion>
44+
<LibZipSharpVersion>3.1.1</LibZipSharpVersion>
4545
<MicroBuildCoreVersion>1.0.0</MicroBuildCoreVersion>
4646
<MonoCecilVersion>0.11.4</MonoCecilVersion>
4747
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>

Documentation/guides/profiling.md

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -517,47 +517,3 @@ in the build output window.
517517
518518
[projectsystemtools]: https://marketplace.visualstudio.com/items?itemName=VisualStudioProductTeam.ProjectSystemTools
519519
[diagnostic]: https://docs.microsoft.com/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output
520-
521-
## Profiling MSBuild with the Mono Profiler
522-
523-
Similiar to how you can [use the Mono Profiler](#profiling-managed-code)
524-
on Android, you can also profile MSBuild with `mono --profile`. With a
525-
local build of xamarin-android on macOS, you can run:
526-
527-
$ mono --profile=log:calls,alloc ./bin/Release/bin/xabuild.exe YourProject.csproj
528-
529-
`xabuild.exe` is a tool for running MSBuild using your local
530-
xamarin-android working tree. I would also recommend using a `Release`
531-
build of Xamarin.Android when profiling.
532-
533-
This will create an `output.mlpd` file in the current directory. To
534-
view its contents:
535-
536-
$ mprof-report output.mlpd
537-
538-
This will display output such as:
539-
540-
Allocation summary
541-
Bytes Count Average Type name
542-
165520032 19363 8548 System.Byte[]
543-
28813336 432701 66 System.String
544-
545-
Method call summary
546-
Total(ms) Self(ms) Calls Method name
547-
139368 1 703 (wrapper runtime-invoke) object:runtime_invoke_void__this__ (object,intptr,intptr,intptr)
548-
132472 132472 287 (wrapper managed-to-native) System.Threading.WaitHandle:Wait_internal (intptr*,int,bool,int)
549-
71685 2 2 Microsoft.Build.BackEnd.RequestBuilder/DedicatedThreadsTaskScheduler:<InjectThread>b__6_0 ()
550-
551-
> NOTE: I've hit an error in the past such as: `unhandled profiler
552-
> event: 0x6f at file offset: 3095192 + 60144 (len: 62655)`. Sometimes
553-
> I have just tried again, making sure I'm profiling a `Release` build.
554-
555-
You can also get stacktrace information:
556-
557-
$ mprof-report --traces output.mlpd > output.txt
558-
559-
I would recomment redirecting this output to a file, as it can
560-
generate text well over 100MB!
561-
562-
See the [Mono documentation][mono_docs] for more details about the
563-
profiler.

Makefile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -117,18 +117,6 @@ ifneq ($(PACKAGES),)
117117
APK_TESTS_PROP = /p:ApkTests='"$(PACKAGES)"'
118118
endif
119119

120-
run-apk-tests:
121-
_r=0 ; \
122-
$(call MSBUILD_BINLOG,run-apk-tests,,Test) $(TEST_TARGETS) /t:RunApkTests /p:RunApkTestsTarget=RunPerformanceApkTests $(APK_TESTS_PROP) || _r=1 ; \
123-
$(call MSBUILD_BINLOG,run-apk-tests,,Test) $(TEST_TARGETS) /t:RunApkTests $(APK_TESTS_PROP) || _r=1 ; \
124-
exit $$_r
125-
126-
run-performance-tests:
127-
_r=0 ; \
128-
$(call MSBUILD_BINLOG,run-apk-tests,,Test) $(TEST_TARGETS) /t:RunApkTests /p:RunApkTestsTarget=RunPerformanceApkTests $(APK_TESTS_PROP) || _r=1 ; \
129-
$(call MSBUILD_BINLOG,run-performance-tests,,Test) $(TEST_TARGETS) /t:RunPerformanceTests || _r=1 ; \
130-
exit $$_r
131-
132120
list-nunit-tests:
133121
$(MSBUILD) $(MSBUILD_FLAGS) $(TEST_TARGETS) /t:ListNUnitTests
134122

before.Xamarin.Android.sln.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<Import Project="$(MSBuildThisFileDirectory)build-tools\scripts\DotNet.targets" />
44
<Import Project="$(MSBuildThisFileDirectory)build-tools\scripts\ImportExportDocs.targets" />
55
<Import Project="$(MSBuildThisFileDirectory)build-tools\scripts\PrepareWindows.targets" Condition=" '$(OS)' == 'Windows_NT' " />
6-
<Import Project="$(MSBuildThisFileDirectory)build-tools\scripts\RunTests.targets" />
76
<Import Project="$(MSBuildThisFileDirectory)tests\api-compatibility\api-compatibility.targets" />
87
</Project>

build-tools/automation/azure-pipelines-oss.yaml

Lines changed: 0 additions & 201 deletions
This file was deleted.

0 commit comments

Comments
 (0)