Skip to content

Commit 0bb6cc3

Browse files
[xabt] remove $(_AndroidAllowDeltaInstall) (#10237)
Context: https://github.com/MicrosoftDocs/xamarin-docs/blob/0506e3bf14b520776fc7d33781f89069bbc57138/docs/android/deploy-test/apply-changes.md Fixes: #10188 This PR removes the `$(_AndroidAllowDeltaInstall)` MSBuild property and related infrastructure as this feature has been removed from IDEs. ## Changes Made - **Removed property constant**: Eliminated `_AndroidAllowDeltaInstall` from `KnownProperties.cs` - **Updated test cases**: Modified `DebuggingTest.cs` to remove the `allowDeltaInstall` parameter from all test cases and removed one test case that specifically tested the delta install functionality - **Removed NuGet feed**: Eliminated the "xamarin.android util" feed from `NuGet.config` that was used for the `Xamarin.Android.Deploy.Installer` package ## Bump android-platform-support Bump to DevDiv/android-platform-support/main@a8c83d7e Changes: https://devdiv.visualstudio.com/DevDiv/_git/android-platform-support/branchCompare?baseVersion=GCba980b15c8d61f10d902602ad4e614423f39b43a&targetVersion=GCa8c83d7e7f77634433086d79fa3674f63cef3098 * [xabdt] Remove `$(_AndroidAllowDeltaInstall)` support * Bump to dotnet/android-tools@d4b55297 * Update `Feeds\README.md` for `$XAMARIN_ANDROID_MANIFEST_URL` ## Files Modified - `src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownProperties.cs` - Removed property constant - `tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs` - Updated test method signature and test cases - `NuGet.config` - Removed deprecated NuGet feed and related comments The changes are minimal and surgical, removing only the specific delta install functionality without affecting other features. No `PackageReference` to `Xamarin.Android.Deploy.Installer` was found in the codebase, and no related .dll files exist in the repository. Co-authored-by: Jonathan Peppers <[email protected]>
1 parent 1d22ff8 commit 0bb6cc3

File tree

4 files changed

+2
-23
lines changed

4 files changed

+2
-23
lines changed

.external

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DevDiv/android-platform-support:main@ba980b15c8d61f10d902602ad4e614423f39b43a
1+
DevDiv/android-platform-support:main@a8c83d7e7f77634433086d79fa3674f63cef3098

NuGet.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
1717
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
1818
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
19-
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
20-
<!-- Android binary, to support delta APK install -->
21-
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
2219
<!-- Added manually for dotnet/runtime 9.0.5 -->
2320
<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" />
2421
<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" />

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownProperties.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public static class KnownProperties
3333
public const string IntermediateOutputPath = "IntermediateOutputPath";
3434
public const string OutputType = "OutputType";
3535
public const string AndroidClassParser = "AndroidClassParser";
36-
public const string _AndroidAllowDeltaInstall = "_AndroidAllowDeltaInstall";
3736
public const string Nullable = "Nullable";
3837
public const string ImplicitUsings = "ImplicitUsings";
3938
public const string PublishAot = "PublishAot";

tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -283,70 +283,54 @@ public override void OnCreate ()
283283
static object [] DebuggerTestCases = new object [] {
284284
new object[] {
285285
/* embedAssemblies */ true,
286-
/* allowDeltaInstall */ false,
287286
/* user */ null,
288287
/* packageFormat */ "apk",
289288
/* useLatestSdk */ true,
290289
},
291290
new object[] {
292291
/* embedAssemblies */ true,
293-
/* allowDeltaInstall */ false,
294292
/* user */ null,
295293
/* packageFormat */ "apk",
296294
/* useLatestSdk */ false,
297295
},
298296
new object[] {
299297
/* embedAssemblies */ false,
300-
/* allowDeltaInstall */ false,
301-
/* user */ null,
302-
/* packageFormat */ "apk",
303-
/* useLatestSdk */ true,
304-
},
305-
new object[] {
306-
/* embedAssemblies */ false,
307-
/* allowDeltaInstall */ true,
308298
/* user */ null,
309299
/* packageFormat */ "apk",
310300
/* useLatestSdk */ true,
311301
},
312302
new object[] {
313303
/* embedAssemblies */ true,
314-
/* allowDeltaInstall */ false,
315304
/* user */ DeviceTest.GuestUserName,
316305
/* packageFormat */ "apk",
317306
/* useLatestSdk */ true,
318307
},
319308
new object[] {
320309
/* embedAssemblies */ false,
321-
/* allowDeltaInstall */ false,
322310
/* user */ DeviceTest.GuestUserName,
323311
/* packageFormat */ "apk",
324312
/* useLatestSdk */ true,
325313
},
326314
new object[] {
327315
/* embedAssemblies */ true,
328-
/* allowDeltaInstall */ false,
329316
/* user */ null,
330317
/* packageFormat */ "aab",
331318
/* useLatestSdk */ true,
332319
},
333320
new object[] {
334321
/* embedAssemblies */ false,
335-
/* allowDeltaInstall */ false,
336322
/* user */ null,
337323
/* packageFormat */ "aab",
338324
/* useLatestSdk */ true,
339325
},
340326
new object[] {
341327
/* embedAssemblies */ true,
342-
/* allowDeltaInstall */ false,
343328
/* user */ DeviceTest.GuestUserName,
344329
/* packageFormat */ "aab",
345330
/* useLatestSdk */ true,
346331
},
347332
new object[] {
348333
/* embedAssemblies */ false,
349-
/* allowDeltaInstall */ false,
350334
/* user */ DeviceTest.GuestUserName,
351335
/* packageFormat */ "aab",
352336
/* useLatestSdk */ true,
@@ -357,7 +341,7 @@ public override void OnCreate ()
357341
[Test, Category ("Debugger"), Category ("WearOS")]
358342
[TestCaseSource (nameof(DebuggerTestCases))]
359343
[Retry (5)]
360-
public void ApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, bool allowDeltaInstall, string username, string packageFormat, bool useLatestSdk)
344+
public void ApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, string username, string packageFormat, bool useLatestSdk)
361345
{
362346
AssertCommercialBuild ();
363347
SwitchUser ();
@@ -409,7 +393,6 @@ public Foo ()
409393
app.AddReference (lib);
410394
var abis = new [] { DeviceAbi };
411395
app.SetRuntimeIdentifiers (abis);
412-
app.SetProperty (KnownProperties._AndroidAllowDeltaInstall, allowDeltaInstall.ToString ());
413396
app.SetDefaultTargetDevice ();
414397
using (var libBuilder = CreateDllBuilder (Path.Combine (path, lib.ProjectName)))
415398
using (var appBuilder = CreateApkBuilder (Path.Combine (path, app.ProjectName))) {

0 commit comments

Comments
 (0)