Skip to content

Commit

Permalink
Merge branch 'main' into dev/grendel/blobs-in-lib
Browse files Browse the repository at this point in the history
* main:
  [xabuild] Remove xabuild, unused pipelines (#8720)
  Bump to xamarin/LibZipSharp/3.1.1@7abbbf4 (#8723)
  Bump to xamarin/java.interop/main@7d1e705 (#8722)
  • Loading branch information
grendello committed Feb 16, 2024
2 parents 3c1da09 + e987ac4 commit b5b618c
Show file tree
Hide file tree
Showing 20 changed files with 3 additions and 2,162 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,3 @@
/tools/jit-times @jonpryor
/tools/setup-windows @jonathanpeppers @jonpryor
/tools/tmt @grendello
/tools/xabuild @jonathanpeppers @jonpryor
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

<!-- Common <PackageReference/> versions -->
<PropertyGroup>
<LibZipSharpVersion>3.0.0</LibZipSharpVersion>
<LibZipSharpVersion>3.1.1</LibZipSharpVersion>
<MicroBuildCoreVersion>1.0.0</MicroBuildCoreVersion>
<MonoCecilVersion>0.11.4</MonoCecilVersion>
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
Expand Down
44 changes: 0 additions & 44 deletions Documentation/guides/profiling.md
Original file line number Diff line number Diff line change
Expand Up @@ -517,47 +517,3 @@ in the build output window.
[projectsystemtools]: https://marketplace.visualstudio.com/items?itemName=VisualStudioProductTeam.ProjectSystemTools
[diagnostic]: https://docs.microsoft.com/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output
## Profiling MSBuild with the Mono Profiler
Similiar to how you can [use the Mono Profiler](#profiling-managed-code)
on Android, you can also profile MSBuild with `mono --profile`. With a
local build of xamarin-android on macOS, you can run:
$ mono --profile=log:calls,alloc ./bin/Release/bin/xabuild.exe YourProject.csproj
`xabuild.exe` is a tool for running MSBuild using your local
xamarin-android working tree. I would also recommend using a `Release`
build of Xamarin.Android when profiling.
This will create an `output.mlpd` file in the current directory. To
view its contents:
$ mprof-report output.mlpd
This will display output such as:
Allocation summary
Bytes Count Average Type name
165520032 19363 8548 System.Byte[]
28813336 432701 66 System.String
Method call summary
Total(ms) Self(ms) Calls Method name
139368 1 703 (wrapper runtime-invoke) object:runtime_invoke_void__this__ (object,intptr,intptr,intptr)
132472 132472 287 (wrapper managed-to-native) System.Threading.WaitHandle:Wait_internal (intptr*,int,bool,int)
71685 2 2 Microsoft.Build.BackEnd.RequestBuilder/DedicatedThreadsTaskScheduler:<InjectThread>b__6_0 ()
> NOTE: I've hit an error in the past such as: `unhandled profiler
> event: 0x6f at file offset: 3095192 + 60144 (len: 62655)`. Sometimes
> I have just tried again, making sure I'm profiling a `Release` build.
You can also get stacktrace information:
$ mprof-report --traces output.mlpd > output.txt
I would recomment redirecting this output to a file, as it can
generate text well over 100MB!
See the [Mono documentation][mono_docs] for more details about the
profiler.
12 changes: 0 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -117,18 +117,6 @@ ifneq ($(PACKAGES),)
APK_TESTS_PROP = /p:ApkTests='"$(PACKAGES)"'
endif

run-apk-tests:
_r=0 ; \
$(call MSBUILD_BINLOG,run-apk-tests,,Test) $(TEST_TARGETS) /t:RunApkTests /p:RunApkTestsTarget=RunPerformanceApkTests $(APK_TESTS_PROP) || _r=1 ; \
$(call MSBUILD_BINLOG,run-apk-tests,,Test) $(TEST_TARGETS) /t:RunApkTests $(APK_TESTS_PROP) || _r=1 ; \
exit $$_r

run-performance-tests:
_r=0 ; \
$(call MSBUILD_BINLOG,run-apk-tests,,Test) $(TEST_TARGETS) /t:RunApkTests /p:RunApkTestsTarget=RunPerformanceApkTests $(APK_TESTS_PROP) || _r=1 ; \
$(call MSBUILD_BINLOG,run-performance-tests,,Test) $(TEST_TARGETS) /t:RunPerformanceTests || _r=1 ; \
exit $$_r

list-nunit-tests:
$(MSBUILD) $(MSBUILD_FLAGS) $(TEST_TARGETS) /t:ListNUnitTests

Expand Down
1 change: 0 additions & 1 deletion before.Xamarin.Android.sln.targets
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
<Import Project="$(MSBuildThisFileDirectory)build-tools\scripts\DotNet.targets" />
<Import Project="$(MSBuildThisFileDirectory)build-tools\scripts\ImportExportDocs.targets" />
<Import Project="$(MSBuildThisFileDirectory)build-tools\scripts\PrepareWindows.targets" Condition=" '$(OS)' == 'Windows_NT' " />
<Import Project="$(MSBuildThisFileDirectory)build-tools\scripts\RunTests.targets" />
<Import Project="$(MSBuildThisFileDirectory)tests\api-compatibility\api-compatibility.targets" />
</Project>
201 changes: 0 additions & 201 deletions build-tools/automation/azure-pipelines-oss.yaml

This file was deleted.

Loading

0 comments on commit b5b618c

Please sign in to comment.