Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions Documentation/workflow/HowToAddNewApiLevel.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,17 +111,28 @@ For the new API level, you need:

Then update the following files:

- Add new `AndroidPlatform` value to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs):

```csharp
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.0", framework: "v16.1", stable: false),
- Add a new `<AndroidApiInfo>` entry to
[`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems):

```xml
<AndroidApiInfo Include="v16.1">
<Name>CANARY</Name>
<Level>36</Level>
<VersionCodeFull>36.1</VersionCodeFull>
<Id>36.1</Id>
<Stable>True</Stable>
</AndroidApiInfo>
```

TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?
`Include` is the binding framework version (e.g. `v16.1`). `Level` is the
integer API level (`Major` of `VersionCodeFull`). `Id` is the platform ID
used to locate `android-$(Id)` directories under the Android SDK. `Stable`
should be `True`; every entry currently in the projitems uses `True`,
including preview codenames like CANARY. (Setting it to `False` would
exclude the entry from being picked as the default stable framework
version by some build-time selection logic.)

What are `include` and `framework` used for?
TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?

- Add new level to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs):
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace Xamarin.Android.Tools.BootstrapTasks
public class GenerateSupportedPlatforms : Task
{
/// <summary>
/// @(AndroidApiInfo) from .\bin\Build$(Configuration)\Mono.Android.Apis.projitems
/// @(AndroidApiInfo) from src\Mono.Android\Mono.Android.Apis.projitems
/// </summary>
[Required]
public ITaskItem [] AndroidApiInfo { get; set; } = [];
Expand Down
2 changes: 1 addition & 1 deletion build-tools/create-android-api/create-android-api.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
</PropertyGroup>

<Import Project="..\..\Configuration.props" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')"/>
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />

<ItemGroup>
<ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
Expand Down
2 changes: 1 addition & 1 deletion build-tools/installers/create-installers.targets
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<Import Project="..\scripts\XAVersionInfo.targets" />
<Import Project="..\scripts\LocalizationLanguages.projitems" />
<Import Project="..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems')" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')" />
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" TaskFactory="TaskHostFactory" Runtime="NET" />
<PropertyGroup>
<FrameworkSrcDir>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\</FrameworkSrcDir>
Expand Down
5 changes: 2 additions & 3 deletions build-tools/xaprepare/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,9 +101,8 @@ The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndDa
helper methods used throughout the preparation utility code. **Be very careful** when modifying the names there as it may
break the build!
- [BuildAndroidPlatforms.cs](xaprepare/ConfigAndData/BuildAndroidPlatforms.cs)
Modified whenever a new Android platform is added, this file names all of the Android API levels along with platform/API
identifiers and .NET for Android framework names corresponding to specific API levels. The file also contains specification
of minimum NDK API levels used for all the Android device targets.
Contains the NDK release/revision constants and the minimum NDK API levels used for all the Android device targets.
The Android API level list itself lives in [`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems).
- [CommonLicenses.cs](xaprepare/ConfigAndData/CommonLicenses.cs)
A file with constants containing paths to licenses commonly used by software .NET for Android uses. The licenses are used
when generating Third Party Notices.
Expand Down
53 changes: 0 additions & 53 deletions build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs

This file was deleted.

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;

namespace Xamarin.Android.Prepare
{
Expand All@@ -10,47 +9,5 @@ class BuildAndroidPlatforms

public static string NdkMinimumAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel);
public static string NdkMinimumAPILegacy32 => NdkMinimumAPI;

public static readonly List<AndroidPlatform> AllPlatforms = new List<AndroidPlatform> {
new AndroidPlatform (apiName: "", apiLevel: 1, platformID: "1"),
new AndroidPlatform (apiName: "", apiLevel: 2, platformID: "2"),
new AndroidPlatform (apiName: "", apiLevel: 3, platformID: "3"),
new AndroidPlatform (apiName: "Donut", apiLevel: 4, platformID: "4", include: "v1.6"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 5, platformID: "5", include: "v2.0"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 6, platformID: "6", include: "v2.0.1"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 7, platformID: "7", include: "v2.1"),
new AndroidPlatform (apiName: "Froyo", apiLevel: 8, platformID: "8", include: "v2.2"),
new AndroidPlatform (apiName: "", apiLevel: 9, platformID: "9"),
new AndroidPlatform (apiName: "Gingerbread", apiLevel: 10, platformID: "10", include: "v2.3"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 11, platformID: "11", include: "v3.0"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 12, platformID: "12", include: "v3.1"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 13, platformID: "13", include: "v3.2"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 14, platformID: "14", include: "v4.0"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 15, platformID: "15", include: "v4.0.3"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 16, platformID: "16", include: "v4.1"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 17, platformID: "17", include: "v4.2"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 18, platformID: "18", include: "v4.3"),
new AndroidPlatform (apiName: "Kit Kat", apiLevel: 19, platformID: "19", include: "v4.4"),
new AndroidPlatform (apiName: "Kit Kat + Wear support", apiLevel: 20, platformID: "20", include: "v4.4.87"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 21, platformID: "21", include: "v5.0"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 22, platformID: "22", include: "v5.1"),
new AndroidPlatform (apiName: "Marshmallow", apiLevel: 23, platformID: "23", include: "v6.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 24, platformID: "24", include: "v7.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 25, platformID: "25", include: "v7.1"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 26, platformID: "26", include: "v8.0"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 27, platformID: "27", include: "v8.1"),
new AndroidPlatform (apiName: "Pie", apiLevel: 28, platformID: "28", include: "v9.0"),
new AndroidPlatform (apiName: "Q", apiLevel: 29, platformID: "29", include: "v10.0"),
new AndroidPlatform (apiName: "R", apiLevel: 30, platformID: "30", include: "v11.0"),
new AndroidPlatform (apiName: "S", apiLevel: 31, platformID: "31", include: "v12.0"),
new AndroidPlatform (apiName: "Sv2", apiLevel: 32, platformID: "32", include: "v12.1"),
new AndroidPlatform (apiName: "Tiramisu", apiLevel: 33, platformID: "33", include: "v13.0", framework: "v13.0"),
new AndroidPlatform (apiName: "UpsideDownCake", apiLevel: 34, platformID: "34", include: "v14.0", framework: "v14.0"),
new AndroidPlatform (apiName: "VanillaIceCream", apiLevel: 35, platformID: "35", include: "v15.0", framework: "v15.0"),
new AndroidPlatform (apiName: "Baklava", apiLevel: 36, platformID: "36", include: "v16.0", framework: "v16.0"),
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "36.1", include: "v16.1", framework: "v16.1", stable: true),
new AndroidPlatform (apiName: "CinnamonBun", apiLevel: new Version (37, 0), platformID: "37.0", include: "v17.0", framework: "v17.0", stable: true),
};

}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,7 @@ protected override async Task<bool> Execute (Context context)
if (onlyRequired)
return null;

var steps = new List <GeneratedFile> {
new GeneratedMonoAndroidProjitemsFile (),
};
var steps = new List <GeneratedFile> ();

AddOSSpecificSteps (context, steps);

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions Documentation/workflow/HowToAddNewApiLevel.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,17 +111,28 @@ For the new API level, you need:

Then update the following files:

- Add new `AndroidPlatform` value to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs):

```csharp
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.0", framework: "v16.1", stable: false),
- Add a new `<AndroidApiInfo>` entry to
[`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems):

```xml
<AndroidApiInfo Include="v16.1">
<Name>CANARY</Name>
<Level>36</Level>
<VersionCodeFull>36.1</VersionCodeFull>
<Id>36.1</Id>
<Stable>True</Stable>
</AndroidApiInfo>
```

TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?
`Include` is the binding framework version (e.g. `v16.1`). `Level` is the
integer API level (`Major` of `VersionCodeFull`). `Id` is the platform ID
used to locate `android-$(Id)` directories under the Android SDK. `Stable`
should be `True`; every entry currently in the projitems uses `True`,
including preview codenames like CANARY. (Setting it to `False` would
exclude the entry from being picked as the default stable framework
version by some build-time selection logic.)

What are `include` and `framework` used for?
TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?

- Add new level to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs):
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace Xamarin.Android.Tools.BootstrapTasks
public class GenerateSupportedPlatforms : Task
{
/// <summary>
/// @(AndroidApiInfo) from .\bin\Build$(Configuration)\Mono.Android.Apis.projitems
/// @(AndroidApiInfo) from src\Mono.Android\Mono.Android.Apis.projitems
/// </summary>
[Required]
public ITaskItem [] AndroidApiInfo { get; set; } = [];
Expand Down
2 changes: 1 addition & 1 deletion build-tools/create-android-api/create-android-api.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
</PropertyGroup>

<Import Project="..\..\Configuration.props" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')"/>
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />

<ItemGroup>
<ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
Expand Down
2 changes: 1 addition & 1 deletion build-tools/installers/create-installers.targets
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<Import Project="..\scripts\XAVersionInfo.targets" />
<Import Project="..\scripts\LocalizationLanguages.projitems" />
<Import Project="..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems')" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')" />
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" TaskFactory="TaskHostFactory" Runtime="NET" />
<PropertyGroup>
<FrameworkSrcDir>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\</FrameworkSrcDir>
Expand Down
5 changes: 2 additions & 3 deletions build-tools/xaprepare/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,9 +101,8 @@ The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndDa
helper methods used throughout the preparation utility code. **Be very careful** when modifying the names there as it may
break the build!
- [BuildAndroidPlatforms.cs](xaprepare/ConfigAndData/BuildAndroidPlatforms.cs)
Modified whenever a new Android platform is added, this file names all of the Android API levels along with platform/API
identifiers and .NET for Android framework names corresponding to specific API levels. The file also contains specification
of minimum NDK API levels used for all the Android device targets.
Contains the NDK release/revision constants and the minimum NDK API levels used for all the Android device targets.
The Android API level list itself lives in [`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems).
- [CommonLicenses.cs](xaprepare/ConfigAndData/CommonLicenses.cs)
A file with constants containing paths to licenses commonly used by software .NET for Android uses. The licenses are used
when generating Third Party Notices.
Expand Down
53 changes: 0 additions & 53 deletions build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs

This file was deleted.

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;

namespace Xamarin.Android.Prepare
{
Expand All@@ -10,47 +9,5 @@ class BuildAndroidPlatforms

public static string NdkMinimumAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel);
public static string NdkMinimumAPILegacy32 => NdkMinimumAPI;

public static readonly List<AndroidPlatform> AllPlatforms = new List<AndroidPlatform> {
new AndroidPlatform (apiName: "", apiLevel: 1, platformID: "1"),
new AndroidPlatform (apiName: "", apiLevel: 2, platformID: "2"),
new AndroidPlatform (apiName: "", apiLevel: 3, platformID: "3"),
new AndroidPlatform (apiName: "Donut", apiLevel: 4, platformID: "4", include: "v1.6"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 5, platformID: "5", include: "v2.0"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 6, platformID: "6", include: "v2.0.1"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 7, platformID: "7", include: "v2.1"),
new AndroidPlatform (apiName: "Froyo", apiLevel: 8, platformID: "8", include: "v2.2"),
new AndroidPlatform (apiName: "", apiLevel: 9, platformID: "9"),
new AndroidPlatform (apiName: "Gingerbread", apiLevel: 10, platformID: "10", include: "v2.3"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 11, platformID: "11", include: "v3.0"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 12, platformID: "12", include: "v3.1"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 13, platformID: "13", include: "v3.2"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 14, platformID: "14", include: "v4.0"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 15, platformID: "15", include: "v4.0.3"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 16, platformID: "16", include: "v4.1"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 17, platformID: "17", include: "v4.2"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 18, platformID: "18", include: "v4.3"),
new AndroidPlatform (apiName: "Kit Kat", apiLevel: 19, platformID: "19", include: "v4.4"),
new AndroidPlatform (apiName: "Kit Kat + Wear support", apiLevel: 20, platformID: "20", include: "v4.4.87"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 21, platformID: "21", include: "v5.0"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 22, platformID: "22", include: "v5.1"),
new AndroidPlatform (apiName: "Marshmallow", apiLevel: 23, platformID: "23", include: "v6.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 24, platformID: "24", include: "v7.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 25, platformID: "25", include: "v7.1"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 26, platformID: "26", include: "v8.0"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 27, platformID: "27", include: "v8.1"),
new AndroidPlatform (apiName: "Pie", apiLevel: 28, platformID: "28", include: "v9.0"),
new AndroidPlatform (apiName: "Q", apiLevel: 29, platformID: "29", include: "v10.0"),
new AndroidPlatform (apiName: "R", apiLevel: 30, platformID: "30", include: "v11.0"),
new AndroidPlatform (apiName: "S", apiLevel: 31, platformID: "31", include: "v12.0"),
new AndroidPlatform (apiName: "Sv2", apiLevel: 32, platformID: "32", include: "v12.1"),
new AndroidPlatform (apiName: "Tiramisu", apiLevel: 33, platformID: "33", include: "v13.0", framework: "v13.0"),
new AndroidPlatform (apiName: "UpsideDownCake", apiLevel: 34, platformID: "34", include: "v14.0", framework: "v14.0"),
new AndroidPlatform (apiName: "VanillaIceCream", apiLevel: 35, platformID: "35", include: "v15.0", framework: "v15.0"),
new AndroidPlatform (apiName: "Baklava", apiLevel: 36, platformID: "36", include: "v16.0", framework: "v16.0"),
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "36.1", include: "v16.1", framework: "v16.1", stable: true),
new AndroidPlatform (apiName: "CinnamonBun", apiLevel: new Version (37, 0), platformID: "37.0", include: "v17.0", framework: "v17.0", stable: true),
};

}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,7 @@ protected override async Task<bool> Execute (Context context)
if (onlyRequired)
return null;

var steps = new List <GeneratedFile> {
new GeneratedMonoAndroidProjitemsFile (),
};
var steps = new List <GeneratedFile> ();

AddOSSpecificSteps (context, steps);

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions Documentation/workflow/HowToAddNewApiLevel.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,17 +111,28 @@ For the new API level, you need:

Then update the following files:

- Add new `AndroidPlatform` value to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs):

```csharp
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.0", framework: "v16.1", stable: false),
- Add a new `<AndroidApiInfo>` entry to
[`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems):

```xml
<AndroidApiInfo Include="v16.1">
<Name>CANARY</Name>
<Level>36</Level>
<VersionCodeFull>36.1</VersionCodeFull>
<Id>36.1</Id>
<Stable>True</Stable>
</AndroidApiInfo>
```

TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?
`Include` is the binding framework version (e.g. `v16.1`). `Level` is the
integer API level (`Major` of `VersionCodeFull`). `Id` is the platform ID
used to locate `android-$(Id)` directories under the Android SDK. `Stable`
should be `True`; every entry currently in the projitems uses `True`,
including preview codenames like CANARY. (Setting it to `False` would
exclude the entry from being picked as the default stable framework
version by some build-time selection logic.)

What are `include` and `framework` used for?
TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?

- Add new level to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs):
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace Xamarin.Android.Tools.BootstrapTasks
public class GenerateSupportedPlatforms : Task
{
/// <summary>
/// @(AndroidApiInfo) from .\bin\Build$(Configuration)\Mono.Android.Apis.projitems
/// @(AndroidApiInfo) from src\Mono.Android\Mono.Android.Apis.projitems
/// </summary>
[Required]
public ITaskItem [] AndroidApiInfo { get; set; } = [];
Expand Down
2 changes: 1 addition & 1 deletion build-tools/create-android-api/create-android-api.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
</PropertyGroup>

<Import Project="..\..\Configuration.props" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')"/>
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />

<ItemGroup>
<ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
Expand Down
2 changes: 1 addition & 1 deletion build-tools/installers/create-installers.targets
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<Import Project="..\scripts\XAVersionInfo.targets" />
<Import Project="..\scripts\LocalizationLanguages.projitems" />
<Import Project="..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems')" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')" />
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" TaskFactory="TaskHostFactory" Runtime="NET" />
<PropertyGroup>
<FrameworkSrcDir>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\</FrameworkSrcDir>
Expand Down
5 changes: 2 additions & 3 deletions build-tools/xaprepare/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,9 +101,8 @@ The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndDa
helper methods used throughout the preparation utility code. **Be very careful** when modifying the names there as it may
break the build!
- [BuildAndroidPlatforms.cs](xaprepare/ConfigAndData/BuildAndroidPlatforms.cs)
Modified whenever a new Android platform is added, this file names all of the Android API levels along with platform/API
identifiers and .NET for Android framework names corresponding to specific API levels. The file also contains specification
of minimum NDK API levels used for all the Android device targets.
Contains the NDK release/revision constants and the minimum NDK API levels used for all the Android device targets.
The Android API level list itself lives in [`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems).
- [CommonLicenses.cs](xaprepare/ConfigAndData/CommonLicenses.cs)
A file with constants containing paths to licenses commonly used by software .NET for Android uses. The licenses are used
when generating Third Party Notices.
Expand Down
53 changes: 0 additions & 53 deletions build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs

This file was deleted.

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;

namespace Xamarin.Android.Prepare
{
Expand All@@ -10,47 +9,5 @@ class BuildAndroidPlatforms

public static string NdkMinimumAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel);
public static string NdkMinimumAPILegacy32 => NdkMinimumAPI;

public static readonly List<AndroidPlatform> AllPlatforms = new List<AndroidPlatform> {
new AndroidPlatform (apiName: "", apiLevel: 1, platformID: "1"),
new AndroidPlatform (apiName: "", apiLevel: 2, platformID: "2"),
new AndroidPlatform (apiName: "", apiLevel: 3, platformID: "3"),
new AndroidPlatform (apiName: "Donut", apiLevel: 4, platformID: "4", include: "v1.6"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 5, platformID: "5", include: "v2.0"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 6, platformID: "6", include: "v2.0.1"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 7, platformID: "7", include: "v2.1"),
new AndroidPlatform (apiName: "Froyo", apiLevel: 8, platformID: "8", include: "v2.2"),
new AndroidPlatform (apiName: "", apiLevel: 9, platformID: "9"),
new AndroidPlatform (apiName: "Gingerbread", apiLevel: 10, platformID: "10", include: "v2.3"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 11, platformID: "11", include: "v3.0"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 12, platformID: "12", include: "v3.1"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 13, platformID: "13", include: "v3.2"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 14, platformID: "14", include: "v4.0"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 15, platformID: "15", include: "v4.0.3"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 16, platformID: "16", include: "v4.1"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 17, platformID: "17", include: "v4.2"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 18, platformID: "18", include: "v4.3"),
new AndroidPlatform (apiName: "Kit Kat", apiLevel: 19, platformID: "19", include: "v4.4"),
new AndroidPlatform (apiName: "Kit Kat + Wear support", apiLevel: 20, platformID: "20", include: "v4.4.87"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 21, platformID: "21", include: "v5.0"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 22, platformID: "22", include: "v5.1"),
new AndroidPlatform (apiName: "Marshmallow", apiLevel: 23, platformID: "23", include: "v6.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 24, platformID: "24", include: "v7.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 25, platformID: "25", include: "v7.1"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 26, platformID: "26", include: "v8.0"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 27, platformID: "27", include: "v8.1"),
new AndroidPlatform (apiName: "Pie", apiLevel: 28, platformID: "28", include: "v9.0"),
new AndroidPlatform (apiName: "Q", apiLevel: 29, platformID: "29", include: "v10.0"),
new AndroidPlatform (apiName: "R", apiLevel: 30, platformID: "30", include: "v11.0"),
new AndroidPlatform (apiName: "S", apiLevel: 31, platformID: "31", include: "v12.0"),
new AndroidPlatform (apiName: "Sv2", apiLevel: 32, platformID: "32", include: "v12.1"),
new AndroidPlatform (apiName: "Tiramisu", apiLevel: 33, platformID: "33", include: "v13.0", framework: "v13.0"),
new AndroidPlatform (apiName: "UpsideDownCake", apiLevel: 34, platformID: "34", include: "v14.0", framework: "v14.0"),
new AndroidPlatform (apiName: "VanillaIceCream", apiLevel: 35, platformID: "35", include: "v15.0", framework: "v15.0"),
new AndroidPlatform (apiName: "Baklava", apiLevel: 36, platformID: "36", include: "v16.0", framework: "v16.0"),
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "36.1", include: "v16.1", framework: "v16.1", stable: true),
new AndroidPlatform (apiName: "CinnamonBun", apiLevel: new Version (37, 0), platformID: "37.0", include: "v17.0", framework: "v17.0", stable: true),
};

}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,7 @@ protected override async Task<bool> Execute (Context context)
if (onlyRequired)
return null;

var steps = new List <GeneratedFile> {
new GeneratedMonoAndroidProjitemsFile (),
};
var steps = new List <GeneratedFile> ();

AddOSSpecificSteps (context, steps);

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions Documentation/workflow/HowToAddNewApiLevel.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,17 +111,28 @@ For the new API level, you need:

Then update the following files:

- Add new `AndroidPlatform` value to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs):

```csharp
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.0", framework: "v16.1", stable: false),
- Add a new `<AndroidApiInfo>` entry to
[`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems):

```xml
<AndroidApiInfo Include="v16.1">
<Name>CANARY</Name>
<Level>36</Level>
<VersionCodeFull>36.1</VersionCodeFull>
<Id>36.1</Id>
<Stable>True</Stable>
</AndroidApiInfo>
```

TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?
`Include` is the binding framework version (e.g. `v16.1`). `Level` is the
integer API level (`Major` of `VersionCodeFull`). `Id` is the platform ID
used to locate `android-$(Id)` directories under the Android SDK. `Stable`
should be `True`; every entry currently in the projitems uses `True`,
including preview codenames like CANARY. (Setting it to `False` would
exclude the entry from being picked as the default stable framework
version by some build-time selection logic.)

What are `include` and `framework` used for?
TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?

- Add new level to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs):
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace Xamarin.Android.Tools.BootstrapTasks
public class GenerateSupportedPlatforms : Task
{
/// <summary>
/// @(AndroidApiInfo) from .\bin\Build$(Configuration)\Mono.Android.Apis.projitems
/// @(AndroidApiInfo) from src\Mono.Android\Mono.Android.Apis.projitems
/// </summary>
[Required]
public ITaskItem [] AndroidApiInfo { get; set; } = [];
Expand Down
2 changes: 1 addition & 1 deletion build-tools/create-android-api/create-android-api.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
</PropertyGroup>

<Import Project="..\..\Configuration.props" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')"/>
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />

<ItemGroup>
<ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
Expand Down
2 changes: 1 addition & 1 deletion build-tools/installers/create-installers.targets
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<Import Project="..\scripts\XAVersionInfo.targets" />
<Import Project="..\scripts\LocalizationLanguages.projitems" />
<Import Project="..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems')" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')" />
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" TaskFactory="TaskHostFactory" Runtime="NET" />
<PropertyGroup>
<FrameworkSrcDir>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\</FrameworkSrcDir>
Expand Down
5 changes: 2 additions & 3 deletions build-tools/xaprepare/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,9 +101,8 @@ The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndDa
helper methods used throughout the preparation utility code. **Be very careful** when modifying the names there as it may
break the build!
- [BuildAndroidPlatforms.cs](xaprepare/ConfigAndData/BuildAndroidPlatforms.cs)
Modified whenever a new Android platform is added, this file names all of the Android API levels along with platform/API
identifiers and .NET for Android framework names corresponding to specific API levels. The file also contains specification
of minimum NDK API levels used for all the Android device targets.
Contains the NDK release/revision constants and the minimum NDK API levels used for all the Android device targets.
The Android API level list itself lives in [`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems).
- [CommonLicenses.cs](xaprepare/ConfigAndData/CommonLicenses.cs)
A file with constants containing paths to licenses commonly used by software .NET for Android uses. The licenses are used
when generating Third Party Notices.
Expand Down
53 changes: 0 additions & 53 deletions build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs

This file was deleted.

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;

namespace Xamarin.Android.Prepare
{
Expand All@@ -10,47 +9,5 @@ class BuildAndroidPlatforms

public static string NdkMinimumAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel);
public static string NdkMinimumAPILegacy32 => NdkMinimumAPI;

public static readonly List<AndroidPlatform> AllPlatforms = new List<AndroidPlatform> {
new AndroidPlatform (apiName: "", apiLevel: 1, platformID: "1"),
new AndroidPlatform (apiName: "", apiLevel: 2, platformID: "2"),
new AndroidPlatform (apiName: "", apiLevel: 3, platformID: "3"),
new AndroidPlatform (apiName: "Donut", apiLevel: 4, platformID: "4", include: "v1.6"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 5, platformID: "5", include: "v2.0"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 6, platformID: "6", include: "v2.0.1"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 7, platformID: "7", include: "v2.1"),
new AndroidPlatform (apiName: "Froyo", apiLevel: 8, platformID: "8", include: "v2.2"),
new AndroidPlatform (apiName: "", apiLevel: 9, platformID: "9"),
new AndroidPlatform (apiName: "Gingerbread", apiLevel: 10, platformID: "10", include: "v2.3"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 11, platformID: "11", include: "v3.0"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 12, platformID: "12", include: "v3.1"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 13, platformID: "13", include: "v3.2"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 14, platformID: "14", include: "v4.0"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 15, platformID: "15", include: "v4.0.3"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 16, platformID: "16", include: "v4.1"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 17, platformID: "17", include: "v4.2"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 18, platformID: "18", include: "v4.3"),
new AndroidPlatform (apiName: "Kit Kat", apiLevel: 19, platformID: "19", include: "v4.4"),
new AndroidPlatform (apiName: "Kit Kat + Wear support", apiLevel: 20, platformID: "20", include: "v4.4.87"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 21, platformID: "21", include: "v5.0"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 22, platformID: "22", include: "v5.1"),
new AndroidPlatform (apiName: "Marshmallow", apiLevel: 23, platformID: "23", include: "v6.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 24, platformID: "24", include: "v7.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 25, platformID: "25", include: "v7.1"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 26, platformID: "26", include: "v8.0"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 27, platformID: "27", include: "v8.1"),
new AndroidPlatform (apiName: "Pie", apiLevel: 28, platformID: "28", include: "v9.0"),
new AndroidPlatform (apiName: "Q", apiLevel: 29, platformID: "29", include: "v10.0"),
new AndroidPlatform (apiName: "R", apiLevel: 30, platformID: "30", include: "v11.0"),
new AndroidPlatform (apiName: "S", apiLevel: 31, platformID: "31", include: "v12.0"),
new AndroidPlatform (apiName: "Sv2", apiLevel: 32, platformID: "32", include: "v12.1"),
new AndroidPlatform (apiName: "Tiramisu", apiLevel: 33, platformID: "33", include: "v13.0", framework: "v13.0"),
new AndroidPlatform (apiName: "UpsideDownCake", apiLevel: 34, platformID: "34", include: "v14.0", framework: "v14.0"),
new AndroidPlatform (apiName: "VanillaIceCream", apiLevel: 35, platformID: "35", include: "v15.0", framework: "v15.0"),
new AndroidPlatform (apiName: "Baklava", apiLevel: 36, platformID: "36", include: "v16.0", framework: "v16.0"),
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "36.1", include: "v16.1", framework: "v16.1", stable: true),
new AndroidPlatform (apiName: "CinnamonBun", apiLevel: new Version (37, 0), platformID: "37.0", include: "v17.0", framework: "v17.0", stable: true),
};

}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,7 @@ protected override async Task<bool> Execute (Context context)
if (onlyRequired)
return null;

var steps = new List <GeneratedFile> {
new GeneratedMonoAndroidProjitemsFile (),
};
var steps = new List <GeneratedFile> ();

AddOSSpecificSteps (context, steps);

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions Documentation/workflow/HowToAddNewApiLevel.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,17 +111,28 @@ For the new API level, you need:

Then update the following files:

- Add new `AndroidPlatform` value to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs):

```csharp
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.0", framework: "v16.1", stable: false),
- Add a new `<AndroidApiInfo>` entry to
[`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems):

```xml
<AndroidApiInfo Include="v16.1">
<Name>CANARY</Name>
<Level>36</Level>
<VersionCodeFull>36.1</VersionCodeFull>
<Id>36.1</Id>
<Stable>True</Stable>
</AndroidApiInfo>
```

TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?
`Include` is the binding framework version (e.g. `v16.1`). `Level` is the
integer API level (`Major` of `VersionCodeFull`). `Id` is the platform ID
used to locate `android-$(Id)` directories under the Android SDK. `Stable`
should be `True`; every entry currently in the projitems uses `True`,
including preview codenames like CANARY. (Setting it to `False` would
exclude the entry from being picked as the default stable framework
version by some build-time selection logic.)

What are `include` and `framework` used for?
TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?

- Add new level to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs):
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace Xamarin.Android.Tools.BootstrapTasks
public class GenerateSupportedPlatforms : Task
{
/// <summary>
/// @(AndroidApiInfo) from .\bin\Build$(Configuration)\Mono.Android.Apis.projitems
/// @(AndroidApiInfo) from src\Mono.Android\Mono.Android.Apis.projitems
/// </summary>
[Required]
public ITaskItem [] AndroidApiInfo { get; set; } = [];
Expand Down
2 changes: 1 addition & 1 deletion build-tools/create-android-api/create-android-api.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
</PropertyGroup>

<Import Project="..\..\Configuration.props" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')"/>
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />

<ItemGroup>
<ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
Expand Down
2 changes: 1 addition & 1 deletion build-tools/installers/create-installers.targets
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<Import Project="..\scripts\XAVersionInfo.targets" />
<Import Project="..\scripts\LocalizationLanguages.projitems" />
<Import Project="..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems')" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')" />
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" TaskFactory="TaskHostFactory" Runtime="NET" />
<PropertyGroup>
<FrameworkSrcDir>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\</FrameworkSrcDir>
Expand Down
5 changes: 2 additions & 3 deletions build-tools/xaprepare/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,9 +101,8 @@ The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndDa
helper methods used throughout the preparation utility code. **Be very careful** when modifying the names there as it may
break the build!
- [BuildAndroidPlatforms.cs](xaprepare/ConfigAndData/BuildAndroidPlatforms.cs)
Modified whenever a new Android platform is added, this file names all of the Android API levels along with platform/API
identifiers and .NET for Android framework names corresponding to specific API levels. The file also contains specification
of minimum NDK API levels used for all the Android device targets.
Contains the NDK release/revision constants and the minimum NDK API levels used for all the Android device targets.
The Android API level list itself lives in [`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems).
- [CommonLicenses.cs](xaprepare/ConfigAndData/CommonLicenses.cs)
A file with constants containing paths to licenses commonly used by software .NET for Android uses. The licenses are used
when generating Third Party Notices.
Expand Down
53 changes: 0 additions & 53 deletions build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs

This file was deleted.

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;

namespace Xamarin.Android.Prepare
{
Expand All@@ -10,47 +9,5 @@ class BuildAndroidPlatforms

public static string NdkMinimumAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel);
public static string NdkMinimumAPILegacy32 => NdkMinimumAPI;

public static readonly List<AndroidPlatform> AllPlatforms = new List<AndroidPlatform> {
new AndroidPlatform (apiName: "", apiLevel: 1, platformID: "1"),
new AndroidPlatform (apiName: "", apiLevel: 2, platformID: "2"),
new AndroidPlatform (apiName: "", apiLevel: 3, platformID: "3"),
new AndroidPlatform (apiName: "Donut", apiLevel: 4, platformID: "4", include: "v1.6"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 5, platformID: "5", include: "v2.0"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 6, platformID: "6", include: "v2.0.1"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 7, platformID: "7", include: "v2.1"),
new AndroidPlatform (apiName: "Froyo", apiLevel: 8, platformID: "8", include: "v2.2"),
new AndroidPlatform (apiName: "", apiLevel: 9, platformID: "9"),
new AndroidPlatform (apiName: "Gingerbread", apiLevel: 10, platformID: "10", include: "v2.3"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 11, platformID: "11", include: "v3.0"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 12, platformID: "12", include: "v3.1"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 13, platformID: "13", include: "v3.2"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 14, platformID: "14", include: "v4.0"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 15, platformID: "15", include: "v4.0.3"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 16, platformID: "16", include: "v4.1"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 17, platformID: "17", include: "v4.2"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 18, platformID: "18", include: "v4.3"),
new AndroidPlatform (apiName: "Kit Kat", apiLevel: 19, platformID: "19", include: "v4.4"),
new AndroidPlatform (apiName: "Kit Kat + Wear support", apiLevel: 20, platformID: "20", include: "v4.4.87"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 21, platformID: "21", include: "v5.0"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 22, platformID: "22", include: "v5.1"),
new AndroidPlatform (apiName: "Marshmallow", apiLevel: 23, platformID: "23", include: "v6.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 24, platformID: "24", include: "v7.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 25, platformID: "25", include: "v7.1"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 26, platformID: "26", include: "v8.0"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 27, platformID: "27", include: "v8.1"),
new AndroidPlatform (apiName: "Pie", apiLevel: 28, platformID: "28", include: "v9.0"),
new AndroidPlatform (apiName: "Q", apiLevel: 29, platformID: "29", include: "v10.0"),
new AndroidPlatform (apiName: "R", apiLevel: 30, platformID: "30", include: "v11.0"),
new AndroidPlatform (apiName: "S", apiLevel: 31, platformID: "31", include: "v12.0"),
new AndroidPlatform (apiName: "Sv2", apiLevel: 32, platformID: "32", include: "v12.1"),
new AndroidPlatform (apiName: "Tiramisu", apiLevel: 33, platformID: "33", include: "v13.0", framework: "v13.0"),
new AndroidPlatform (apiName: "UpsideDownCake", apiLevel: 34, platformID: "34", include: "v14.0", framework: "v14.0"),
new AndroidPlatform (apiName: "VanillaIceCream", apiLevel: 35, platformID: "35", include: "v15.0", framework: "v15.0"),
new AndroidPlatform (apiName: "Baklava", apiLevel: 36, platformID: "36", include: "v16.0", framework: "v16.0"),
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "36.1", include: "v16.1", framework: "v16.1", stable: true),
new AndroidPlatform (apiName: "CinnamonBun", apiLevel: new Version (37, 0), platformID: "37.0", include: "v17.0", framework: "v17.0", stable: true),
};

}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,7 @@ protected override async Task<bool> Execute (Context context)
if (onlyRequired)
return null;

var steps = new List <GeneratedFile> {
new GeneratedMonoAndroidProjitemsFile (),
};
var steps = new List <GeneratedFile> ();

AddOSSpecificSteps (context, steps);

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions Documentation/workflow/HowToAddNewApiLevel.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,17 +111,28 @@ For the new API level, you need:

Then update the following files:

- Add new `AndroidPlatform` value to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs):

```csharp
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.0", framework: "v16.1", stable: false),
- Add a new `<AndroidApiInfo>` entry to
[`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems):

```xml
<AndroidApiInfo Include="v16.1">
<Name>CANARY</Name>
<Level>36</Level>
<VersionCodeFull>36.1</VersionCodeFull>
<Id>36.1</Id>
<Stable>True</Stable>
</AndroidApiInfo>
```

TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?
`Include` is the binding framework version (e.g. `v16.1`). `Level` is the
integer API level (`Major` of `VersionCodeFull`). `Id` is the platform ID
used to locate `android-$(Id)` directories under the Android SDK. `Stable`
should be `True`; every entry currently in the projitems uses `True`,
including preview codenames like CANARY. (Setting it to `False` would
exclude the entry from being picked as the default stable framework
version by some build-time selection logic.)

What are `include` and `framework` used for?
TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?

- Add new level to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs):
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace Xamarin.Android.Tools.BootstrapTasks
public class GenerateSupportedPlatforms : Task
{
/// <summary>
/// @(AndroidApiInfo) from .\bin\Build$(Configuration)\Mono.Android.Apis.projitems
/// @(AndroidApiInfo) from src\Mono.Android\Mono.Android.Apis.projitems
/// </summary>
[Required]
public ITaskItem [] AndroidApiInfo { get; set; } = [];
Expand Down
2 changes: 1 addition & 1 deletion build-tools/create-android-api/create-android-api.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
</PropertyGroup>

<Import Project="..\..\Configuration.props" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')"/>
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />

<ItemGroup>
<ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
Expand Down
2 changes: 1 addition & 1 deletion build-tools/installers/create-installers.targets
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<Import Project="..\scripts\XAVersionInfo.targets" />
<Import Project="..\scripts\LocalizationLanguages.projitems" />
<Import Project="..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems')" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')" />
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" TaskFactory="TaskHostFactory" Runtime="NET" />
<PropertyGroup>
<FrameworkSrcDir>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\</FrameworkSrcDir>
Expand Down
5 changes: 2 additions & 3 deletions build-tools/xaprepare/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,9 +101,8 @@ The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndDa
helper methods used throughout the preparation utility code. **Be very careful** when modifying the names there as it may
break the build!
- [BuildAndroidPlatforms.cs](xaprepare/ConfigAndData/BuildAndroidPlatforms.cs)
Modified whenever a new Android platform is added, this file names all of the Android API levels along with platform/API
identifiers and .NET for Android framework names corresponding to specific API levels. The file also contains specification
of minimum NDK API levels used for all the Android device targets.
Contains the NDK release/revision constants and the minimum NDK API levels used for all the Android device targets.
The Android API level list itself lives in [`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems).
- [CommonLicenses.cs](xaprepare/ConfigAndData/CommonLicenses.cs)
A file with constants containing paths to licenses commonly used by software .NET for Android uses. The licenses are used
when generating Third Party Notices.
Expand Down
53 changes: 0 additions & 53 deletions build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs

This file was deleted.

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;

namespace Xamarin.Android.Prepare
{
Expand All@@ -10,47 +9,5 @@ class BuildAndroidPlatforms

public static string NdkMinimumAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel);
public static string NdkMinimumAPILegacy32 => NdkMinimumAPI;

public static readonly List<AndroidPlatform> AllPlatforms = new List<AndroidPlatform> {
new AndroidPlatform (apiName: "", apiLevel: 1, platformID: "1"),
new AndroidPlatform (apiName: "", apiLevel: 2, platformID: "2"),
new AndroidPlatform (apiName: "", apiLevel: 3, platformID: "3"),
new AndroidPlatform (apiName: "Donut", apiLevel: 4, platformID: "4", include: "v1.6"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 5, platformID: "5", include: "v2.0"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 6, platformID: "6", include: "v2.0.1"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 7, platformID: "7", include: "v2.1"),
new AndroidPlatform (apiName: "Froyo", apiLevel: 8, platformID: "8", include: "v2.2"),
new AndroidPlatform (apiName: "", apiLevel: 9, platformID: "9"),
new AndroidPlatform (apiName: "Gingerbread", apiLevel: 10, platformID: "10", include: "v2.3"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 11, platformID: "11", include: "v3.0"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 12, platformID: "12", include: "v3.1"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 13, platformID: "13", include: "v3.2"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 14, platformID: "14", include: "v4.0"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 15, platformID: "15", include: "v4.0.3"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 16, platformID: "16", include: "v4.1"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 17, platformID: "17", include: "v4.2"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 18, platformID: "18", include: "v4.3"),
new AndroidPlatform (apiName: "Kit Kat", apiLevel: 19, platformID: "19", include: "v4.4"),
new AndroidPlatform (apiName: "Kit Kat + Wear support", apiLevel: 20, platformID: "20", include: "v4.4.87"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 21, platformID: "21", include: "v5.0"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 22, platformID: "22", include: "v5.1"),
new AndroidPlatform (apiName: "Marshmallow", apiLevel: 23, platformID: "23", include: "v6.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 24, platformID: "24", include: "v7.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 25, platformID: "25", include: "v7.1"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 26, platformID: "26", include: "v8.0"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 27, platformID: "27", include: "v8.1"),
new AndroidPlatform (apiName: "Pie", apiLevel: 28, platformID: "28", include: "v9.0"),
new AndroidPlatform (apiName: "Q", apiLevel: 29, platformID: "29", include: "v10.0"),
new AndroidPlatform (apiName: "R", apiLevel: 30, platformID: "30", include: "v11.0"),
new AndroidPlatform (apiName: "S", apiLevel: 31, platformID: "31", include: "v12.0"),
new AndroidPlatform (apiName: "Sv2", apiLevel: 32, platformID: "32", include: "v12.1"),
new AndroidPlatform (apiName: "Tiramisu", apiLevel: 33, platformID: "33", include: "v13.0", framework: "v13.0"),
new AndroidPlatform (apiName: "UpsideDownCake", apiLevel: 34, platformID: "34", include: "v14.0", framework: "v14.0"),
new AndroidPlatform (apiName: "VanillaIceCream", apiLevel: 35, platformID: "35", include: "v15.0", framework: "v15.0"),
new AndroidPlatform (apiName: "Baklava", apiLevel: 36, platformID: "36", include: "v16.0", framework: "v16.0"),
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "36.1", include: "v16.1", framework: "v16.1", stable: true),
new AndroidPlatform (apiName: "CinnamonBun", apiLevel: new Version (37, 0), platformID: "37.0", include: "v17.0", framework: "v17.0", stable: true),
};

}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,7 @@ protected override async Task<bool> Execute (Context context)
if (onlyRequired)
return null;

var steps = new List <GeneratedFile> {
new GeneratedMonoAndroidProjitemsFile (),
};
var steps = new List <GeneratedFile> ();

AddOSSpecificSteps (context, steps);

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions Documentation/workflow/HowToAddNewApiLevel.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,17 +111,28 @@ For the new API level, you need:

Then update the following files:

- Add new `AndroidPlatform` value to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs):

```csharp
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.0", framework: "v16.1", stable: false),
- Add a new `<AndroidApiInfo>` entry to
[`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems):

```xml
<AndroidApiInfo Include="v16.1">
<Name>CANARY</Name>
<Level>36</Level>
<VersionCodeFull>36.1</VersionCodeFull>
<Id>36.1</Id>
<Stable>True</Stable>
</AndroidApiInfo>
```

TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?
`Include` is the binding framework version (e.g. `v16.1`). `Level` is the
integer API level (`Major` of `VersionCodeFull`). `Id` is the platform ID
used to locate `android-$(Id)` directories under the Android SDK. `Stable`
should be `True`; every entry currently in the projitems uses `True`,
including preview codenames like CANARY. (Setting it to `False` would
exclude the entry from being picked as the default stable framework
version by some build-time selection logic.)

What are `include` and `framework` used for?
TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?

- Add new level to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs):
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace Xamarin.Android.Tools.BootstrapTasks
public class GenerateSupportedPlatforms : Task
{
/// <summary>
/// @(AndroidApiInfo) from .\bin\Build$(Configuration)\Mono.Android.Apis.projitems
/// @(AndroidApiInfo) from src\Mono.Android\Mono.Android.Apis.projitems
/// </summary>
[Required]
public ITaskItem [] AndroidApiInfo { get; set; } = [];
Expand Down
2 changes: 1 addition & 1 deletion build-tools/create-android-api/create-android-api.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
</PropertyGroup>

<Import Project="..\..\Configuration.props" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')"/>
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />

<ItemGroup>
<ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
Expand Down
2 changes: 1 addition & 1 deletion build-tools/installers/create-installers.targets
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<Import Project="..\scripts\XAVersionInfo.targets" />
<Import Project="..\scripts\LocalizationLanguages.projitems" />
<Import Project="..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems')" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')" />
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" TaskFactory="TaskHostFactory" Runtime="NET" />
<PropertyGroup>
<FrameworkSrcDir>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\</FrameworkSrcDir>
Expand Down
5 changes: 2 additions & 3 deletions build-tools/xaprepare/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,9 +101,8 @@ The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndDa
helper methods used throughout the preparation utility code. **Be very careful** when modifying the names there as it may
break the build!
- [BuildAndroidPlatforms.cs](xaprepare/ConfigAndData/BuildAndroidPlatforms.cs)
Modified whenever a new Android platform is added, this file names all of the Android API levels along with platform/API
identifiers and .NET for Android framework names corresponding to specific API levels. The file also contains specification
of minimum NDK API levels used for all the Android device targets.
Contains the NDK release/revision constants and the minimum NDK API levels used for all the Android device targets.
The Android API level list itself lives in [`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems).
- [CommonLicenses.cs](xaprepare/ConfigAndData/CommonLicenses.cs)
A file with constants containing paths to licenses commonly used by software .NET for Android uses. The licenses are used
when generating Third Party Notices.
Expand Down
53 changes: 0 additions & 53 deletions build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs

This file was deleted.

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;

namespace Xamarin.Android.Prepare
{
Expand All@@ -10,47 +9,5 @@ class BuildAndroidPlatforms

public static string NdkMinimumAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel);
public static string NdkMinimumAPILegacy32 => NdkMinimumAPI;

public static readonly List<AndroidPlatform> AllPlatforms = new List<AndroidPlatform> {
new AndroidPlatform (apiName: "", apiLevel: 1, platformID: "1"),
new AndroidPlatform (apiName: "", apiLevel: 2, platformID: "2"),
new AndroidPlatform (apiName: "", apiLevel: 3, platformID: "3"),
new AndroidPlatform (apiName: "Donut", apiLevel: 4, platformID: "4", include: "v1.6"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 5, platformID: "5", include: "v2.0"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 6, platformID: "6", include: "v2.0.1"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 7, platformID: "7", include: "v2.1"),
new AndroidPlatform (apiName: "Froyo", apiLevel: 8, platformID: "8", include: "v2.2"),
new AndroidPlatform (apiName: "", apiLevel: 9, platformID: "9"),
new AndroidPlatform (apiName: "Gingerbread", apiLevel: 10, platformID: "10", include: "v2.3"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 11, platformID: "11", include: "v3.0"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 12, platformID: "12", include: "v3.1"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 13, platformID: "13", include: "v3.2"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 14, platformID: "14", include: "v4.0"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 15, platformID: "15", include: "v4.0.3"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 16, platformID: "16", include: "v4.1"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 17, platformID: "17", include: "v4.2"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 18, platformID: "18", include: "v4.3"),
new AndroidPlatform (apiName: "Kit Kat", apiLevel: 19, platformID: "19", include: "v4.4"),
new AndroidPlatform (apiName: "Kit Kat + Wear support", apiLevel: 20, platformID: "20", include: "v4.4.87"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 21, platformID: "21", include: "v5.0"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 22, platformID: "22", include: "v5.1"),
new AndroidPlatform (apiName: "Marshmallow", apiLevel: 23, platformID: "23", include: "v6.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 24, platformID: "24", include: "v7.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 25, platformID: "25", include: "v7.1"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 26, platformID: "26", include: "v8.0"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 27, platformID: "27", include: "v8.1"),
new AndroidPlatform (apiName: "Pie", apiLevel: 28, platformID: "28", include: "v9.0"),
new AndroidPlatform (apiName: "Q", apiLevel: 29, platformID: "29", include: "v10.0"),
new AndroidPlatform (apiName: "R", apiLevel: 30, platformID: "30", include: "v11.0"),
new AndroidPlatform (apiName: "S", apiLevel: 31, platformID: "31", include: "v12.0"),
new AndroidPlatform (apiName: "Sv2", apiLevel: 32, platformID: "32", include: "v12.1"),
new AndroidPlatform (apiName: "Tiramisu", apiLevel: 33, platformID: "33", include: "v13.0", framework: "v13.0"),
new AndroidPlatform (apiName: "UpsideDownCake", apiLevel: 34, platformID: "34", include: "v14.0", framework: "v14.0"),
new AndroidPlatform (apiName: "VanillaIceCream", apiLevel: 35, platformID: "35", include: "v15.0", framework: "v15.0"),
new AndroidPlatform (apiName: "Baklava", apiLevel: 36, platformID: "36", include: "v16.0", framework: "v16.0"),
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "36.1", include: "v16.1", framework: "v16.1", stable: true),
new AndroidPlatform (apiName: "CinnamonBun", apiLevel: new Version (37, 0), platformID: "37.0", include: "v17.0", framework: "v17.0", stable: true),
};

}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,7 @@ protected override async Task<bool> Execute (Context context)
if (onlyRequired)
return null;

var steps = new List <GeneratedFile> {
new GeneratedMonoAndroidProjitemsFile (),
};
var steps = new List <GeneratedFile> ();

AddOSSpecificSteps (context, steps);

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions Documentation/workflow/HowToAddNewApiLevel.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,17 +111,28 @@ For the new API level, you need:

Then update the following files:

- Add new `AndroidPlatform` value to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs):

```csharp
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.0", framework: "v16.1", stable: false),
- Add a new `<AndroidApiInfo>` entry to
[`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems):

```xml
<AndroidApiInfo Include="v16.1">
<Name>CANARY</Name>
<Level>36</Level>
<VersionCodeFull>36.1</VersionCodeFull>
<Id>36.1</Id>
<Stable>True</Stable>
</AndroidApiInfo>
```

TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?
`Include` is the binding framework version (e.g. `v16.1`). `Level` is the
integer API level (`Major` of `VersionCodeFull`). `Id` is the platform ID
used to locate `android-$(Id)` directories under the Android SDK. `Stable`
should be `True`; every entry currently in the projitems uses `True`,
including preview codenames like CANARY. (Setting it to `False` would
exclude the entry from being picked as the default stable framework
version by some build-time selection logic.)

What are `include` and `framework` used for?
TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?

- Add new level to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs):
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace Xamarin.Android.Tools.BootstrapTasks
public class GenerateSupportedPlatforms : Task
{
/// <summary>
/// @(AndroidApiInfo) from .\bin\Build$(Configuration)\Mono.Android.Apis.projitems
/// @(AndroidApiInfo) from src\Mono.Android\Mono.Android.Apis.projitems
/// </summary>
[Required]
public ITaskItem [] AndroidApiInfo { get; set; } = [];
Expand Down
2 changes: 1 addition & 1 deletion build-tools/create-android-api/create-android-api.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
</PropertyGroup>

<Import Project="..\..\Configuration.props" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')"/>
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />

<ItemGroup>
<ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
Expand Down
2 changes: 1 addition & 1 deletion build-tools/installers/create-installers.targets
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<Import Project="..\scripts\XAVersionInfo.targets" />
<Import Project="..\scripts\LocalizationLanguages.projitems" />
<Import Project="..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems')" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')" />
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" TaskFactory="TaskHostFactory" Runtime="NET" />
<PropertyGroup>
<FrameworkSrcDir>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\</FrameworkSrcDir>
Expand Down
5 changes: 2 additions & 3 deletions build-tools/xaprepare/README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,9 +101,8 @@ The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndDa
helper methods used throughout the preparation utility code. **Be very careful** when modifying the names there as it may
break the build!
- [BuildAndroidPlatforms.cs](xaprepare/ConfigAndData/BuildAndroidPlatforms.cs)
Modified whenever a new Android platform is added, this file names all of the Android API levels along with platform/API
identifiers and .NET for Android framework names corresponding to specific API levels. The file also contains specification
of minimum NDK API levels used for all the Android device targets.
Contains the NDK release/revision constants and the minimum NDK API levels used for all the Android device targets.
The Android API level list itself lives in [`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems).
- [CommonLicenses.cs](xaprepare/ConfigAndData/CommonLicenses.cs)
A file with constants containing paths to licenses commonly used by software .NET for Android uses. The licenses are used
when generating Third Party Notices.
Expand Down
53 changes: 0 additions & 53 deletions build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs

This file was deleted.

This file was deleted.

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;

namespace Xamarin.Android.Prepare
{
Expand All@@ -10,47 +9,5 @@ class BuildAndroidPlatforms

public static string NdkMinimumAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel);
public static string NdkMinimumAPILegacy32 => NdkMinimumAPI;

public static readonly List<AndroidPlatform> AllPlatforms = new List<AndroidPlatform> {
new AndroidPlatform (apiName: "", apiLevel: 1, platformID: "1"),
new AndroidPlatform (apiName: "", apiLevel: 2, platformID: "2"),
new AndroidPlatform (apiName: "", apiLevel: 3, platformID: "3"),
new AndroidPlatform (apiName: "Donut", apiLevel: 4, platformID: "4", include: "v1.6"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 5, platformID: "5", include: "v2.0"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 6, platformID: "6", include: "v2.0.1"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 7, platformID: "7", include: "v2.1"),
new AndroidPlatform (apiName: "Froyo", apiLevel: 8, platformID: "8", include: "v2.2"),
new AndroidPlatform (apiName: "", apiLevel: 9, platformID: "9"),
new AndroidPlatform (apiName: "Gingerbread", apiLevel: 10, platformID: "10", include: "v2.3"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 11, platformID: "11", include: "v3.0"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 12, platformID: "12", include: "v3.1"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 13, platformID: "13", include: "v3.2"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 14, platformID: "14", include: "v4.0"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 15, platformID: "15", include: "v4.0.3"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 16, platformID: "16", include: "v4.1"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 17, platformID: "17", include: "v4.2"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 18, platformID: "18", include: "v4.3"),
new AndroidPlatform (apiName: "Kit Kat", apiLevel: 19, platformID: "19", include: "v4.4"),
new AndroidPlatform (apiName: "Kit Kat + Wear support", apiLevel: 20, platformID: "20", include: "v4.4.87"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 21, platformID: "21", include: "v5.0"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 22, platformID: "22", include: "v5.1"),
new AndroidPlatform (apiName: "Marshmallow", apiLevel: 23, platformID: "23", include: "v6.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 24, platformID: "24", include: "v7.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 25, platformID: "25", include: "v7.1"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 26, platformID: "26", include: "v8.0"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 27, platformID: "27", include: "v8.1"),
new AndroidPlatform (apiName: "Pie", apiLevel: 28, platformID: "28", include: "v9.0"),
new AndroidPlatform (apiName: "Q", apiLevel: 29, platformID: "29", include: "v10.0"),
new AndroidPlatform (apiName: "R", apiLevel: 30, platformID: "30", include: "v11.0"),
new AndroidPlatform (apiName: "S", apiLevel: 31, platformID: "31", include: "v12.0"),
new AndroidPlatform (apiName: "Sv2", apiLevel: 32, platformID: "32", include: "v12.1"),
new AndroidPlatform (apiName: "Tiramisu", apiLevel: 33, platformID: "33", include: "v13.0", framework: "v13.0"),
new AndroidPlatform (apiName: "UpsideDownCake", apiLevel: 34, platformID: "34", include: "v14.0", framework: "v14.0"),
new AndroidPlatform (apiName: "VanillaIceCream", apiLevel: 35, platformID: "35", include: "v15.0", framework: "v15.0"),
new AndroidPlatform (apiName: "Baklava", apiLevel: 36, platformID: "36", include: "v16.0", framework: "v16.0"),
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "36.1", include: "v16.1", framework: "v16.1", stable: true),
new AndroidPlatform (apiName: "CinnamonBun", apiLevel: new Version (37, 0), platformID: "37.0", include: "v17.0", framework: "v17.0", stable: true),
};

}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,7 @@ protected override async Task<bool> Execute (Context context)
if (onlyRequired)
return null;

var steps = new List <GeneratedFile> {
new GeneratedMonoAndroidProjitemsFile (),
};
var steps = new List <GeneratedFile> ();

AddOSSpecificSteps (context, steps);

Expand Down
Loading