Skip to content

Commit c02befa

Browse files
authored
[release/9.0.1xx] Merge remote-tracking branch 'origin/main' into release/9.0.1xx. (#22522)
This brings Xcode 16.3 support to .NET 9.
2 parents ba43fb4 + 4ee316b commit c02befa

File tree

2,910 files changed

+178119
-126726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,910 files changed

+178119
-126726
lines changed

.editorconfig

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# EditorConfig is awesome: https://editorconfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
16
[*.{props,targets}]
27
indent_style = tab
38
indent_size = 4

.github/ISSUE_TEMPLATE/01-building-an-application.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ body:
44
- type: markdown
55
attributes:
66
value: |
7-
Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good isse see https://github.com/xamarin/xamarin-macios/wiki/Submitting-Bugs-&-Suggestions.
7+
Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good issue see https://github.com/dotnet/macios/wiki/Submitting-Bugs-&-Suggestions.
88
- type: dropdown
99
id: platform
1010
attributes:
@@ -65,7 +65,7 @@ body:
6565
id: logs
6666
attributes:
6767
label: Build logs
68-
description: Please get an [MSBuild binlogs](https://github.com/xamarin/xamarin-macios/wiki/Diagnosis#build-logs) and attach it here (zipped, since GitHub doesn't allow attachment of .binlog files)
68+
description: Please get an [MSBuild binlogs](https://github.com/dotnet/macios/wiki/Diagnosis#build-logs) and attach it here (zipped, since GitHub doesn't allow attachment of .binlog files)
6969
- type: markdown
7070
attributes:
7171
value: |

.github/ISSUE_TEMPLATE/02-running-an-application.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ body:
44
- type: markdown
55
attributes:
66
value: |
7-
Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good isse see https://github.com/xamarin/xamarin-macios/wiki/Submitting-Bugs-&-Suggestions.
7+
Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good issue see https://github.com/dotnet/macios/wiki/Submitting-Bugs-&-Suggestions.
88
- type: dropdown
99
id: platform
1010
attributes:
@@ -65,7 +65,7 @@ body:
6565
id: logs
6666
attributes:
6767
label: Relevant logs
68-
description: Please copy and paste any (short!) relevant logs. Longer logs can be attached as .txt or .zip files. This is likely either the Application Output from the IDE, a [crash report](https://github.com/xamarin/xamarin-macios/wiki/Diagnosis#crash-reports) or the [device log](https://support.apple.com/en-in/guide/console/cnsl1012/mac) (or all of these).
68+
description: Please copy and paste any (short!) relevant logs. Longer logs can be attached as .txt or .zip files. This is likely either the Application Output from the IDE, a [crash report](https://github.com/dotnet/macios/wiki/Diagnosis#crash-reports) or the [device log](https://support.apple.com/en-in/guide/console/cnsl1012/mac) (or all of these).
6969
- type: markdown
7070
attributes:
7171
value: |

.github/ISSUE_TEMPLATE/03-api.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ body:
99
1010
Issues with missing Apple APIs or the API not working as documented are tracked here.
1111
12-
Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good isse see https://github.com/xamarin/xamarin-macios/wiki/Submitting-Bugs-&-Suggestions.
12+
Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good issue see https://github.com/dotnet/macios/wiki/Submitting-Bugs-&-Suggestions.
1313
1414
If you are not sure how to use an API or how to accomplish your task, better support is available from the community of application writers, available in several forms:
1515

.github/ISSUE_TEMPLATE/04-bindings.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ body:
55
- type: markdown
66
attributes:
77
value: |
8-
Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good isse see https://github.com/xamarin/xamarin-macios/wiki/Submitting-Bugs-&-Suggestions.
8+
Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good issue see https://github.com/dotnet/macios/wiki/Submitting-Bugs-&-Suggestions.
99
- type: dropdown
1010
id: platform
1111
attributes:
@@ -66,7 +66,7 @@ body:
6666
id: logs
6767
attributes:
6868
label: Build logs
69-
description: Please get an [MSBuild binlogs](https://github.com/xamarin/xamarin-macios/wiki/Diagnosis#build-logs) and attach it here (zipped, since GitHub doesn't allow attachment of .binlog files)
69+
description: Please get an [MSBuild binlogs](https://github.com/dotnet/macios/wiki/Diagnosis#build-logs) and attach it here (zipped, since GitHub doesn't allow attachment of .binlog files)
7070
- type: markdown
7171
attributes:
7272
value: |

.github/ISSUE_TEMPLATE/05-other.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ body:
44
- type: markdown
55
attributes:
66
value: |
7-
Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good isse see https://github.com/xamarin/xamarin-macios/wiki/Submitting-Bugs-&-Suggestions.
7+
Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good isse see https://github.com/dotnet/macios/wiki/Submitting-Bugs-&-Suggestions.
88
- type: dropdown
99
id: platform
1010
attributes:
@@ -65,7 +65,7 @@ body:
6565
id: logs
6666
attributes:
6767
label: Relevant log output
68-
description: Please copy and paste any (short!) relevant log output. Longer logs can be attached as .txt or .zip files. For build logs please provide an [MSBuild binlog](https://github.com/xamarin/xamarin-macios/wiki/Diagnosis#build-logs).
68+
description: Please copy and paste any (short!) relevant log output. Longer logs can be attached as .txt or .zip files. For build logs please provide an [MSBuild binlog](https://github.com/dotnet/macios/wiki/Diagnosis#build-logs).
6969
- type: markdown
7070
attributes:
7171
value: |

.github/policies/resourceManagement.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ configuration:
143143
then:
144144
- addReply:
145145
reply: >-
146-
Hi @${issueAuthor}. We have added the "need-repro" label to this issue, which indicates that we require steps and sample code to reproduce the issue before we can take further action. Please try to create a minimal sample project/solution or code samples which reproduce the issue, ideally as a GitHub repo that we can clone. See more details about creating repros here: https://github.com/xamarin/xamarin-macios/blob/main/docs/bug-repro.md
146+
Hi @${issueAuthor}. We have added the "need-repro" label to this issue, which indicates that we require steps and sample code to reproduce the issue before we can take further action. Please try to create a minimal sample project/solution or code samples which reproduce the issue, ideally as a GitHub repo that we can clone. See more details about creating repros here: https://github.com/dotnet/macios/blob/main/docs/bug-repro.md
147147
148148
This issue will be closed automatically in 7 days if we do not hear back from you by then - please feel free to re-open it if you come back to this issue after that time.
149149
- if:

.github/workflows/bump-global-json.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
# https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
1111
permissions:
1212
contents: write
13-
if: contains(github.event.pull_request.title, 'Update dependencies from dotnet/sdk') && github.actor == 'dotnet-maestro[bot]'
13+
if: contains(github.event.pull_request.title, 'Update dependencies from dotnet/') && github.actor == 'dotnet-maestro[bot]'
1414
steps:
1515
- name: 'Checkout repo'
1616
uses: actions/checkout@v4

.gitmodules

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
[submodule "external/Touch.Unit"]
2-
path = external/Touch.Unit
3-
url = ../../xamarin/Touch.Unit.git
4-
branch = main
51
[submodule "external/Xamarin.MacDev"]
62
path = external/Xamarin.MacDev
7-
url = ../../xamarin/Xamarin.MacDev
3+
url = ../../dotnet/macios-devtools
84
branch = main
9-
[submodule "external/MonoTouch.Dialog"]
10-
path = external/MonoTouch.Dialog
11-
url = ../../xamarin/MonoTouch.Dialog
12-
branch = dotnet
5+

CODE-OF-CONDUCT.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Code of Conduct
2+
3+
This project has adopted the code of conduct defined by the Contributor Covenant
4+
to clarify expected behavior in our community.
5+
6+
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

CODEOWNERS

-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
/src/HomeKit
9696
/src/homekit.cs
9797
/src/iad.cs
98-
/src/iAd.framework
9998
/src/identitylookup.cs @dalexsoto
10099
/src/identitylookupui.cs @dalexsoto
101100
/src/ituneslibrary.cs @mandel-macaque
@@ -184,8 +183,6 @@
184183
/src/vision.cs @dalexsoto
185184
/src/WatchConnectivity @rolfbjarne
186185
/src/watchconnectivity.cs @rolfbjarne
187-
/src/WatchKit @rolfbjarne
188-
/src/watchkit.cs @rolfbjarne
189186
/src/WebKit
190187
/src/webkit.cs
191188

Directory.Build.props

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
99
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
1010
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
11+
<NUnitXmlTestLoggerPackageVersion>3.1.15</NUnitXmlTestLoggerPackageVersion>
12+
<!-- Fix transient dependency issue found by component governance 4.7.0 -> 4.7.2 brought by Microsoft.Build package -->
13+
<SystemDrawingCommonPackageVersion>4.7.2</SystemDrawingCommonPackageVersion>
14+
<!-- Fix transient dependency issue found by component governance 4.7.0 -> 4.7.1 brought by Microsoft.Build.Tasks.Core package -->
15+
<SystemSecurityCryptographyXmlPackageVersion>4.7.1</SystemSecurityCryptographyXmlPackageVersion>
1116
</PropertyGroup>
1217
<Import Project="Build.props" Condition="Exists('Build.props')" />
1318
</Project>

0 commit comments

Comments
 (0)