From 90a2d7c528de8f15cade7cb07e2216f8e5613209 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 24 Jul 2024 18:33:09 -0400 Subject: [PATCH 1/3] Attempt to sign jar content --- .../yaml-templates/build-linux.yaml | 2 ++ .../create-packs/Microsoft.Android.Sdk.proj | 1 + build-tools/create-packs/SignList.targets | 27 +++++++++++++++++++ build-tools/create-packs/SignList.xml | 5 ++++ 4 files changed, 35 insertions(+) create mode 100644 build-tools/create-packs/SignList.targets diff --git a/build-tools/automation/yaml-templates/build-linux.yaml b/build-tools/automation/yaml-templates/build-linux.yaml index f34a25ba776..c142d9031f7 100644 --- a/build-tools/automation/yaml-templates/build-linux.yaml +++ b/build-tools/automation/yaml-templates/build-linux.yaml @@ -87,6 +87,8 @@ stages: $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nuget-linux && ln $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nuget-unsigned/SignList.xml $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nuget-linux + ln $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nuget-unsigned/SignList.targets + $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nuget-linux workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android displayName: copy linux sdk diff --git a/build-tools/create-packs/Microsoft.Android.Sdk.proj b/build-tools/create-packs/Microsoft.Android.Sdk.proj index c23f757786b..925a4ec13e5 100644 --- a/build-tools/create-packs/Microsoft.Android.Sdk.proj +++ b/build-tools/create-packs/Microsoft.Android.Sdk.proj @@ -71,6 +71,7 @@ core workload SDK packs imported by WorkloadManifest.targets. Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidLatestUnstableApiLevel)' and Exists('$(_MonoAndroidNETOutputRoot)$(AndroidLatestUnstableApiLevel)\AndroidApiInfo.xml') " /> + diff --git a/build-tools/create-packs/SignList.targets b/build-tools/create-packs/SignList.targets new file mode 100644 index 00000000000..a72fc81f7ce --- /dev/null +++ b/build-tools/create-packs/SignList.targets @@ -0,0 +1,27 @@ + + + + + <_JarPath Condition=" '$(JAVA_HOME_17_X64)' != '' ">$(JAVA_HOME_17_X64)/bin/jar + <_JarPath Condition=" '$(_JarPath)' == '' ">jar + + + + <_NestedBundleTool Include="$(_WorkingDir)**\bundletool.jar" /> + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build-tools/create-packs/SignList.xml b/build-tools/create-packs/SignList.xml index 9c35204262a..90bb07be3f1 100644 --- a/build-tools/create-packs/SignList.xml +++ b/build-tools/create-packs/SignList.xml @@ -19,6 +19,8 @@ + + @@ -34,4 +36,7 @@ + + + From 7a6357b95aa1c3ee1ed0b63df974eedeea6af1fd Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 24 Jul 2024 18:35:00 -0400 Subject: [PATCH 2/3] [ci] Ignore unsigned bundletool.jar content --- build-tools/create-packs/SignVerifyIgnore.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/build-tools/create-packs/SignVerifyIgnore.txt b/build-tools/create-packs/SignVerifyIgnore.txt index 16340349a32..dafe2965001 100644 --- a/build-tools/create-packs/SignVerifyIgnore.txt +++ b/build-tools/create-packs/SignVerifyIgnore.txt @@ -1,2 +1,3 @@ **\*.xml,ignore unsigned xml **\cab*.cab.cab,ignore unsigned .cab +**\com\sun\jna\win32-*\jnidispatch.dll, ignore external bundletool.jar content From acbf375a806850eccfa5355aba7f0c7d4acc0411 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 24 Jul 2024 19:00:02 -0400 Subject: [PATCH 3/3] Revert "Attempt to sign jar content" This reverts commit 90a2d7c528de8f15cade7cb07e2216f8e5613209. --- .../yaml-templates/build-linux.yaml | 2 -- .../create-packs/Microsoft.Android.Sdk.proj | 1 - build-tools/create-packs/SignList.targets | 27 ------------------- build-tools/create-packs/SignList.xml | 5 ---- 4 files changed, 35 deletions(-) delete mode 100644 build-tools/create-packs/SignList.targets diff --git a/build-tools/automation/yaml-templates/build-linux.yaml b/build-tools/automation/yaml-templates/build-linux.yaml index c142d9031f7..f34a25ba776 100644 --- a/build-tools/automation/yaml-templates/build-linux.yaml +++ b/build-tools/automation/yaml-templates/build-linux.yaml @@ -87,8 +87,6 @@ stages: $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nuget-linux && ln $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nuget-unsigned/SignList.xml $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nuget-linux - ln $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nuget-unsigned/SignList.targets - $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nuget-linux workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android displayName: copy linux sdk diff --git a/build-tools/create-packs/Microsoft.Android.Sdk.proj b/build-tools/create-packs/Microsoft.Android.Sdk.proj index 925a4ec13e5..c23f757786b 100644 --- a/build-tools/create-packs/Microsoft.Android.Sdk.proj +++ b/build-tools/create-packs/Microsoft.Android.Sdk.proj @@ -71,7 +71,6 @@ core workload SDK packs imported by WorkloadManifest.targets. Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidLatestUnstableApiLevel)' and Exists('$(_MonoAndroidNETOutputRoot)$(AndroidLatestUnstableApiLevel)\AndroidApiInfo.xml') " /> - diff --git a/build-tools/create-packs/SignList.targets b/build-tools/create-packs/SignList.targets deleted file mode 100644 index a72fc81f7ce..00000000000 --- a/build-tools/create-packs/SignList.targets +++ /dev/null @@ -1,27 +0,0 @@ - - - - - <_JarPath Condition=" '$(JAVA_HOME_17_X64)' != '' ">$(JAVA_HOME_17_X64)/bin/jar - <_JarPath Condition=" '$(_JarPath)' == '' ">jar - - - - <_NestedBundleTool Include="$(_WorkingDir)**\bundletool.jar" /> - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build-tools/create-packs/SignList.xml b/build-tools/create-packs/SignList.xml index 90bb07be3f1..9c35204262a 100644 --- a/build-tools/create-packs/SignList.xml +++ b/build-tools/create-packs/SignList.xml @@ -19,8 +19,6 @@ - - @@ -36,7 +34,4 @@ - - -