From 3fac30d1c55fb8ef65d6bdf6607fc49cdc57372a Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Mon, 14 Dec 2020 15:45:27 -0500 Subject: [PATCH] Bump to Guardsquare/proguard/master@912d1493 [v7.0.1] Bump from ProGuard v7.0.0 to v7.0.1. Changes: https://github.com/Guardsquare/proguard/compare/84e8560d325d80beec8f6d239af52a1095010010...912d149394fc96072905735649327d4101980832 * Guardsquare/proguard@912d1493: Bump to version 7.0.1 * Guardsquare/proguard@6a56cc22: Merge pull request #93 from Guardsquare/mrjameshamilton-patch-1 * Guardsquare/proguard@cecb95f8: Add release note for Kotlin 1.4 metadata fix * Guardsquare/proguard@cbbecd81: Merge remote-tracking branch 'github/master' * Guardsquare/proguard@46b7300d: Backport DGD-2494 * Guardsquare/proguard@679425e5: Add Gradle Kotlin DSL example * Guardsquare/proguard@8532cfa2: Highlight README code snippets. * Guardsquare/proguard@c70af673: Add 'getting help' section to README with community link. * Guardsquare/proguard@d0e82308: Cleaned up ReTrace arguments. * Guardsquare/proguard@67ba15a9: Backport retrace changes Update `xaprepare` so that when `external/proguard` is updated, the `MSBuild` and `MSBuildDevice` test areas are run. --- .../xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs | 5 +++++ external/proguard | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs b/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs index 29fe310ffc0..01990fc31ce 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs @@ -68,6 +68,11 @@ protected override async Task Execute (Context context) testAreas.Add ("Designer"); } + if (file.Contains ("external/proguard")) { + testAreas.Add ("MSBuild"); + testAreas.Add ("MSBuildDevice"); + } + if (file.Contains ("src/aapt2")) { testAreas.Add ("MSBuild"); } diff --git a/external/proguard b/external/proguard index 84e8560d325..912d149394f 160000 --- a/external/proguard +++ b/external/proguard @@ -1 +1 @@ -Subproject commit 84e8560d325d80beec8f6d239af52a1095010010 +Subproject commit 912d149394fc96072905735649327d4101980832