From cb1e7f7b104b0f89ceeb42c31d48f8c98cacef46 Mon Sep 17 00:00:00 2001
From: Todd Anderson <tanderson@launchdarkly.com>
Date: Fri, 17 Nov 2023 13:45:35 -0600
Subject: [PATCH] fixing build

---
 .github/workflows/ci.yml                              |  8 ++------
 .../LaunchDarkly.ClientSdk.csproj                     |  2 ++
 .../AndroidManifest.xml                               | 11 ++++++-----
 .../LaunchDarkly.ClientSdk.Android.Tests.csproj       |  4 +---
 .../MainActivity.cs                                   |  2 +-
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b2ea2c61..7d0ae8b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,12 +85,8 @@ jobs:
           api-level: 27
           script: |
             adb logcat mono-stdout:D AndroidRuntime:D *:S | tee test-run.log &
-            adb install tests/LaunchDarkly.ClientSdk.Android.Tests/bin/Debug/net7.0-android/com.companyname.LaunchDarkly.ClientSdk.Android.Tests-Signed.apk
-            adb shell monkey -p com.launchdarkly.LaunchDarkly.ClientSdk.Android.Tests 1
+            adb install tests/LaunchDarkly.ClientSdk.Android.Tests/bin/Debug/net7.0-android/com.launchdarkly.androidtests-Signed.apk
+            adb shell monkey -p com.launchdarkly.androidtests -c android.intent.category.LAUNCHER 1
             "( tail -f -c+0 test-run.log & ) | grep -q 'Tests run:'"
             cat test-run.log | tr -s ' ' | cut -d ' ' -f 1,2,7-
             if grep '\[FAIL\]' test-run.log >/dev/null; then exit 1; fi
-
-# TODO: update build commands to not use msbuild if possible
-# TODO: make teraform PR to get repo access to ARN.  Also need to update the github-sdk-release role to get access to S3 blobs from .ldrelease/secrets.properties
-# TODO: incorporate and update https://github.com/launchdarkly/js-core/blob/main/actions/release-secrets/action.yml to support blobs
diff --git a/src/LaunchDarkly.ClientSdk/LaunchDarkly.ClientSdk.csproj b/src/LaunchDarkly.ClientSdk/LaunchDarkly.ClientSdk.csproj
index 15e070e4..3e4078f2 100644
--- a/src/LaunchDarkly.ClientSdk/LaunchDarkly.ClientSdk.csproj
+++ b/src/LaunchDarkly.ClientSdk/LaunchDarkly.ClientSdk.csproj
@@ -7,6 +7,8 @@
          want to even mention the Android/iOS/Mac/Windows targets, because we're in an environment
          that doesn't have the MAUI tools installed. That is currently the case in
          the release phase where we build HTML documentation. -->     
+
+    <!-- TODO bring back netstandard target -->
     <BuildFrameworks Condition="'$(BUILDFRAMEWORKS)' == ''">net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-windows</BuildFrameworks>
     <TargetFrameworks>$(BUILDFRAMEWORKS)</TargetFrameworks>
     <!-- TODO: determine if this UseMauiEssentials needs to be inside a conditional -->
diff --git a/tests/LaunchDarkly.ClientSdk.Android.Tests/AndroidManifest.xml b/tests/LaunchDarkly.ClientSdk.Android.Tests/AndroidManifest.xml
index 3095dd9c..2d1befd1 100644
--- a/tests/LaunchDarkly.ClientSdk.Android.Tests/AndroidManifest.xml
+++ b/tests/LaunchDarkly.ClientSdk.Android.Tests/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-  <application android:allowBackup="true" android:icon="@mipmap/appicon" android:label="@string/app_name" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true">
-  </application>
-  <uses-permission android:name="android.permission.INTERNET" />
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.launchdarkly.androidtests" android:versionCode="1" android:versionName="1.0">
+	<application android:allowBackup="true" android:usesCleartextTraffic="true" android:icon="@mipmap/appicon" android:label="@string/app_name" android:supportsRtl="true"></application>
+	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-sdk />
+</manifest>
\ No newline at end of file
diff --git a/tests/LaunchDarkly.ClientSdk.Android.Tests/LaunchDarkly.ClientSdk.Android.Tests.csproj b/tests/LaunchDarkly.ClientSdk.Android.Tests/LaunchDarkly.ClientSdk.Android.Tests.csproj
index 3090fad0..b0d6e728 100644
--- a/tests/LaunchDarkly.ClientSdk.Android.Tests/LaunchDarkly.ClientSdk.Android.Tests.csproj
+++ b/tests/LaunchDarkly.ClientSdk.Android.Tests/LaunchDarkly.ClientSdk.Android.Tests.csproj
@@ -27,13 +27,11 @@
          conditional compilation, rather than by changing these includes; when we used
          to use individual file links, it was too easy to forget to update them.
     -->
-    <Compile Include="..\..\tests\LaunchDarkly.ClientSdk.Tests\**\*.cs" Exclude="..\..\tests\LaunchDarkly.ClientSdk.Tests\bin\**\*.cs;..\..\tests\LaunchDarkly.ClientSdk.Tests\obj\**\*.cs" />
+    <Compile Include="..\LaunchDarkly.ClientSdk.Tests\**\*.cs" Exclude="..\LaunchDarkly.ClientSdk.Tests\bin\**\*.cs;..\..\tests\LaunchDarkly.ClientSdk.Tests\obj\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\LaunchDarkly.ClientSdk\LaunchDarkly.ClientSdk.csproj">
-      <Project>{7717A2B2-9905-40A7-989F-790139D69543}</Project>
-      <Name>LaunchDarkly.ClientSdk</Name>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/tests/LaunchDarkly.ClientSdk.Android.Tests/MainActivity.cs b/tests/LaunchDarkly.ClientSdk.Android.Tests/MainActivity.cs
index 5dedec15..68b097c0 100644
--- a/tests/LaunchDarkly.ClientSdk.Android.Tests/MainActivity.cs
+++ b/tests/LaunchDarkly.ClientSdk.Android.Tests/MainActivity.cs
@@ -7,7 +7,7 @@
 
 namespace LaunchDarkly.ClientSdk.Android.Tests;
 
-[Activity(Label = "LaunchDarkly.Sdk.Client.Android.Tests", MainLauncher = true)]
+[Activity(Label = "MainActivity", MainLauncher = true)]
 public class MainActivity : RunnerActivity
 {