Skip to content

Commit

Permalink
Merge branch 'main' into blazor-hang
Browse files Browse the repository at this point in the history
* main: (306 commits)
  [templates] Remove redundant "template" from display name. (dotnet#8773)
  Bump to xamarin/Java.Interop/main@a7e09b7 (dotnet#8793)
  [build] Include MIT license in most NuGet packages (dotnet#8787)
  Bump to dotnet/installer@893b762b6e 9.0.100-preview.3.24153.2 (dotnet#8782)
  [docs] update notes about `dotnet-trace` and `dotnet-gcdump` (dotnet#8713)
  [Mono.Android] Fix race condition in AndroidMessageHandler (dotnet#8753)
  [ci] Fix SDL Sources Analysis for PRs from forks (dotnet#8785)
  [ci] Add 1ESPT override to MSBuild test stages (dotnet#8784)
  [ci] Do not use @self annotation for templates (dotnet#8783)
  [ci] Migrate to the 1ES template (dotnet#8747)
  [Mono.Android] fix trimming warnings, part 2 (dotnet#8758)
  [Xamarin.Android.Build.Tasks] set `%(DefineConstantsOnly)` for older API levels (dotnet#8777)
  [tests] fix duplicate sources in `NuGet.config` (dotnet#8772)
  Bump to xamarin/monodroid@e13723e701 (dotnet#8771)
  Bump to xamarin/xamarin-android-tools/main@37d79c9 (dotnet#8752)
  Bump to dotnet/installer@d070660282 9.0.100-preview.3.24126.2 (dotnet#8763)
  Bump to xamarin/java.interop/main@14a9470 (dotnet#8766)
  $(AndroidPackVersionSuffix)=preview.3; net9 is 34.99.0.preview.3 (dotnet#8765)
  [Mono.Android] Do not dispose request content stream in AndroidMessageHandler (dotnet#8764)
  Bump com.android.tools:r8 from 8.2.42 to 8.2.47 (dotnet#8761)
  ...
  • Loading branch information
grendello committed Mar 8, 2024
2 parents c1cad61 + 9d8ca60 commit b5fc35f
Show file tree
Hide file tree
Showing 790 changed files with 346,226 additions and 32,595 deletions.
3 changes: 1 addition & 2 deletions .external
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
xamarin/monodroid:main@dbc9c67e7bd45744e5174dd7e94e5b642418bef9
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
xamarin/monodroid:main@e13723e701307f9f6966d4b309c3eba10a741694
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"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<PoliCheckExclusions>
<!-- Reminder: you are only allowed one exclusion element of each type, to have multiple values you must pipe separate them in a single element -->
<!-- Each of these exclusions is a folder name - if \[name]\ exists in the file path, it will be skipped -->
<Exclusion Type="FolderPathFull">LICENSE-DATA|NREFACTORY|LOCALIZE</Exclusion>
<Exclusion Type="FolderPathStart">src\Mono.Android\Profiles</Exclusion>
<Exclusion Type="FolderPathFull">LICENSE-DATA|LOCALIZE</Exclusion>
<!-- Each of these exclusions is a folder name - if any folder or file starts with "\[name]", it will be skipped -->
<!--<Exclusion Type="FolderPathStart">ABC|XYZ</Exclusion>-->
<Exclusion Type="FolderPathStart">src\Mono.Android\Profiles|src\Mono.Android\PublicAPI</Exclusion>
<!-- Each of these file types will be completely skipped for the entire scan -->
<!--<Exclusion Type="FileType">.ABC|.XYZ</Exclusion>-->
<!-- The specified file names will be skipped during the scan regardless which folder they are in -->
Expand Down
171 changes: 171 additions & 0 deletions .gdn/policheck/source.gdnsuppress
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
{
"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-02-22 21:40:38Z"
}
},
"results": {
"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"
},
"243e199c7aec22377e0363bdca82384278cc36b0674f35697935fde6c45cfd0e": {
"signature": "243e199c7aec22377e0363bdca82384278cc36b0674f35697935fde6c45cfd0e",
"alternativeSignatures": [
"cf02f44873b25336e01a1fa294bd858d2ea69ae734f08c6db40d4b83d17ccf76"
],
"memberOf": [
"default"
],
"justification": "Reference to a proper name.",
"createdDate": "2023-10-26 21:20:54Z"
}
}
}
File renamed without changes.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,3 @@
/tools/jit-times @jonpryor
/tools/setup-windows @jonathanpeppers @jonpryor
/tools/tmt @grendello
/tools/xabuild @jonathanpeppers @jonpryor
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/01-building-an-application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ body:
description: In what type(s) of Android application(s) do you see this issue?
multiple: true
options:
- Classic Xamarin.Android (MonoAndroid12.0, etc.)
- .NET Android (net7.0-android, etc.)
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
- .NET Android (net7.0-android, net8.0-android, etc.)
validations:
required: true
- type: input
id: platform-versions
attributes:
label: Affected platform version
description: Please provide the version number of the platform you see this issue on.
placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
validations:
required: true
- type: textarea
Expand All @@ -40,7 +40,7 @@ body:
label: Steps to Reproduce
description: Describe all the steps we need to take to show the behavior that you have observed.
placeholder: |
1. Create a File > New Android App (Xamarin)
1. File > New Project > New Android Application
2. Add the following code: ...
3. Run the app and observe the bug 🐞
validations:
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/02-running-an-application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ body:
description: In what type(s) of Android application(s) do you see this issue?
multiple: true
options:
- Classic Xamarin.Android (MonoAndroid12.0, etc.)
- .NET Android (net7.0-android, etc.)
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
- .NET Android (net7.0-android, net8.0-android, etc.)
validations:
required: true
- type: input
id: platform-versions
attributes:
label: Affected platform version
description: Please provide the version number of the platform you see this issue on.
placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
validations:
required: true
- type: textarea
Expand All @@ -40,7 +40,7 @@ body:
label: Steps to Reproduce
description: Describe all the steps we need to take to show the behavior that you have observed.
placeholder: |
1. Create a File > New Android App (Xamarin)
1. File > New Project > New Android Application
2. Add the following code: ...
3. Run the app and observe the bug 🐞
validations:
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/03-mono-android-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ body:
description: In what type(s) of Android application(s) do you see this issue?
multiple: true
options:
- Classic Xamarin.Android (MonoAndroid12.0, etc.)
- .NET Android (net7.0-android, etc.)
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
- .NET Android (net7.0-android, net8.0-android, etc.)
validations:
required: true
- type: input
id: platform-versions
attributes:
label: Affected platform version
description: Please provide the version number of the platform you see this issue on.
placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
validations:
required: true
- type: textarea
Expand All @@ -45,7 +45,7 @@ body:
label: Steps to Reproduce
description: Describe all the steps we need to take to show the behavior that you have observed.
placeholder: |
1. Create a File > New Android App (Xamarin)
1. File > New Project > New Android Application
2. Add the following code: ...
3. Run the app and observe the bug 🐞
validations:
Expand Down
Loading

0 comments on commit b5fc35f

Please sign in to comment.