Skip to content

Commit

Permalink
Merge branch 'release/8.0.2xx' into dev/grendel/net8-bump-binutils
Browse files Browse the repository at this point in the history
* release/8.0.2xx:
  [Mono.Android] fix potential leak of RunnableImplementors (#8900)
  Bump to xamarin/monodroid@21aed734 (#8905)
  [Xamarin.Android.Build.Tasks] fix detection of "Android libraries" (#8904)
  [ci] Do not use @self annotation for templates (#8783)
  Bump to xamarin/xamarin-android-tools/release/8.0.1xx@d50747cb (#8892)
  [Xamarin.Android.Build.Tasks] Remove "Xamarin" from messages (#8884)
  [ci] Use NuGetAuthenticate@1 (#8877)
  [ci] Migrate to the 1ES template (#8876)
  • Loading branch information
grendello committed May 6, 2024
2 parents 264e452 + 0315e89 commit 90e3886
Show file tree
Hide file tree
Showing 45 changed files with 1,191 additions and 1,489 deletions.
2 changes: 1 addition & 1 deletion .external
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:release/8.0.1xx@d627218f1e1d0c1e501e2cc36609deb0b09d30aa
xamarin/monodroid:release/8.0.1xx@21aed734165ab0ea8bcaa1f4151bf13654153327
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
7 changes: 7 additions & 0 deletions .gdn/.gdnsettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"files": { },
"folders": { },
"overwriteLogs": true,
"telemetryFlushTimeout": 10,
"variables": { }
}
62 changes: 62 additions & 0 deletions .gdn/.gdnsuppress
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"hydrated": false,
"properties": {
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions",
"hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance."
},
"version": "1.0.0",
"suppressionSets": {
"default": {
"name": "default",
"createdDate": "2024-02-21 20:58:02Z",
"lastUpdatedDate": "2024-02-22 21:40:38Z"
}
},
"results": {
"28e1a7a1157c8739dce8ac1bbd828a471e477444ec50d2656d0440948b58a274": {
"signature": "28e1a7a1157c8739dce8ac1bbd828a471e477444ec50d2656d0440948b58a274",
"alternativeSignatures": [],
"memberOf": [
"default"
],
"justification": "FillEventHistory+Event API documentation with generic example password.",
"createdDate": "2024-02-21 20:58:02Z"
},
"0b7cc0b28f27b0eeb2a415f10e62c32675dd2d4edcffe35600eae35f8064004e": {
"signature": "0b7cc0b28f27b0eeb2a415f10e62c32675dd2d4edcffe35600eae35f8064004e",
"alternativeSignatures": [],
"memberOf": [
"default"
],
"justification": "Android.Service.Autofill.FillEventHistory+Event API documentation with generic example password.",
"createdDate": "2024-02-21 20:58:02Z"
},
"e57727a14a28f6fd8f4aa87cd3c4b33401dfea1078ce32fb3cbdf342e8adf63d": {
"signature": "e57727a14a28f6fd8f4aa87cd3c4b33401dfea1078ce32fb3cbdf342e8adf63d",
"alternativeSignatures": [],
"memberOf": [
"default"
],
"justification": "Javax.Crypto.ISecretKey API documentation with generic example password.",
"createdDate": "2024-02-21 20:58:02Z"
},
"15c51590a2e2bb503a7277448e05357f5fd8d4cb2f9b9b7446e41c872cceaac4": {
"signature": "15c51590a2e2bb503a7277448e05357f5fd8d4cb2f9b9b7446e41c872cceaac4",
"alternativeSignatures": [],
"memberOf": [
"default"
],
"justification": "Javax.Security.Auth.Callback.PasswordCallback API documentation with generic example password.",
"createdDate": "2024-02-21 20:58:02Z"
},
"1ccf925aa704efd1035bac38e94d2e629fb5b0d1784d5473e4a52e6d13db16ee": {
"signature": "1ccf925aa704efd1035bac38e94d2e629fb5b0d1784d5473e4a52e6d13db16ee",
"alternativeSignatures": [],
"memberOf": [
"default"
],
"justification": "Dummy test.keystore file used for testing.",
"createdDate": "2024-02-21 20:58:02Z"
}
}
}
11 changes: 11 additions & 0 deletions .gdn/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## Ignore Guardian internal files
.r/
rc/
rs/
i/
p/
c/
o/

## Ignore Guardian Local settings
LocalSettings.gdn.json
26 changes: 26 additions & 0 deletions .gdn/policheck/CHT.gdnsuppress
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"hydrated": false,
"properties": {
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions",
"hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance."
},
"version": "1.0.0",
"suppressionSets": {
"default": {
"name": "default",
"createdDate": "2023-02-24 00:05:39Z",
"lastUpdatedDate": "2024-02-22 21:40:38Z"
}
},
"results": {
"04910d714a13bf4523ffa77350f654f52114fa4fa3d760c9f63186d41716c019": {
"signature": "04910d714a13bf4523ffa77350f654f52114fa4fa3d760c9f63186d41716c019",
"alternativeSignatures": [],
"memberOf": [
"default"
],
"justification": "Reference to the Android package format APK.",
"createdDate": "2023-02-24 00:05:39Z"
}
}
}
File renamed without changes.
204 changes: 204 additions & 0 deletions .gdn/policheck/source.gdnsuppress
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
{
"hydrated": false,
"properties": {
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions",
"hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance."
},
"version": "1.0.0",
"suppressionSets": {
"default": {
"name": "default",
"createdDate": "2023-02-22 23:55:29Z",
"lastUpdatedDate": "2024-04-15 16:33:16Z"
}
},
"results": {
"5a0a8690d8a06dfdbf6002c67fa64a60a94f3fc77a594034cce20382e88002aa": {
"signature": "5a0a8690d8a06dfdbf6002c67fa64a60a94f3fc77a594034cce20382e88002aa",
"alternativeSignatures": [
"5c6188b6cec9a19a5e3b1c6b4a25fe79f1650edad0b9967c08983a33b57cdc2d"
],
"memberOf": [
"default"
],
"justification": "Exclusion list includeded in external sources.",
"createdDate": "2024-04-15 16:33:16Z"
},
"1b319055b8e507b220d0dab341e67e20f49632fd1844a08a4fcc6d4493930ac5": {
"signature": "1b319055b8e507b220d0dab341e67e20f49632fd1844a08a4fcc6d4493930ac5",
"alternativeSignatures": [
"5c6188b6cec9a19a5e3b1c6b4a25fe79f1650edad0b9967c08983a33b57cdc2d"
],
"memberOf": [
"default"
],
"justification": "Exclusion list includeded in external sources.",
"createdDate": "2024-04-15 16:33:16Z"
},
"6789cab1bdc97b0cc3ad057b7fdd21d63cdf8bc2679391923803fa240ef81292": {
"signature": "6789cab1bdc97b0cc3ad057b7fdd21d63cdf8bc2679391923803fa240ef81292",
"alternativeSignatures": [
"b5041e3ec6776af49d6d69148e4db480f366b559299d19ec8ea3e095295b39a8"
],
"memberOf": [
"default"
],
"justification": "Reference to an ISCII term.",
"createdDate": "2023-02-22 23:55:29Z"
},
"bbaf5f946cb72748567e41f0df5f1bae05550f4ba7381e21ec6b26d6c3ecec9f": {
"signature": "bbaf5f946cb72748567e41f0df5f1bae05550f4ba7381e21ec6b26d6c3ecec9f",
"alternativeSignatures": [
"739cb5e6ee2409515900652ca668f819f697f23834becece8d2f9f9236723c1b"
],
"memberOf": [
"default"
],
"justification": "Reference to an ISCII term.",
"createdDate": "2023-02-22 23:55:29Z"
},
"db8916a0f0cdca4082c540921dd362e09a9ff413862ab826308411b76ee35789": {
"signature": "db8916a0f0cdca4082c540921dd362e09a9ff413862ab826308411b76ee35789",
"alternativeSignatures": [
"a755747462567003e5aa2b7bf01aa72af5143714e427ad043747b1fb54b1c440"
],
"memberOf": [
"default"
],
"justification": "Reference to an Android logging function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"6d1fb3a483eb491710d6a09ed0b4bab47f13942d0c6fc744e6683614a66604ab": {
"signature": "6d1fb3a483eb491710d6a09ed0b4bab47f13942d0c6fc744e6683614a66604ab",
"alternativeSignatures": [
"a755747462567003e5aa2b7bf01aa72af5143714e427ad043747b1fb54b1c440"
],
"memberOf": [
"default"
],
"justification": "Reference to an Android logging function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"b07e75fc8a506b94690dbd06877da06c1228e40e7deda3967f6b882b842f726d": {
"signature": "b07e75fc8a506b94690dbd06877da06c1228e40e7deda3967f6b882b842f726d",
"alternativeSignatures": [
"a755747462567003e5aa2b7bf01aa72af5143714e427ad043747b1fb54b1c440"
],
"memberOf": [
"default"
],
"justification": "Reference to an Android logging function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"87d8313310c2dd42021844b95bdcb9121bf10036fea5b212b945e0732a456e5a": {
"signature": "87d8313310c2dd42021844b95bdcb9121bf10036fea5b212b945e0732a456e5a",
"alternativeSignatures": [
"a755747462567003e5aa2b7bf01aa72af5143714e427ad043747b1fb54b1c440"
],
"memberOf": [
"default"
],
"justification": "Reference to an Android logging function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"8e5400e0233c8d887ad48bd8a48e8a7be5a579f9eefad521419b6df0828bbfac": {
"signature": "8e5400e0233c8d887ad48bd8a48e8a7be5a579f9eefad521419b6df0828bbfac",
"alternativeSignatures": [
"a755747462567003e5aa2b7bf01aa72af5143714e427ad043747b1fb54b1c440"
],
"memberOf": [
"default"
],
"justification": "Reference to an Android logging function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"1b38e026fae90da4ae2fe9151c9c1ebd73c8b3c2c5f072ceae390a3ceec2fb97": {
"signature": "1b38e026fae90da4ae2fe9151c9c1ebd73c8b3c2c5f072ceae390a3ceec2fb97",
"alternativeSignatures": [
"a755747462567003e5aa2b7bf01aa72af5143714e427ad043747b1fb54b1c440"
],
"memberOf": [
"default"
],
"justification": "Reference to an Android logging function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"a2b4d032c59a9d1211d218c3cd550cf8febb369941d70284d07d03ebee855bc0": {
"signature": "a2b4d032c59a9d1211d218c3cd550cf8febb369941d70284d07d03ebee855bc0",
"alternativeSignatures": [
"9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
],
"memberOf": [
"default"
],
"justification": "Reference to find first set bit function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"1c87b45a6044d205dc3f3562f349c238f7cabe22b4609da762df9dc44151e9fb": {
"signature": "1c87b45a6044d205dc3f3562f349c238f7cabe22b4609da762df9dc44151e9fb",
"alternativeSignatures": [
"9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
],
"memberOf": [
"default"
],
"justification": "Reference to find first set bit function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"a6639098c4785509a4215c9e2fc10f82c06fce461915dc11a00227ddec558845": {
"signature": "a6639098c4785509a4215c9e2fc10f82c06fce461915dc11a00227ddec558845",
"alternativeSignatures": [
"9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
],
"memberOf": [
"default"
],
"justification": "Reference to find first set bit function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"f94ede7b396cb54934db2084f0879cd31a17ce2584eb01e0bfcd35324a724c31": {
"signature": "f94ede7b396cb54934db2084f0879cd31a17ce2584eb01e0bfcd35324a724c31",
"alternativeSignatures": [
"9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
],
"memberOf": [
"default"
],
"justification": "Reference to find first set bit function.",
"createdDate": "2024-02-22 21:40:38Z"
},
"b34b42aa41018376a31460c142f2ae910704725d9e9a4470f92b587df682369b": {
"signature": "b34b42aa41018376a31460c142f2ae910704725d9e9a4470f92b587df682369b",
"alternativeSignatures": [
"3901d031f3ac168bb1a84d06bb234355af514c59a0ed9da325b11a8861ff0b05"
],
"memberOf": [
"default"
],
"justification": "Reference to output from an external tool.",
"createdDate": "2023-02-22 23:55:29Z"
},
"75474fa652dbbf8f96826100a5fe37ba686a032ca07d61ef68a79c8e4412c150": {
"signature": "75474fa652dbbf8f96826100a5fe37ba686a032ca07d61ef68a79c8e4412c150",
"alternativeSignatures": [
"c78c3f8e456228997085b6409a12dce8b11eb5454a5588652225bc48a77d4662"
],
"memberOf": [
"default"
],
"justification": "Exclusion list includeded in external sources.",
"createdDate": "2024-04-15 16:33:16Z"
},
"243e199c7aec22377e0363bdca82384278cc36b0674f35697935fde6c45cfd0e": {
"signature": "243e199c7aec22377e0363bdca82384278cc36b0674f35697935fde6c45cfd0e",
"alternativeSignatures": [
"cf02f44873b25336e01a1fa294bd858d2ea69ae734f08c6db40d4b83d17ccf76"
],
"memberOf": [
"default"
],
"justification": "Reference to a proper name.",
"createdDate": "2023-10-26 21:20:54Z"
}
}
}
File renamed without changes.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
[submodule "external/xamarin-android-tools"]
path = external/xamarin-android-tools
url = https://github.com/xamarin/xamarin-android-tools
branch = main
branch = release/8.0.1xx
2 changes: 1 addition & 1 deletion build-tools/automation/azure-pipelines-apidocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ stages:

- template: yaml-templates/use-dot-net.yaml

- task: NuGetAuthenticate@0
- task: NuGetAuthenticate@1
displayName: authenticate with azure artifacts
inputs:
forceReinstallCredentialProvider: true
Expand Down
Loading

0 comments on commit 90e3886

Please sign in to comment.