diff --git a/Directory.Build.props b/Directory.Build.props index de8acf0..4ef4529 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 7.0.0 + 7.0.1 $(MSBuildThisFileDirectory)bin/$(Configuration)/ false diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props new file mode 100644 index 0000000..9c3ed46 --- /dev/null +++ b/samples/Directory.Build.props @@ -0,0 +1,7 @@ + + + + $(MSBuildThisFileDirectory)packages + $(MSBuildThisFileDirectory)../bin/$(Configuration)/ + + \ No newline at end of file diff --git a/samples/helloandroid/AndroidManifest.xml b/samples/helloandroid/AndroidManifest.xml new file mode 100644 index 0000000..3fead98 --- /dev/null +++ b/samples/helloandroid/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/samples/helloandroid/MainActivity.cs b/samples/helloandroid/MainActivity.cs new file mode 100644 index 0000000..728f3c1 --- /dev/null +++ b/samples/helloandroid/MainActivity.cs @@ -0,0 +1,13 @@ +namespace helloandroid; + +[Activity(Label = "@string/app_name", MainLauncher = true)] +public class MainActivity : Activity +{ + protected override void OnCreate(Bundle? savedInstanceState) + { + base.OnCreate(savedInstanceState); + + // Set our view from the "main" layout resource + SetContentView(Resource.Layout.activity_main); + } +} \ No newline at end of file diff --git a/samples/helloandroid/Resources/AboutResources.txt b/samples/helloandroid/Resources/AboutResources.txt new file mode 100644 index 0000000..219f425 --- /dev/null +++ b/samples/helloandroid/Resources/AboutResources.txt @@ -0,0 +1,44 @@ +Images, layout descriptions, binary blobs and string dictionaries can be included +in your application as resource files. Various Android APIs are designed to +operate on the resource IDs instead of dealing with images, strings or binary blobs +directly. + +For example, a sample Android app that contains a user interface layout (main.xml), +an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) +would keep its resources in the "Resources" directory of the application: + +Resources/ + drawable/ + icon.png + + layout/ + main.xml + + values/ + strings.xml + +In order to get the build system to recognize Android resources, set the build action to +"AndroidResource". The native Android APIs do not operate directly with filenames, but +instead operate on resource IDs. When you compile an Android application that uses resources, +the build system will package the resources for distribution and generate a class called "Resource" +(this is an Android convention) that contains the tokens for each one of the resources +included. For example, for the above Resources layout, this is what the Resource class would expose: + +public class Resource { + public class Drawable { + public const int icon = 0x123; + } + + public class Layout { + public const int main = 0x456; + } + + public class Strings { + public const int first_string = 0xabc; + public const int second_string = 0xbcd; + } +} + +You would then use Resource.Drawable.icon to reference the drawable/icon.png file, or +Resource.Layout.main to reference the layout/main.xml file, or Resource.Strings.first_string +to reference the first string in the dictionary file values/strings.xml. \ No newline at end of file diff --git a/samples/helloandroid/Resources/layout/activity_main.xml b/samples/helloandroid/Resources/layout/activity_main.xml new file mode 100644 index 0000000..f949852 --- /dev/null +++ b/samples/helloandroid/Resources/layout/activity_main.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/samples/helloandroid/Resources/mipmap-anydpi-v26/appicon.xml b/samples/helloandroid/Resources/mipmap-anydpi-v26/appicon.xml new file mode 100644 index 0000000..7751f69 --- /dev/null +++ b/samples/helloandroid/Resources/mipmap-anydpi-v26/appicon.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/samples/helloandroid/Resources/mipmap-anydpi-v26/appicon_round.xml b/samples/helloandroid/Resources/mipmap-anydpi-v26/appicon_round.xml new file mode 100644 index 0000000..7751f69 --- /dev/null +++ b/samples/helloandroid/Resources/mipmap-anydpi-v26/appicon_round.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/samples/helloandroid/Resources/mipmap-hdpi/appicon.png b/samples/helloandroid/Resources/mipmap-hdpi/appicon.png new file mode 100644 index 0000000..f97217f Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-hdpi/appicon.png differ diff --git a/samples/helloandroid/Resources/mipmap-hdpi/appicon_background.png b/samples/helloandroid/Resources/mipmap-hdpi/appicon_background.png new file mode 100644 index 0000000..513e69d Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-hdpi/appicon_background.png differ diff --git a/samples/helloandroid/Resources/mipmap-hdpi/appicon_foreground.png b/samples/helloandroid/Resources/mipmap-hdpi/appicon_foreground.png new file mode 100644 index 0000000..99d3a29 Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-hdpi/appicon_foreground.png differ diff --git a/samples/helloandroid/Resources/mipmap-mdpi/appicon.png b/samples/helloandroid/Resources/mipmap-mdpi/appicon.png new file mode 100644 index 0000000..76ceb98 Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-mdpi/appicon.png differ diff --git a/samples/helloandroid/Resources/mipmap-mdpi/appicon_background.png b/samples/helloandroid/Resources/mipmap-mdpi/appicon_background.png new file mode 100644 index 0000000..9e2d1e4 Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-mdpi/appicon_background.png differ diff --git a/samples/helloandroid/Resources/mipmap-mdpi/appicon_foreground.png b/samples/helloandroid/Resources/mipmap-mdpi/appicon_foreground.png new file mode 100644 index 0000000..a28d342 Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-mdpi/appicon_foreground.png differ diff --git a/samples/helloandroid/Resources/mipmap-xhdpi/appicon.png b/samples/helloandroid/Resources/mipmap-xhdpi/appicon.png new file mode 100644 index 0000000..83f089c Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-xhdpi/appicon.png differ diff --git a/samples/helloandroid/Resources/mipmap-xhdpi/appicon_background.png b/samples/helloandroid/Resources/mipmap-xhdpi/appicon_background.png new file mode 100644 index 0000000..658be3f Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-xhdpi/appicon_background.png differ diff --git a/samples/helloandroid/Resources/mipmap-xhdpi/appicon_foreground.png b/samples/helloandroid/Resources/mipmap-xhdpi/appicon_foreground.png new file mode 100644 index 0000000..70a542a Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-xhdpi/appicon_foreground.png differ diff --git a/samples/helloandroid/Resources/mipmap-xxhdpi/appicon.png b/samples/helloandroid/Resources/mipmap-xxhdpi/appicon.png new file mode 100644 index 0000000..988160a Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-xxhdpi/appicon.png differ diff --git a/samples/helloandroid/Resources/mipmap-xxhdpi/appicon_background.png b/samples/helloandroid/Resources/mipmap-xxhdpi/appicon_background.png new file mode 100644 index 0000000..9171c3e Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-xxhdpi/appicon_background.png differ diff --git a/samples/helloandroid/Resources/mipmap-xxhdpi/appicon_foreground.png b/samples/helloandroid/Resources/mipmap-xxhdpi/appicon_foreground.png new file mode 100644 index 0000000..cb63bfb Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-xxhdpi/appicon_foreground.png differ diff --git a/samples/helloandroid/Resources/mipmap-xxxhdpi/appicon.png b/samples/helloandroid/Resources/mipmap-xxxhdpi/appicon.png new file mode 100644 index 0000000..b65da5a Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-xxxhdpi/appicon.png differ diff --git a/samples/helloandroid/Resources/mipmap-xxxhdpi/appicon_background.png b/samples/helloandroid/Resources/mipmap-xxxhdpi/appicon_background.png new file mode 100644 index 0000000..1232d8c Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-xxxhdpi/appicon_background.png differ diff --git a/samples/helloandroid/Resources/mipmap-xxxhdpi/appicon_foreground.png b/samples/helloandroid/Resources/mipmap-xxxhdpi/appicon_foreground.png new file mode 100644 index 0000000..9f9c9e6 Binary files /dev/null and b/samples/helloandroid/Resources/mipmap-xxxhdpi/appicon_foreground.png differ diff --git a/samples/helloandroid/Resources/values/ic_launcher_background.xml b/samples/helloandroid/Resources/values/ic_launcher_background.xml new file mode 100644 index 0000000..6ec24e6 --- /dev/null +++ b/samples/helloandroid/Resources/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #2C3E50 + \ No newline at end of file diff --git a/samples/helloandroid/Resources/values/strings.xml b/samples/helloandroid/Resources/values/strings.xml new file mode 100644 index 0000000..d7e2331 --- /dev/null +++ b/samples/helloandroid/Resources/values/strings.xml @@ -0,0 +1,4 @@ + + helloandroid + Hello, Android! + diff --git a/samples/helloandroid/helloandroid.csproj b/samples/helloandroid/helloandroid.csproj new file mode 100644 index 0000000..6e889c6 --- /dev/null +++ b/samples/helloandroid/helloandroid.csproj @@ -0,0 +1,16 @@ + + + net7.0-android + 21 + Exe + enable + enable + com.mono.profiler.helloandroid + 1 + 1.0 + + + + + + \ No newline at end of file diff --git a/samples/hellomaui/hellomaui.csproj b/samples/hellomaui/hellomaui.csproj index e0c3b02..1dcf928 100644 --- a/samples/hellomaui/hellomaui.csproj +++ b/samples/hellomaui/hellomaui.csproj @@ -10,8 +10,6 @@ com.mono.profiler.hellomaui 1 21 - $(MSBuildThisFileDirectory)../packages - $(MSBuildThisFileDirectory)../../bin/$(Configuration)/ diff --git a/src/Mono.AotProfiler.Android/Mono.AotProfiler.Android.csproj b/src/Mono.AotProfiler.Android/Mono.AotProfiler.Android.csproj index 727a053..60bff00 100644 --- a/src/Mono.AotProfiler.Android/Mono.AotProfiler.Android.csproj +++ b/src/Mono.AotProfiler.Android/Mono.AotProfiler.Android.csproj @@ -1,6 +1,6 @@ - net6.0 + net7.0 true NU5128 Experimental support for recording custom AOT profiles in .NET 6 Android applications diff --git a/src/Mono.Profiler.Android/Mono.Profiler.Android.csproj b/src/Mono.Profiler.Android/Mono.Profiler.Android.csproj index ac20196..bf3ff7a 100644 --- a/src/Mono.Profiler.Android/Mono.Profiler.Android.csproj +++ b/src/Mono.Profiler.Android/Mono.Profiler.Android.csproj @@ -1,6 +1,6 @@ - net6.0 + net7.0 true NU5128 Experimental support for the Mono profiler in .NET 6 Android applications diff --git a/src/Mono.Profiler.Android/build/android-arm/libmono-profiler-log.so b/src/Mono.Profiler.Android/build/android-arm/libmono-profiler-log.so index 3d16f87..145f184 100644 Binary files a/src/Mono.Profiler.Android/build/android-arm/libmono-profiler-log.so and b/src/Mono.Profiler.Android/build/android-arm/libmono-profiler-log.so differ diff --git a/src/Mono.Profiler.Android/build/android-arm64/libmono-profiler-log.so b/src/Mono.Profiler.Android/build/android-arm64/libmono-profiler-log.so index b3256ee..ef49f08 100644 Binary files a/src/Mono.Profiler.Android/build/android-arm64/libmono-profiler-log.so and b/src/Mono.Profiler.Android/build/android-arm64/libmono-profiler-log.so differ diff --git a/src/Mono.Profiler.Android/build/android-x64/libmono-profiler-log.so b/src/Mono.Profiler.Android/build/android-x64/libmono-profiler-log.so index a378812..8232bb4 100644 Binary files a/src/Mono.Profiler.Android/build/android-x64/libmono-profiler-log.so and b/src/Mono.Profiler.Android/build/android-x64/libmono-profiler-log.so differ diff --git a/src/Mono.Profiler.Android/build/android-x86/libmono-profiler-log.so b/src/Mono.Profiler.Android/build/android-x86/libmono-profiler-log.so index a17eb0d..624f8bf 100644 Binary files a/src/Mono.Profiler.Android/build/android-x86/libmono-profiler-log.so and b/src/Mono.Profiler.Android/build/android-x86/libmono-profiler-log.so differ diff --git a/src/aotprofile-tool/aotprofile-tool.csproj b/src/aotprofile-tool/aotprofile-tool.csproj index 09003fa..768b822 100644 --- a/src/aotprofile-tool/aotprofile-tool.csproj +++ b/src/aotprofile-tool/aotprofile-tool.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net7.0 true Major