Skip to content

[Android] Bump target SDK version in Android manifest#80923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonrozsival merged 7 commits into from
Jan 24, 2023
Merged

[Android] Bump target SDK version in Android manifest #80923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6483af8
Set target SDK version
simonrozsival Jan 18, 2023
f9ec930
Update Android docs
simonrozsival Jan 18, 2023
7322e5f
Disable tests that do not pass with target API 31
simonrozsival Jan 18, 2023
cd8f5b9
Check if the installed Android SDK is up-to-date
simonrozsival Jan 23, 2023
b94ea98
Update skip explanation
simonrozsival Jan 24, 2023
aff24c6
Use latest SDK
simonrozsival Jan 24, 2023
11f8b24
Disable failing System.Net.Security test
simonrozsival Jan 24, 2023
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
8 changes: 4 additions & 4 deletions docs/workflow/testing/libraries/testing-android.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ Android SDK and NDK can be automatically installed via the following script:
set -e

NDK_VER=r23c
SDK_VER=6200805_latest
SDK_API_LEVEL=29
SDK_BUILD_TOOLS=29.0.3
SDK_VER=9123335_latest
SDK_API_LEVEL=33
SDK_BUILD_TOOLS=33.0.1

if [[ "$OSTYPE" == "darwin"* ]]; then
HOST_OS=darwin
Expand DownExpand Up@@ -63,7 +63,7 @@ Android Studio offers a convenient UI:
Before running a build you might want to set the Android SDK and NDK environment variables:
```
export ANDROID_SDK_ROOT=<PATH-TO-ANDROID-SDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
```

Now we're ready to build everything for Android:
Expand Down
4 changes: 3 additions & 1 deletion src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,7 @@ public void ProcessStart_UseShellExecute_OnWindows_DoesNotThrow(bool isFolder)
[ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[InlineData(true), InlineData(false)]
[SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
[SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
public void ProcessStart_UseShellExecute_Executes(bool filenameAsUrl)
{
string filename = WriteScriptFile(TestDirectory, GetTestFileName(), returnValue: 42);
Expand DownExpand Up@@ -374,6 +375,7 @@ public void ProcessStart_UseShellExecute_ExecuteOrder()
nameof(PlatformDetection.IsNotAppSandbox))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
[SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
public void ProcessStart_UseShellExecute_WorkingDirectory()
{
// Create a directory that will ProcessStartInfo.WorkingDirectory
Expand DownExpand Up@@ -2561,7 +2563,7 @@ public void NonElevatedUser_QueryProcessNameOfSystemProcess()
{
// returns the username of the owner of the process or null if the username can't be queried.
// for services.exe, this will be null.
string? servicesUser = Helpers.GetProcessUserName(p);
string? servicesUser = Helpers.GetProcessUserName(p);

// this isn't really verifying that services.exe is owned by SYSTEM, but we are sure it is not owned by the current user.
if (servicesUser != currentProcessUser)
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@ public async Task DefaultConnect_EndToEnd_Ok(string host)
[InlineData(true)]
[InlineData(false)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/70981", TestPlatforms.OSX)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/68206", TestPlatforms.Android)]
public Task ConnectWithRevocation_WithCallback(bool checkRevocation)
{
X509RevocationMode mode = checkRevocation ? X509RevocationMode.Online : X509RevocationMode.NoCheck;
Expand Down
3 changes: 3 additions & 0 deletions src/tasks/AndroidAppBuilder/AndroidAppBuilder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,8 @@ public class AndroidAppBuilderTask : Task

public string? MinApiLevel { get; set; }

public string? TargetApiLevel { get; set; }

public string? BuildApiLevel { get; set; }

public string? BuildToolsVersion { get; set; }
Expand DownExpand Up@@ -106,6 +108,7 @@ public override bool Execute()
apkBuilder.AndroidSdk = AndroidSdk;
apkBuilder.AndroidNdk = AndroidNdk;
apkBuilder.MinApiLevel = MinApiLevel;
apkBuilder.TargetApiLevel = TargetApiLevel;
apkBuilder.BuildApiLevel = BuildApiLevel;
apkBuilder.BuildToolsVersion = BuildToolsVersion;
apkBuilder.StripDebugSymbols = StripDebugSymbols;
Expand Down
27 changes: 20 additions & 7 deletions src/tasks/AndroidAppBuilder/ApkBuilder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
public class ApkBuilder
{
private const string DefaultMinApiLevel = "21";
private const string DefaultTargetApiLevel = "31";

public string? ProjectName { get; set; }
public string? AppDir { get; set; }
public string? AndroidNdk { get; set; }
public string? AndroidSdk { get; set; }
public string? MinApiLevel { get; set; }
public string? TargetApiLevel { get; set; }
public string? BuildApiLevel { get; set; }
public string? BuildToolsVersion { get; set; }
public string OutputDir { get; set; } = ""!;
Expand DownExpand Up@@ -118,14 +120,24 @@ public ApkBuilder(TaskLoggingHelper logger)
if (string.IsNullOrEmpty(MinApiLevel))
MinApiLevel = DefaultMinApiLevel;

// make sure BuildApiLevel >= MinApiLevel
if (string.IsNullOrEmpty(TargetApiLevel))
TargetApiLevel = DefaultTargetApiLevel;

// make sure BuildApiLevel >= MinApiLevel and BuildApiLevel >= TargetApiLevel
// only if these api levels are not "preview" (not integers)
if (int.TryParse(BuildApiLevel, out int intApi) &&
int.TryParse(MinApiLevel, out int intMinApi) &&
intApi < intMinApi)
if (int.TryParse(BuildApiLevel, out int intApi))
{
throw new ArgumentException($"BuildApiLevel={BuildApiLevel} <= MinApiLevel={MinApiLevel}. " +
"Make sure you've downloaded some recent build-tools in Android SDK");
if (int.TryParse(MinApiLevel, out int intMinApi) && intApi < intMinApi)
{
throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < MinApiLevel={MinApiLevel}. " +
"Make sure you've downloaded some recent build-tools in Android SDK");
}

if (int.TryParse(TargetApiLevel, out int intTargetApi) && intApi < intTargetApi)
{
throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < TargetApiLevel={TargetApiLevel}. " +
"Make sure you've downloaded some recent build-tools in Android SDK");
}
}

string buildToolsFolder = Path.Combine(AndroidSdk, "build-tools", BuildToolsVersion);
Expand DownExpand Up@@ -397,7 +409,8 @@ public ApkBuilder(TaskLoggingHelper logger)
File.WriteAllText(Path.Combine(OutputDir, "AndroidManifest.xml"),
Utils.GetEmbeddedResource("AndroidManifest.xml")
.Replace("%PackageName%", packageId)
.Replace("%MinSdkLevel%", MinApiLevel));
.Replace("%MinSdkLevel%", MinApiLevel)
.Replace("%TargetSdkVersion%", TargetApiLevel));

string javaCompilerArgs = $"-d obj -classpath src -bootclasspath {androidJar} -source 1.8 -target 1.8 ";
Utils.RunProcess(logger, javac, javaCompilerArgs + javaActivityPath, workingDir: OutputDir);
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/AndroidAppBuilder/Templates/AndroidManifest.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
package="%PackageName%"
a:versionCode="1"
a:versionName="1.0">
<uses-sdk a:minSdkVersion="%MinSdkLevel%" />
<uses-sdk a:minSdkVersion="%MinSdkLevel%" a:targetSdkVersion="%TargetSdkVersion%" />
<uses-permission a:name="android.permission.INTERNET"/>
<uses-permission a:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission a:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[Android] Bump target SDK version in Android manifest by simonrozsival · Pull Request #80923 · dotnet/runtime · GitHub
Skip to content
[Android] Bump target SDK version in Android manifest#80923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jan 24, 2023
 Merged


[Android] Bump target SDK version in Android manifest
#80923
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6483af8

Set target SDK version


simonrozsival Jan 18, 2023
f9ec930

Update Android docs


simonrozsival Jan 18, 2023
7322e5f

Disable tests that do not pass with target API 31


simonrozsival Jan 18, 2023
cd8f5b9

Check if the installed Android SDK is up-to-date


simonrozsival Jan 23, 2023
b94ea98

Update skip explanation


simonrozsival Jan 24, 2023
aff24c6

Use latest SDK


simonrozsival Jan 24, 2023
11f8b24

Disable failing System.Net.Security test


simonrozsival Jan 24, 2023

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


8 changes: 4 additions & 4 deletions
docs/workflow/testing/libraries/testing-android.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ Android SDK and NDK can be automatically installed via the following script:
set -e

NDK_VER=r23c
SDK_VER=6200805_latest
SDK_API_LEVEL=29
SDK_BUILD_TOOLS=29.0.3
SDK_VER=9123335_latest
SDK_API_LEVEL=33
SDK_BUILD_TOOLS=33.0.1

if [[ "$OSTYPE" == "darwin"* ]]; then
 HOST_OS=darwin
Expand DownExpand Up@@ -63,7 +63,7 @@ Android Studio offers a convenient UI:
Before running a build you might want to set the Android SDK and NDK environment variables:
```
export ANDROID_SDK_ROOT=<PATH-TO-ANDROID-SDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
```

Now we're ready to build everything for Android:
Expand Down

4 changes: 3 additions & 1 deletion
src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,7 @@ public void ProcessStart_UseShellExecute_OnWindows_DoesNotThrow(bool isFolder)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [InlineData(true), InlineData(false)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_Executes(bool filenameAsUrl)
 {
 string filename = WriteScriptFile(TestDirectory, GetTestFileName(), returnValue: 42);
Expand DownExpand Up@@ -374,6 +375,7 @@ public void ProcessStart_UseShellExecute_ExecuteOrder()
 nameof(PlatformDetection.IsNotAppSandbox))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_WorkingDirectory()
 {
 // Create a directory that will ProcessStartInfo.WorkingDirectory
Expand DownExpand Up@@ -2561,7 +2563,7 @@ public void NonElevatedUser_QueryProcessNameOfSystemProcess()
 {
 // returns the username of the owner of the process or null if the username can't be queried.
 // for services.exe, this will be null.
 string? servicesUser = Helpers.GetProcessUserName(p);
 string? servicesUser = Helpers.GetProcessUserName(p);

 // this isn't really verifying that services.exe is owned by SYSTEM, but we are sure it is not owned by the current user.
 if (servicesUser != currentProcessUser)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@ public async Task DefaultConnect_EndToEnd_Ok(string host)
 [InlineData(true)]
 [InlineData(false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70981", TestPlatforms.OSX)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/68206", TestPlatforms.Android)]
 public Task ConnectWithRevocation_WithCallback(bool checkRevocation)
 {
 X509RevocationMode mode = checkRevocation ? X509RevocationMode.Online : X509RevocationMode.NoCheck;
Expand Down

3 changes: 3 additions & 0 deletions
src/tasks/AndroidAppBuilder/AndroidAppBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,8 @@ public class AndroidAppBuilderTask : Task

 public string? MinApiLevel { get; set; }

 public string? TargetApiLevel { get; set; }

 public string? BuildApiLevel { get; set; }

 public string? BuildToolsVersion { get; set; }
Expand DownExpand Up@@ -106,6 +108,7 @@ public override bool Execute()
 apkBuilder.AndroidSdk = AndroidSdk;
 apkBuilder.AndroidNdk = AndroidNdk;
 apkBuilder.MinApiLevel = MinApiLevel;
 apkBuilder.TargetApiLevel = TargetApiLevel;
 apkBuilder.BuildApiLevel = BuildApiLevel;
 apkBuilder.BuildToolsVersion = BuildToolsVersion;
 apkBuilder.StripDebugSymbols = StripDebugSymbols;
Expand Down

27 changes: 20 additions & 7 deletions
src/tasks/AndroidAppBuilder/ApkBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
public class ApkBuilder
{
 private const string DefaultMinApiLevel = "21";
 private const string DefaultTargetApiLevel = "31";

 public string? ProjectName { get; set; }
 public string? AppDir { get; set; }
 public string? AndroidNdk { get; set; }
 public string? AndroidSdk { get; set; }
 public string? MinApiLevel { get; set; }
 public string? TargetApiLevel { get; set; }
 public string? BuildApiLevel { get; set; }
 public string? BuildToolsVersion { get; set; }
 public string OutputDir { get; set; } = ""!;
Expand DownExpand Up@@ -118,14 +120,24 @@ public ApkBuilder(TaskLoggingHelper logger)
 if (string.IsNullOrEmpty(MinApiLevel))
 MinApiLevel = DefaultMinApiLevel;

 // make sure BuildApiLevel >= MinApiLevel
 if (string.IsNullOrEmpty(TargetApiLevel))
 TargetApiLevel = DefaultTargetApiLevel;

 // make sure BuildApiLevel >= MinApiLevel and BuildApiLevel >= TargetApiLevel
 // only if these api levels are not "preview" (not integers)
 if (int.TryParse(BuildApiLevel, out int intApi) &&
 int.TryParse(MinApiLevel, out int intMinApi) &&
 intApi < intMinApi)
 if (int.TryParse(BuildApiLevel, out int intApi))
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} <= MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 if (int.TryParse(MinApiLevel, out int intMinApi) && intApi < intMinApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }

 if (int.TryParse(TargetApiLevel, out int intTargetApi) && intApi < intTargetApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < TargetApiLevel={TargetApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }
 }

 string buildToolsFolder = Path.Combine(AndroidSdk, "build-tools", BuildToolsVersion);
Expand DownExpand Up@@ -397,7 +409,8 @@ public ApkBuilder(TaskLoggingHelper logger)
 File.WriteAllText(Path.Combine(OutputDir, "AndroidManifest.xml"),
 Utils.GetEmbeddedResource("AndroidManifest.xml")
 .Replace("%PackageName%", packageId)
 .Replace("%MinSdkLevel%", MinApiLevel));
 .Replace("%MinSdkLevel%", MinApiLevel)
 .Replace("%TargetSdkVersion%", TargetApiLevel));

 string javaCompilerArgs = $"-d obj -classpath src -bootclasspath {androidJar} -source 1.8 -target 1.8 ";
 Utils.RunProcess(logger, javac, javaCompilerArgs + javaActivityPath, workingDir: OutputDir);
Expand Down

2 changes: 1 addition & 1 deletion
src/tasks/AndroidAppBuilder/Templates/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 package="%PackageName%"
 a:versionCode="1"
 a:versionName="1.0">
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" />
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" a:targetSdkVersion="%TargetSdkVersion%" />
 <uses-permission a:name="android.permission.INTERNET"/>
 <uses-permission a:name="android.permission.READ_EXTERNAL_STORAGE"/>
 <uses-permission a:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Android] Bump target SDK version in Android manifest by simonrozsival · Pull Request #80923 · dotnet/runtime · GitHub
Skip to content
[Android] Bump target SDK version in Android manifest#80923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jan 24, 2023
 Merged


[Android] Bump target SDK version in Android manifest
#80923
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6483af8

Set target SDK version


simonrozsival Jan 18, 2023
f9ec930

Update Android docs


simonrozsival Jan 18, 2023
7322e5f

Disable tests that do not pass with target API 31


simonrozsival Jan 18, 2023
cd8f5b9

Check if the installed Android SDK is up-to-date


simonrozsival Jan 23, 2023
b94ea98

Update skip explanation


simonrozsival Jan 24, 2023
aff24c6

Use latest SDK


simonrozsival Jan 24, 2023
11f8b24

Disable failing System.Net.Security test


simonrozsival Jan 24, 2023

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


8 changes: 4 additions & 4 deletions
docs/workflow/testing/libraries/testing-android.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ Android SDK and NDK can be automatically installed via the following script:
set -e

NDK_VER=r23c
SDK_VER=6200805_latest
SDK_API_LEVEL=29
SDK_BUILD_TOOLS=29.0.3
SDK_VER=9123335_latest
SDK_API_LEVEL=33
SDK_BUILD_TOOLS=33.0.1

if [[ "$OSTYPE" == "darwin"* ]]; then
 HOST_OS=darwin
Expand DownExpand Up@@ -63,7 +63,7 @@ Android Studio offers a convenient UI:
Before running a build you might want to set the Android SDK and NDK environment variables:
```
export ANDROID_SDK_ROOT=<PATH-TO-ANDROID-SDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
```

Now we're ready to build everything for Android:
Expand Down

4 changes: 3 additions & 1 deletion
src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,7 @@ public void ProcessStart_UseShellExecute_OnWindows_DoesNotThrow(bool isFolder)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [InlineData(true), InlineData(false)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_Executes(bool filenameAsUrl)
 {
 string filename = WriteScriptFile(TestDirectory, GetTestFileName(), returnValue: 42);
Expand DownExpand Up@@ -374,6 +375,7 @@ public void ProcessStart_UseShellExecute_ExecuteOrder()
 nameof(PlatformDetection.IsNotAppSandbox))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_WorkingDirectory()
 {
 // Create a directory that will ProcessStartInfo.WorkingDirectory
Expand DownExpand Up@@ -2561,7 +2563,7 @@ public void NonElevatedUser_QueryProcessNameOfSystemProcess()
 {
 // returns the username of the owner of the process or null if the username can't be queried.
 // for services.exe, this will be null.
 string? servicesUser = Helpers.GetProcessUserName(p);
 string? servicesUser = Helpers.GetProcessUserName(p);

 // this isn't really verifying that services.exe is owned by SYSTEM, but we are sure it is not owned by the current user.
 if (servicesUser != currentProcessUser)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@ public async Task DefaultConnect_EndToEnd_Ok(string host)
 [InlineData(true)]
 [InlineData(false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70981", TestPlatforms.OSX)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/68206", TestPlatforms.Android)]
 public Task ConnectWithRevocation_WithCallback(bool checkRevocation)
 {
 X509RevocationMode mode = checkRevocation ? X509RevocationMode.Online : X509RevocationMode.NoCheck;
Expand Down

3 changes: 3 additions & 0 deletions
src/tasks/AndroidAppBuilder/AndroidAppBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,8 @@ public class AndroidAppBuilderTask : Task

 public string? MinApiLevel { get; set; }

 public string? TargetApiLevel { get; set; }

 public string? BuildApiLevel { get; set; }

 public string? BuildToolsVersion { get; set; }
Expand DownExpand Up@@ -106,6 +108,7 @@ public override bool Execute()
 apkBuilder.AndroidSdk = AndroidSdk;
 apkBuilder.AndroidNdk = AndroidNdk;
 apkBuilder.MinApiLevel = MinApiLevel;
 apkBuilder.TargetApiLevel = TargetApiLevel;
 apkBuilder.BuildApiLevel = BuildApiLevel;
 apkBuilder.BuildToolsVersion = BuildToolsVersion;
 apkBuilder.StripDebugSymbols = StripDebugSymbols;
Expand Down

27 changes: 20 additions & 7 deletions
src/tasks/AndroidAppBuilder/ApkBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
public class ApkBuilder
{
 private const string DefaultMinApiLevel = "21";
 private const string DefaultTargetApiLevel = "31";

 public string? ProjectName { get; set; }
 public string? AppDir { get; set; }
 public string? AndroidNdk { get; set; }
 public string? AndroidSdk { get; set; }
 public string? MinApiLevel { get; set; }
 public string? TargetApiLevel { get; set; }
 public string? BuildApiLevel { get; set; }
 public string? BuildToolsVersion { get; set; }
 public string OutputDir { get; set; } = ""!;
Expand DownExpand Up@@ -118,14 +120,24 @@ public ApkBuilder(TaskLoggingHelper logger)
 if (string.IsNullOrEmpty(MinApiLevel))
 MinApiLevel = DefaultMinApiLevel;

 // make sure BuildApiLevel >= MinApiLevel
 if (string.IsNullOrEmpty(TargetApiLevel))
 TargetApiLevel = DefaultTargetApiLevel;

 // make sure BuildApiLevel >= MinApiLevel and BuildApiLevel >= TargetApiLevel
 // only if these api levels are not "preview" (not integers)
 if (int.TryParse(BuildApiLevel, out int intApi) &&
 int.TryParse(MinApiLevel, out int intMinApi) &&
 intApi < intMinApi)
 if (int.TryParse(BuildApiLevel, out int intApi))
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} <= MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 if (int.TryParse(MinApiLevel, out int intMinApi) && intApi < intMinApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }

 if (int.TryParse(TargetApiLevel, out int intTargetApi) && intApi < intTargetApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < TargetApiLevel={TargetApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }
 }

 string buildToolsFolder = Path.Combine(AndroidSdk, "build-tools", BuildToolsVersion);
Expand DownExpand Up@@ -397,7 +409,8 @@ public ApkBuilder(TaskLoggingHelper logger)
 File.WriteAllText(Path.Combine(OutputDir, "AndroidManifest.xml"),
 Utils.GetEmbeddedResource("AndroidManifest.xml")
 .Replace("%PackageName%", packageId)
 .Replace("%MinSdkLevel%", MinApiLevel));
 .Replace("%MinSdkLevel%", MinApiLevel)
 .Replace("%TargetSdkVersion%", TargetApiLevel));

 string javaCompilerArgs = $"-d obj -classpath src -bootclasspath {androidJar} -source 1.8 -target 1.8 ";
 Utils.RunProcess(logger, javac, javaCompilerArgs + javaActivityPath, workingDir: OutputDir);
Expand Down

2 changes: 1 addition & 1 deletion
src/tasks/AndroidAppBuilder/Templates/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 package="%PackageName%"
 a:versionCode="1"
 a:versionName="1.0">
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" />
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" a:targetSdkVersion="%TargetSdkVersion%" />
 <uses-permission a:name="android.permission.INTERNET"/>
 <uses-permission a:name="android.permission.READ_EXTERNAL_STORAGE"/>
 <uses-permission a:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jan 24, 2023
 Merged


[Android] Bump target SDK version in Android manifest
#80923
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6483af8

Set target SDK version


simonrozsival Jan 18, 2023
f9ec930

Update Android docs


simonrozsival Jan 18, 2023
7322e5f

Disable tests that do not pass with target API 31


simonrozsival Jan 18, 2023
cd8f5b9

Check if the installed Android SDK is up-to-date


simonrozsival Jan 23, 2023
b94ea98

Update skip explanation


simonrozsival Jan 24, 2023
aff24c6

Use latest SDK


simonrozsival Jan 24, 2023
11f8b24

Disable failing System.Net.Security test


simonrozsival Jan 24, 2023

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


8 changes: 4 additions & 4 deletions
docs/workflow/testing/libraries/testing-android.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ Android SDK and NDK can be automatically installed via the following script:
set -e

NDK_VER=r23c
SDK_VER=6200805_latest
SDK_API_LEVEL=29
SDK_BUILD_TOOLS=29.0.3
SDK_VER=9123335_latest
SDK_API_LEVEL=33
SDK_BUILD_TOOLS=33.0.1

if [[ "$OSTYPE" == "darwin"* ]]; then
 HOST_OS=darwin
Expand DownExpand Up@@ -63,7 +63,7 @@ Android Studio offers a convenient UI:
Before running a build you might want to set the Android SDK and NDK environment variables:
```
export ANDROID_SDK_ROOT=<PATH-TO-ANDROID-SDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
```

Now we're ready to build everything for Android:
Expand Down

4 changes: 3 additions & 1 deletion
src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,7 @@ public void ProcessStart_UseShellExecute_OnWindows_DoesNotThrow(bool isFolder)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [InlineData(true), InlineData(false)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_Executes(bool filenameAsUrl)
 {
 string filename = WriteScriptFile(TestDirectory, GetTestFileName(), returnValue: 42);
Expand DownExpand Up@@ -374,6 +375,7 @@ public void ProcessStart_UseShellExecute_ExecuteOrder()
 nameof(PlatformDetection.IsNotAppSandbox))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_WorkingDirectory()
 {
 // Create a directory that will ProcessStartInfo.WorkingDirectory
Expand DownExpand Up@@ -2561,7 +2563,7 @@ public void NonElevatedUser_QueryProcessNameOfSystemProcess()
 {
 // returns the username of the owner of the process or null if the username can't be queried.
 // for services.exe, this will be null.
 string? servicesUser = Helpers.GetProcessUserName(p);
 string? servicesUser = Helpers.GetProcessUserName(p);

 // this isn't really verifying that services.exe is owned by SYSTEM, but we are sure it is not owned by the current user.
 if (servicesUser != currentProcessUser)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@ public async Task DefaultConnect_EndToEnd_Ok(string host)
 [InlineData(true)]
 [InlineData(false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70981", TestPlatforms.OSX)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/68206", TestPlatforms.Android)]
 public Task ConnectWithRevocation_WithCallback(bool checkRevocation)
 {
 X509RevocationMode mode = checkRevocation ? X509RevocationMode.Online : X509RevocationMode.NoCheck;
Expand Down

3 changes: 3 additions & 0 deletions
src/tasks/AndroidAppBuilder/AndroidAppBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,8 @@ public class AndroidAppBuilderTask : Task

 public string? MinApiLevel { get; set; }

 public string? TargetApiLevel { get; set; }

 public string? BuildApiLevel { get; set; }

 public string? BuildToolsVersion { get; set; }
Expand DownExpand Up@@ -106,6 +108,7 @@ public override bool Execute()
 apkBuilder.AndroidSdk = AndroidSdk;
 apkBuilder.AndroidNdk = AndroidNdk;
 apkBuilder.MinApiLevel = MinApiLevel;
 apkBuilder.TargetApiLevel = TargetApiLevel;
 apkBuilder.BuildApiLevel = BuildApiLevel;
 apkBuilder.BuildToolsVersion = BuildToolsVersion;
 apkBuilder.StripDebugSymbols = StripDebugSymbols;
Expand Down

27 changes: 20 additions & 7 deletions
src/tasks/AndroidAppBuilder/ApkBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
public class ApkBuilder
{
 private const string DefaultMinApiLevel = "21";
 private const string DefaultTargetApiLevel = "31";

 public string? ProjectName { get; set; }
 public string? AppDir { get; set; }
 public string? AndroidNdk { get; set; }
 public string? AndroidSdk { get; set; }
 public string? MinApiLevel { get; set; }
 public string? TargetApiLevel { get; set; }
 public string? BuildApiLevel { get; set; }
 public string? BuildToolsVersion { get; set; }
 public string OutputDir { get; set; } = ""!;
Expand DownExpand Up@@ -118,14 +120,24 @@ public ApkBuilder(TaskLoggingHelper logger)
 if (string.IsNullOrEmpty(MinApiLevel))
 MinApiLevel = DefaultMinApiLevel;

 // make sure BuildApiLevel >= MinApiLevel
 if (string.IsNullOrEmpty(TargetApiLevel))
 TargetApiLevel = DefaultTargetApiLevel;

 // make sure BuildApiLevel >= MinApiLevel and BuildApiLevel >= TargetApiLevel
 // only if these api levels are not "preview" (not integers)
 if (int.TryParse(BuildApiLevel, out int intApi) &&
 int.TryParse(MinApiLevel, out int intMinApi) &&
 intApi < intMinApi)
 if (int.TryParse(BuildApiLevel, out int intApi))
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} <= MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 if (int.TryParse(MinApiLevel, out int intMinApi) && intApi < intMinApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }

 if (int.TryParse(TargetApiLevel, out int intTargetApi) && intApi < intTargetApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < TargetApiLevel={TargetApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }
 }

 string buildToolsFolder = Path.Combine(AndroidSdk, "build-tools", BuildToolsVersion);
Expand DownExpand Up@@ -397,7 +409,8 @@ public ApkBuilder(TaskLoggingHelper logger)
 File.WriteAllText(Path.Combine(OutputDir, "AndroidManifest.xml"),
 Utils.GetEmbeddedResource("AndroidManifest.xml")
 .Replace("%PackageName%", packageId)
 .Replace("%MinSdkLevel%", MinApiLevel));
 .Replace("%MinSdkLevel%", MinApiLevel)
 .Replace("%TargetSdkVersion%", TargetApiLevel));

 string javaCompilerArgs = $"-d obj -classpath src -bootclasspath {androidJar} -source 1.8 -target 1.8 ";
 Utils.RunProcess(logger, javac, javaCompilerArgs + javaActivityPath, workingDir: OutputDir);
Expand Down

2 changes: 1 addition & 1 deletion
src/tasks/AndroidAppBuilder/Templates/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 package="%PackageName%"
 a:versionCode="1"
 a:versionName="1.0">
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" />
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" a:targetSdkVersion="%TargetSdkVersion%" />
 <uses-permission a:name="android.permission.INTERNET"/>
 <uses-permission a:name="android.permission.READ_EXTERNAL_STORAGE"/>
 <uses-permission a:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[Android] Bump target SDK version in Android manifest by simonrozsival · Pull Request #80923 · dotnet/runtime · GitHub
Skip to content
[Android] Bump target SDK version in Android manifest#80923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jan 24, 2023
 Merged


[Android] Bump target SDK version in Android manifest
#80923
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6483af8

Set target SDK version


simonrozsival Jan 18, 2023
f9ec930

Update Android docs


simonrozsival Jan 18, 2023
7322e5f

Disable tests that do not pass with target API 31


simonrozsival Jan 18, 2023
cd8f5b9

Check if the installed Android SDK is up-to-date


simonrozsival Jan 23, 2023
b94ea98

Update skip explanation


simonrozsival Jan 24, 2023
aff24c6

Use latest SDK


simonrozsival Jan 24, 2023
11f8b24

Disable failing System.Net.Security test


simonrozsival Jan 24, 2023

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


8 changes: 4 additions & 4 deletions
docs/workflow/testing/libraries/testing-android.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ Android SDK and NDK can be automatically installed via the following script:
set -e

NDK_VER=r23c
SDK_VER=6200805_latest
SDK_API_LEVEL=29
SDK_BUILD_TOOLS=29.0.3
SDK_VER=9123335_latest
SDK_API_LEVEL=33
SDK_BUILD_TOOLS=33.0.1

if [[ "$OSTYPE" == "darwin"* ]]; then
 HOST_OS=darwin
Expand DownExpand Up@@ -63,7 +63,7 @@ Android Studio offers a convenient UI:
Before running a build you might want to set the Android SDK and NDK environment variables:
```
export ANDROID_SDK_ROOT=<PATH-TO-ANDROID-SDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
```

Now we're ready to build everything for Android:
Expand Down

4 changes: 3 additions & 1 deletion
src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,7 @@ public void ProcessStart_UseShellExecute_OnWindows_DoesNotThrow(bool isFolder)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [InlineData(true), InlineData(false)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_Executes(bool filenameAsUrl)
 {
 string filename = WriteScriptFile(TestDirectory, GetTestFileName(), returnValue: 42);
Expand DownExpand Up@@ -374,6 +375,7 @@ public void ProcessStart_UseShellExecute_ExecuteOrder()
 nameof(PlatformDetection.IsNotAppSandbox))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_WorkingDirectory()
 {
 // Create a directory that will ProcessStartInfo.WorkingDirectory
Expand DownExpand Up@@ -2561,7 +2563,7 @@ public void NonElevatedUser_QueryProcessNameOfSystemProcess()
 {
 // returns the username of the owner of the process or null if the username can't be queried.
 // for services.exe, this will be null.
 string? servicesUser = Helpers.GetProcessUserName(p);
 string? servicesUser = Helpers.GetProcessUserName(p);

 // this isn't really verifying that services.exe is owned by SYSTEM, but we are sure it is not owned by the current user.
 if (servicesUser != currentProcessUser)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@ public async Task DefaultConnect_EndToEnd_Ok(string host)
 [InlineData(true)]
 [InlineData(false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70981", TestPlatforms.OSX)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/68206", TestPlatforms.Android)]
 public Task ConnectWithRevocation_WithCallback(bool checkRevocation)
 {
 X509RevocationMode mode = checkRevocation ? X509RevocationMode.Online : X509RevocationMode.NoCheck;
Expand Down

3 changes: 3 additions & 0 deletions
src/tasks/AndroidAppBuilder/AndroidAppBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,8 @@ public class AndroidAppBuilderTask : Task

 public string? MinApiLevel { get; set; }

 public string? TargetApiLevel { get; set; }

 public string? BuildApiLevel { get; set; }

 public string? BuildToolsVersion { get; set; }
Expand DownExpand Up@@ -106,6 +108,7 @@ public override bool Execute()
 apkBuilder.AndroidSdk = AndroidSdk;
 apkBuilder.AndroidNdk = AndroidNdk;
 apkBuilder.MinApiLevel = MinApiLevel;
 apkBuilder.TargetApiLevel = TargetApiLevel;
 apkBuilder.BuildApiLevel = BuildApiLevel;
 apkBuilder.BuildToolsVersion = BuildToolsVersion;
 apkBuilder.StripDebugSymbols = StripDebugSymbols;
Expand Down

27 changes: 20 additions & 7 deletions
src/tasks/AndroidAppBuilder/ApkBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
public class ApkBuilder
{
 private const string DefaultMinApiLevel = "21";
 private const string DefaultTargetApiLevel = "31";

 public string? ProjectName { get; set; }
 public string? AppDir { get; set; }
 public string? AndroidNdk { get; set; }
 public string? AndroidSdk { get; set; }
 public string? MinApiLevel { get; set; }
 public string? TargetApiLevel { get; set; }
 public string? BuildApiLevel { get; set; }
 public string? BuildToolsVersion { get; set; }
 public string OutputDir { get; set; } = ""!;
Expand DownExpand Up@@ -118,14 +120,24 @@ public ApkBuilder(TaskLoggingHelper logger)
 if (string.IsNullOrEmpty(MinApiLevel))
 MinApiLevel = DefaultMinApiLevel;

 // make sure BuildApiLevel >= MinApiLevel
 if (string.IsNullOrEmpty(TargetApiLevel))
 TargetApiLevel = DefaultTargetApiLevel;

 // make sure BuildApiLevel >= MinApiLevel and BuildApiLevel >= TargetApiLevel
 // only if these api levels are not "preview" (not integers)
 if (int.TryParse(BuildApiLevel, out int intApi) &&
 int.TryParse(MinApiLevel, out int intMinApi) &&
 intApi < intMinApi)
 if (int.TryParse(BuildApiLevel, out int intApi))
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} <= MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 if (int.TryParse(MinApiLevel, out int intMinApi) && intApi < intMinApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }

 if (int.TryParse(TargetApiLevel, out int intTargetApi) && intApi < intTargetApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < TargetApiLevel={TargetApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }
 }

 string buildToolsFolder = Path.Combine(AndroidSdk, "build-tools", BuildToolsVersion);
Expand DownExpand Up@@ -397,7 +409,8 @@ public ApkBuilder(TaskLoggingHelper logger)
 File.WriteAllText(Path.Combine(OutputDir, "AndroidManifest.xml"),
 Utils.GetEmbeddedResource("AndroidManifest.xml")
 .Replace("%PackageName%", packageId)
 .Replace("%MinSdkLevel%", MinApiLevel));
 .Replace("%MinSdkLevel%", MinApiLevel)
 .Replace("%TargetSdkVersion%", TargetApiLevel));

 string javaCompilerArgs = $"-d obj -classpath src -bootclasspath {androidJar} -source 1.8 -target 1.8 ";
 Utils.RunProcess(logger, javac, javaCompilerArgs + javaActivityPath, workingDir: OutputDir);
Expand Down

2 changes: 1 addition & 1 deletion
src/tasks/AndroidAppBuilder/Templates/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 package="%PackageName%"
 a:versionCode="1"
 a:versionName="1.0">
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" />
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" a:targetSdkVersion="%TargetSdkVersion%" />
 <uses-permission a:name="android.permission.INTERNET"/>
 <uses-permission a:name="android.permission.READ_EXTERNAL_STORAGE"/>
 <uses-permission a:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Android] Bump target SDK version in Android manifest by simonrozsival · Pull Request #80923 · dotnet/runtime · GitHub
Skip to content
[Android] Bump target SDK version in Android manifest#80923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jan 24, 2023
 Merged


[Android] Bump target SDK version in Android manifest
#80923
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6483af8

Set target SDK version


simonrozsival Jan 18, 2023
f9ec930

Update Android docs


simonrozsival Jan 18, 2023
7322e5f

Disable tests that do not pass with target API 31


simonrozsival Jan 18, 2023
cd8f5b9

Check if the installed Android SDK is up-to-date


simonrozsival Jan 23, 2023
b94ea98

Update skip explanation


simonrozsival Jan 24, 2023
aff24c6

Use latest SDK


simonrozsival Jan 24, 2023
11f8b24

Disable failing System.Net.Security test


simonrozsival Jan 24, 2023

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


8 changes: 4 additions & 4 deletions
docs/workflow/testing/libraries/testing-android.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ Android SDK and NDK can be automatically installed via the following script:
set -e

NDK_VER=r23c
SDK_VER=6200805_latest
SDK_API_LEVEL=29
SDK_BUILD_TOOLS=29.0.3
SDK_VER=9123335_latest
SDK_API_LEVEL=33
SDK_BUILD_TOOLS=33.0.1

if [[ "$OSTYPE" == "darwin"* ]]; then
 HOST_OS=darwin
Expand DownExpand Up@@ -63,7 +63,7 @@ Android Studio offers a convenient UI:
Before running a build you might want to set the Android SDK and NDK environment variables:
```
export ANDROID_SDK_ROOT=<PATH-TO-ANDROID-SDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
```

Now we're ready to build everything for Android:
Expand Down

4 changes: 3 additions & 1 deletion
src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,7 @@ public void ProcessStart_UseShellExecute_OnWindows_DoesNotThrow(bool isFolder)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [InlineData(true), InlineData(false)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_Executes(bool filenameAsUrl)
 {
 string filename = WriteScriptFile(TestDirectory, GetTestFileName(), returnValue: 42);
Expand DownExpand Up@@ -374,6 +375,7 @@ public void ProcessStart_UseShellExecute_ExecuteOrder()
 nameof(PlatformDetection.IsNotAppSandbox))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_WorkingDirectory()
 {
 // Create a directory that will ProcessStartInfo.WorkingDirectory
Expand DownExpand Up@@ -2561,7 +2563,7 @@ public void NonElevatedUser_QueryProcessNameOfSystemProcess()
 {
 // returns the username of the owner of the process or null if the username can't be queried.
 // for services.exe, this will be null.
 string? servicesUser = Helpers.GetProcessUserName(p);
 string? servicesUser = Helpers.GetProcessUserName(p);

 // this isn't really verifying that services.exe is owned by SYSTEM, but we are sure it is not owned by the current user.
 if (servicesUser != currentProcessUser)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@ public async Task DefaultConnect_EndToEnd_Ok(string host)
 [InlineData(true)]
 [InlineData(false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70981", TestPlatforms.OSX)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/68206", TestPlatforms.Android)]
 public Task ConnectWithRevocation_WithCallback(bool checkRevocation)
 {
 X509RevocationMode mode = checkRevocation ? X509RevocationMode.Online : X509RevocationMode.NoCheck;
Expand Down

3 changes: 3 additions & 0 deletions
src/tasks/AndroidAppBuilder/AndroidAppBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,8 @@ public class AndroidAppBuilderTask : Task

 public string? MinApiLevel { get; set; }

 public string? TargetApiLevel { get; set; }

 public string? BuildApiLevel { get; set; }

 public string? BuildToolsVersion { get; set; }
Expand DownExpand Up@@ -106,6 +108,7 @@ public override bool Execute()
 apkBuilder.AndroidSdk = AndroidSdk;
 apkBuilder.AndroidNdk = AndroidNdk;
 apkBuilder.MinApiLevel = MinApiLevel;
 apkBuilder.TargetApiLevel = TargetApiLevel;
 apkBuilder.BuildApiLevel = BuildApiLevel;
 apkBuilder.BuildToolsVersion = BuildToolsVersion;
 apkBuilder.StripDebugSymbols = StripDebugSymbols;
Expand Down

27 changes: 20 additions & 7 deletions
src/tasks/AndroidAppBuilder/ApkBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
public class ApkBuilder
{
 private const string DefaultMinApiLevel = "21";
 private const string DefaultTargetApiLevel = "31";

 public string? ProjectName { get; set; }
 public string? AppDir { get; set; }
 public string? AndroidNdk { get; set; }
 public string? AndroidSdk { get; set; }
 public string? MinApiLevel { get; set; }
 public string? TargetApiLevel { get; set; }
 public string? BuildApiLevel { get; set; }
 public string? BuildToolsVersion { get; set; }
 public string OutputDir { get; set; } = ""!;
Expand DownExpand Up@@ -118,14 +120,24 @@ public ApkBuilder(TaskLoggingHelper logger)
 if (string.IsNullOrEmpty(MinApiLevel))
 MinApiLevel = DefaultMinApiLevel;

 // make sure BuildApiLevel >= MinApiLevel
 if (string.IsNullOrEmpty(TargetApiLevel))
 TargetApiLevel = DefaultTargetApiLevel;

 // make sure BuildApiLevel >= MinApiLevel and BuildApiLevel >= TargetApiLevel
 // only if these api levels are not "preview" (not integers)
 if (int.TryParse(BuildApiLevel, out int intApi) &&
 int.TryParse(MinApiLevel, out int intMinApi) &&
 intApi < intMinApi)
 if (int.TryParse(BuildApiLevel, out int intApi))
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} <= MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 if (int.TryParse(MinApiLevel, out int intMinApi) && intApi < intMinApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }

 if (int.TryParse(TargetApiLevel, out int intTargetApi) && intApi < intTargetApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < TargetApiLevel={TargetApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }
 }

 string buildToolsFolder = Path.Combine(AndroidSdk, "build-tools", BuildToolsVersion);
Expand DownExpand Up@@ -397,7 +409,8 @@ public ApkBuilder(TaskLoggingHelper logger)
 File.WriteAllText(Path.Combine(OutputDir, "AndroidManifest.xml"),
 Utils.GetEmbeddedResource("AndroidManifest.xml")
 .Replace("%PackageName%", packageId)
 .Replace("%MinSdkLevel%", MinApiLevel));
 .Replace("%MinSdkLevel%", MinApiLevel)
 .Replace("%TargetSdkVersion%", TargetApiLevel));

 string javaCompilerArgs = $"-d obj -classpath src -bootclasspath {androidJar} -source 1.8 -target 1.8 ";
 Utils.RunProcess(logger, javac, javaCompilerArgs + javaActivityPath, workingDir: OutputDir);
Expand Down

2 changes: 1 addition & 1 deletion
src/tasks/AndroidAppBuilder/Templates/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 package="%PackageName%"
 a:versionCode="1"
 a:versionName="1.0">
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" />
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" a:targetSdkVersion="%TargetSdkVersion%" />
 <uses-permission a:name="android.permission.INTERNET"/>
 <uses-permission a:name="android.permission.READ_EXTERNAL_STORAGE"/>
 <uses-permission a:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Android] Bump target SDK version in Android manifest by simonrozsival · Pull Request #80923 · dotnet/runtime · GitHub
Skip to content
[Android] Bump target SDK version in Android manifest#80923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jan 24, 2023
 Merged


[Android] Bump target SDK version in Android manifest
#80923
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6483af8

Set target SDK version


simonrozsival Jan 18, 2023
f9ec930

Update Android docs


simonrozsival Jan 18, 2023
7322e5f

Disable tests that do not pass with target API 31


simonrozsival Jan 18, 2023
cd8f5b9

Check if the installed Android SDK is up-to-date


simonrozsival Jan 23, 2023
b94ea98

Update skip explanation


simonrozsival Jan 24, 2023
aff24c6

Use latest SDK


simonrozsival Jan 24, 2023
11f8b24

Disable failing System.Net.Security test


simonrozsival Jan 24, 2023

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


8 changes: 4 additions & 4 deletions
docs/workflow/testing/libraries/testing-android.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ Android SDK and NDK can be automatically installed via the following script:
set -e

NDK_VER=r23c
SDK_VER=6200805_latest
SDK_API_LEVEL=29
SDK_BUILD_TOOLS=29.0.3
SDK_VER=9123335_latest
SDK_API_LEVEL=33
SDK_BUILD_TOOLS=33.0.1

if [[ "$OSTYPE" == "darwin"* ]]; then
 HOST_OS=darwin
Expand DownExpand Up@@ -63,7 +63,7 @@ Android Studio offers a convenient UI:
Before running a build you might want to set the Android SDK and NDK environment variables:
```
export ANDROID_SDK_ROOT=<PATH-TO-ANDROID-SDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
```

Now we're ready to build everything for Android:
Expand Down

4 changes: 3 additions & 1 deletion
src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,7 @@ public void ProcessStart_UseShellExecute_OnWindows_DoesNotThrow(bool isFolder)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [InlineData(true), InlineData(false)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_Executes(bool filenameAsUrl)
 {
 string filename = WriteScriptFile(TestDirectory, GetTestFileName(), returnValue: 42);
Expand DownExpand Up@@ -374,6 +375,7 @@ public void ProcessStart_UseShellExecute_ExecuteOrder()
 nameof(PlatformDetection.IsNotAppSandbox))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_WorkingDirectory()
 {
 // Create a directory that will ProcessStartInfo.WorkingDirectory
Expand DownExpand Up@@ -2561,7 +2563,7 @@ public void NonElevatedUser_QueryProcessNameOfSystemProcess()
 {
 // returns the username of the owner of the process or null if the username can't be queried.
 // for services.exe, this will be null.
 string? servicesUser = Helpers.GetProcessUserName(p);
 string? servicesUser = Helpers.GetProcessUserName(p);

 // this isn't really verifying that services.exe is owned by SYSTEM, but we are sure it is not owned by the current user.
 if (servicesUser != currentProcessUser)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@ public async Task DefaultConnect_EndToEnd_Ok(string host)
 [InlineData(true)]
 [InlineData(false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70981", TestPlatforms.OSX)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/68206", TestPlatforms.Android)]
 public Task ConnectWithRevocation_WithCallback(bool checkRevocation)
 {
 X509RevocationMode mode = checkRevocation ? X509RevocationMode.Online : X509RevocationMode.NoCheck;
Expand Down

3 changes: 3 additions & 0 deletions
src/tasks/AndroidAppBuilder/AndroidAppBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,8 @@ public class AndroidAppBuilderTask : Task

 public string? MinApiLevel { get; set; }

 public string? TargetApiLevel { get; set; }

 public string? BuildApiLevel { get; set; }

 public string? BuildToolsVersion { get; set; }
Expand DownExpand Up@@ -106,6 +108,7 @@ public override bool Execute()
 apkBuilder.AndroidSdk = AndroidSdk;
 apkBuilder.AndroidNdk = AndroidNdk;
 apkBuilder.MinApiLevel = MinApiLevel;
 apkBuilder.TargetApiLevel = TargetApiLevel;
 apkBuilder.BuildApiLevel = BuildApiLevel;
 apkBuilder.BuildToolsVersion = BuildToolsVersion;
 apkBuilder.StripDebugSymbols = StripDebugSymbols;
Expand Down

27 changes: 20 additions & 7 deletions
src/tasks/AndroidAppBuilder/ApkBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
public class ApkBuilder
{
 private const string DefaultMinApiLevel = "21";
 private const string DefaultTargetApiLevel = "31";

 public string? ProjectName { get; set; }
 public string? AppDir { get; set; }
 public string? AndroidNdk { get; set; }
 public string? AndroidSdk { get; set; }
 public string? MinApiLevel { get; set; }
 public string? TargetApiLevel { get; set; }
 public string? BuildApiLevel { get; set; }
 public string? BuildToolsVersion { get; set; }
 public string OutputDir { get; set; } = ""!;
Expand DownExpand Up@@ -118,14 +120,24 @@ public ApkBuilder(TaskLoggingHelper logger)
 if (string.IsNullOrEmpty(MinApiLevel))
 MinApiLevel = DefaultMinApiLevel;

 // make sure BuildApiLevel >= MinApiLevel
 if (string.IsNullOrEmpty(TargetApiLevel))
 TargetApiLevel = DefaultTargetApiLevel;

 // make sure BuildApiLevel >= MinApiLevel and BuildApiLevel >= TargetApiLevel
 // only if these api levels are not "preview" (not integers)
 if (int.TryParse(BuildApiLevel, out int intApi) &&
 int.TryParse(MinApiLevel, out int intMinApi) &&
 intApi < intMinApi)
 if (int.TryParse(BuildApiLevel, out int intApi))
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} <= MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 if (int.TryParse(MinApiLevel, out int intMinApi) && intApi < intMinApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }

 if (int.TryParse(TargetApiLevel, out int intTargetApi) && intApi < intTargetApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < TargetApiLevel={TargetApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }
 }

 string buildToolsFolder = Path.Combine(AndroidSdk, "build-tools", BuildToolsVersion);
Expand DownExpand Up@@ -397,7 +409,8 @@ public ApkBuilder(TaskLoggingHelper logger)
 File.WriteAllText(Path.Combine(OutputDir, "AndroidManifest.xml"),
 Utils.GetEmbeddedResource("AndroidManifest.xml")
 .Replace("%PackageName%", packageId)
 .Replace("%MinSdkLevel%", MinApiLevel));
 .Replace("%MinSdkLevel%", MinApiLevel)
 .Replace("%TargetSdkVersion%", TargetApiLevel));

 string javaCompilerArgs = $"-d obj -classpath src -bootclasspath {androidJar} -source 1.8 -target 1.8 ";
 Utils.RunProcess(logger, javac, javaCompilerArgs + javaActivityPath, workingDir: OutputDir);
Expand Down

2 changes: 1 addition & 1 deletion
src/tasks/AndroidAppBuilder/Templates/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 package="%PackageName%"
 a:versionCode="1"
 a:versionName="1.0">
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" />
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" a:targetSdkVersion="%TargetSdkVersion%" />
 <uses-permission a:name="android.permission.INTERNET"/>
 <uses-permission a:name="android.permission.READ_EXTERNAL_STORAGE"/>
 <uses-permission a:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jan 24, 2023
 Merged


[Android] Bump target SDK version in Android manifest
#80923
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
6483af8

Set target SDK version


simonrozsival Jan 18, 2023
f9ec930

Update Android docs


simonrozsival Jan 18, 2023
7322e5f

Disable tests that do not pass with target API 31


simonrozsival Jan 18, 2023
cd8f5b9

Check if the installed Android SDK is up-to-date


simonrozsival Jan 23, 2023
b94ea98

Update skip explanation


simonrozsival Jan 24, 2023
aff24c6

Use latest SDK


simonrozsival Jan 24, 2023
11f8b24

Disable failing System.Net.Security test


simonrozsival Jan 24, 2023

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


8 changes: 4 additions & 4 deletions
docs/workflow/testing/libraries/testing-android.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ Android SDK and NDK can be automatically installed via the following script:
set -e

NDK_VER=r23c
SDK_VER=6200805_latest
SDK_API_LEVEL=29
SDK_BUILD_TOOLS=29.0.3
SDK_VER=9123335_latest
SDK_API_LEVEL=33
SDK_BUILD_TOOLS=33.0.1

if [[ "$OSTYPE" == "darwin"* ]]; then
 HOST_OS=darwin
Expand DownExpand Up@@ -63,7 +63,7 @@ Android Studio offers a convenient UI:
Before running a build you might want to set the Android SDK and NDK environment variables:
```
export ANDROID_SDK_ROOT=<PATH-TO-ANDROID-SDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
```

Now we're ready to build everything for Android:
Expand Down

4 changes: 3 additions & 1 deletion
src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -302,6 +302,7 @@ public void ProcessStart_UseShellExecute_OnWindows_DoesNotThrow(bool isFolder)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [InlineData(true), InlineData(false)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_Executes(bool filenameAsUrl)
 {
 string filename = WriteScriptFile(TestDirectory, GetTestFileName(), returnValue: 42);
Expand DownExpand Up@@ -374,6 +375,7 @@ public void ProcessStart_UseShellExecute_ExecuteOrder()
 nameof(PlatformDetection.IsNotAppSandbox))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS and tvOS.")]
 [SkipOnPlatform(TestPlatforms.Android, "Android doesn't allow executing custom shell scripts")]
 public void ProcessStart_UseShellExecute_WorkingDirectory()
 {
 // Create a directory that will ProcessStartInfo.WorkingDirectory
Expand DownExpand Up@@ -2561,7 +2563,7 @@ public void NonElevatedUser_QueryProcessNameOfSystemProcess()
 {
 // returns the username of the owner of the process or null if the username can't be queried.
 // for services.exe, this will be null.
 string? servicesUser = Helpers.GetProcessUserName(p);
 string? servicesUser = Helpers.GetProcessUserName(p);

 // this isn't really verifying that services.exe is owned by SYSTEM, but we are sure it is not owned by the current user.
 if (servicesUser != currentProcessUser)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@ public async Task DefaultConnect_EndToEnd_Ok(string host)
 [InlineData(true)]
 [InlineData(false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70981", TestPlatforms.OSX)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/68206", TestPlatforms.Android)]
 public Task ConnectWithRevocation_WithCallback(bool checkRevocation)
 {
 X509RevocationMode mode = checkRevocation ? X509RevocationMode.Online : X509RevocationMode.NoCheck;
Expand Down

3 changes: 3 additions & 0 deletions
src/tasks/AndroidAppBuilder/AndroidAppBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,8 @@ public class AndroidAppBuilderTask : Task

 public string? MinApiLevel { get; set; }

 public string? TargetApiLevel { get; set; }

 public string? BuildApiLevel { get; set; }

 public string? BuildToolsVersion { get; set; }
Expand DownExpand Up@@ -106,6 +108,7 @@ public override bool Execute()
 apkBuilder.AndroidSdk = AndroidSdk;
 apkBuilder.AndroidNdk = AndroidNdk;
 apkBuilder.MinApiLevel = MinApiLevel;
 apkBuilder.TargetApiLevel = TargetApiLevel;
 apkBuilder.BuildApiLevel = BuildApiLevel;
 apkBuilder.BuildToolsVersion = BuildToolsVersion;
 apkBuilder.StripDebugSymbols = StripDebugSymbols;
Expand Down

27 changes: 20 additions & 7 deletions
src/tasks/AndroidAppBuilder/ApkBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
public class ApkBuilder
{
 private const string DefaultMinApiLevel = "21";
 private const string DefaultTargetApiLevel = "31";

 public string? ProjectName { get; set; }
 public string? AppDir { get; set; }
 public string? AndroidNdk { get; set; }
 public string? AndroidSdk { get; set; }
 public string? MinApiLevel { get; set; }
 public string? TargetApiLevel { get; set; }
 public string? BuildApiLevel { get; set; }
 public string? BuildToolsVersion { get; set; }
 public string OutputDir { get; set; } = ""!;
Expand DownExpand Up@@ -118,14 +120,24 @@ public ApkBuilder(TaskLoggingHelper logger)
 if (string.IsNullOrEmpty(MinApiLevel))
 MinApiLevel = DefaultMinApiLevel;

 // make sure BuildApiLevel >= MinApiLevel
 if (string.IsNullOrEmpty(TargetApiLevel))
 TargetApiLevel = DefaultTargetApiLevel;

 // make sure BuildApiLevel >= MinApiLevel and BuildApiLevel >= TargetApiLevel
 // only if these api levels are not "preview" (not integers)
 if (int.TryParse(BuildApiLevel, out int intApi) &&
 int.TryParse(MinApiLevel, out int intMinApi) &&
 intApi < intMinApi)
 if (int.TryParse(BuildApiLevel, out int intApi))
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} <= MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 if (int.TryParse(MinApiLevel, out int intMinApi) && intApi < intMinApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < MinApiLevel={MinApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }

 if (int.TryParse(TargetApiLevel, out int intTargetApi) && intApi < intTargetApi)
 {
 throw new ArgumentException($"BuildApiLevel={BuildApiLevel} < TargetApiLevel={TargetApiLevel}. " +
 "Make sure you've downloaded some recent build-tools in Android SDK");
 }
 }

 string buildToolsFolder = Path.Combine(AndroidSdk, "build-tools", BuildToolsVersion);
Expand DownExpand Up@@ -397,7 +409,8 @@ public ApkBuilder(TaskLoggingHelper logger)
 File.WriteAllText(Path.Combine(OutputDir, "AndroidManifest.xml"),
 Utils.GetEmbeddedResource("AndroidManifest.xml")
 .Replace("%PackageName%", packageId)
 .Replace("%MinSdkLevel%", MinApiLevel));
 .Replace("%MinSdkLevel%", MinApiLevel)
 .Replace("%TargetSdkVersion%", TargetApiLevel));

 string javaCompilerArgs = $"-d obj -classpath src -bootclasspath {androidJar} -source 1.8 -target 1.8 ";
 Utils.RunProcess(logger, javac, javaCompilerArgs + javaActivityPath, workingDir: OutputDir);
Expand Down

2 changes: 1 addition & 1 deletion
src/tasks/AndroidAppBuilder/Templates/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 package="%PackageName%"
 a:versionCode="1"
 a:versionName="1.0">
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" />
 <uses-sdk a:minSdkVersion="%MinSdkLevel%" a:targetSdkVersion="%TargetSdkVersion%" />
 <uses-permission a:name="android.permission.INTERNET"/>
 <uses-permission a:name="android.permission.READ_EXTERNAL_STORAGE"/>
 <uses-permission a:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
Expand Down