Skip to content

Remove $(_AndroidAllowDeltaInstall) feature and related infrastructure #10237

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
merged 4 commits into from
Jun 24, 2025
Merged

Remove $(_AndroidAllowDeltaInstall) feature and related infrastructure #10237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8fcedf
Initial plan for issue
Copilot Jun 23, 2025
7f74f7a
Remove $(_AndroidAllowDeltaInstall) feature and related code
Copilot Jun 23, 2025
9559eeb
Testing: https://dev.azure.com/devdiv/DevDiv/_git/android-platform-su…
jonathanpeppers Jun 23, 2025
5174424
Bump to DevDiv/android-platform-support/main@a8c83d7e
jonathanpeppers Jun 23, 2025
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
2 changes: 1 addition & 1 deletion .external
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DevDiv/android-platform-support:main@ba980b15c8d61f10d902602ad4e614423f39b43a
DevDiv/android-platform-support:main@a8c83d7e7f77634433086d79fa3674f63cef3098
3 changes: 0 additions & 3 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
<!-- Android binary, to support delta APK install -->
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 9.0.5 -->
<add key="darc-pub-dotnet-emsdk-3cddc1f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3cddc1fe/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-207cda3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-207cda34/nuget/v3/index.json" />
Expand Down
1 change: 0 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public static class KnownProperties
public const string IntermediateOutputPath = "IntermediateOutputPath";
public const string OutputType = "OutputType";
public const string AndroidClassParser = "AndroidClassParser";
public const string _AndroidAllowDeltaInstall = "_AndroidAllowDeltaInstall";
public const string Nullable = "Nullable";
public const string ImplicitUsings = "ImplicitUsings";
public const string PublishAot = "PublishAot";
Expand Down
19 changes: 1 addition & 18 deletions tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,70 +283,54 @@ public override void OnCreate ()
static object [] DebuggerTestCases = new object [] {
new object[] {
/* embedAssemblies */ true,
/* allowDeltaInstall */ false,
/* user */ null,
/* packageFormat */ "apk",
/* useLatestSdk */ true,
},
new object[] {
/* embedAssemblies */ true,
/* allowDeltaInstall */ false,
/* user */ null,
/* packageFormat */ "apk",
/* useLatestSdk */ false,
},
new object[] {
/* embedAssemblies */ false,
/* allowDeltaInstall */ false,
/* user */ null,
/* packageFormat */ "apk",
/* useLatestSdk */ true,
},
new object[] {
/* embedAssemblies */ false,
/* allowDeltaInstall */ true,
/* user */ null,
/* packageFormat */ "apk",
/* useLatestSdk */ true,
},
new object[] {
/* embedAssemblies */ true,
/* allowDeltaInstall */ false,
/* user */ DeviceTest.GuestUserName,
/* packageFormat */ "apk",
/* useLatestSdk */ true,
},
new object[] {
/* embedAssemblies */ false,
/* allowDeltaInstall */ false,
/* user */ DeviceTest.GuestUserName,
/* packageFormat */ "apk",
/* useLatestSdk */ true,
},
new object[] {
/* embedAssemblies */ true,
/* allowDeltaInstall */ false,
/* user */ null,
/* packageFormat */ "aab",
/* useLatestSdk */ true,
},
new object[] {
/* embedAssemblies */ false,
/* allowDeltaInstall */ false,
/* user */ null,
/* packageFormat */ "aab",
/* useLatestSdk */ true,
},
new object[] {
/* embedAssemblies */ true,
/* allowDeltaInstall */ false,
/* user */ DeviceTest.GuestUserName,
/* packageFormat */ "aab",
/* useLatestSdk */ true,
},
new object[] {
/* embedAssemblies */ false,
/* allowDeltaInstall */ false,
/* user */ DeviceTest.GuestUserName,
/* packageFormat */ "aab",
/* useLatestSdk */ true,
Expand All @@ -357,7 +341,7 @@ public override void OnCreate ()
[Test, Category ("Debugger"), Category ("WearOS")]
[TestCaseSource (nameof(DebuggerTestCases))]
[Retry (5)]
public void ApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, bool allowDeltaInstall, string username, string packageFormat, bool useLatestSdk)
public void ApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, string username, string packageFormat, bool useLatestSdk)
{
AssertCommercialBuild ();
SwitchUser ();
Expand Down Expand Up @@ -409,7 +393,6 @@ public Foo ()
app.AddReference (lib);
var abis = new [] { DeviceAbi };
app.SetRuntimeIdentifiers (abis);
app.SetProperty (KnownProperties._AndroidAllowDeltaInstall, allowDeltaInstall.ToString ());
app.SetDefaultTargetDevice ();
using (var libBuilder = CreateDllBuilder (Path.Combine (path, lib.ProjectName)))
using (var appBuilder = CreateApkBuilder (Path.Combine (path, app.ProjectName))) {
Expand Down
Loading