Repository navigation
Commit e713b79
Merge origin/main into dev/rolf/in-process-bgen
Resolve the localization resource ID conflict by retaining main's new R2R diagnostics and moving the bgen fallback diagnostic to E7198.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>162 files changed
Lines changed: 8484 additions & 5167 deletions
File tree
- .github
- agents
- aw
- skills/agentic-workflows
- workflows
- dotnet/targets
- eng
- common
- core-templates
- job
- stages
- steps
- cross
- loc
- native
- post-build
- templates-official/variables
- templates/variables
- macios
- Localize/loc
- cs/macios
- msbuild/Xamarin.Localization.MSBuild
- src
- de/macios
- msbuild/Xamarin.Localization.MSBuild
- src
- es/macios
- msbuild/Xamarin.Localization.MSBuild
- src
- fr/macios/src
- it/macios
- msbuild/Xamarin.Localization.MSBuild
- src
- ja/macios/src
- ko/macios/src
- pl/macios/src
- pt-BR/macios
- msbuild/Xamarin.Localization.MSBuild
- src
- ru/macios
- msbuild/Xamarin.Localization.MSBuild
- src
- tr/macios
- msbuild/Xamarin.Localization.MSBuild
- src
- zh-Hans/macios/src
- zh-Hant/macios/src
- msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies
- mk
- msbuild
- Xamarin.Localization.MSBuild
- Xamarin.MacDev.Tasks/Tasks
- Xamarin.iOS.Tasks.Windows
- scripts
- src
- AddressBookUI
- BrowserEngineKit
- CarPlay
- Cinematic
- CoreFoundation
- CoreMidi
- Foundation
- GLKit
- Network
- bgen
- tests
- assembly-preparer
- bindings-test
- cecil-tests
- dotnet
- TrimmerMetadata
- Library
- iOS
- UnitTests
- expected
- fsharplibrary/dotnet
- linker/link sdk
- monotouch-test
- CoreAnimation
- CoreFoundation
- Network
- ObjCRuntime
- msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests
- test-libraries
- tools/dotnet-linker
- Steps
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
11 | 18 | | |
12 | 19 | | |
13 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | | - | |
6 | | - | |
| 5 | + | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | | - | |
21 | | - | |
| 20 | + | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
| 28 | + | |
34 | 29 | | |
35 | | - | |
36 | | - | |
| 30 | + | |
| 31 | + | |
37 | 32 | | |
38 | 33 | | |
39 | 34 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
12 | 16 | | |
13 | 17 | | |
| 18 | + | |
| 19 | + | |
14 | 20 | | |
15 | 21 | | |
16 | 22 | | |
17 | 23 | | |
18 | 24 | | |
19 | 25 | | |
20 | 26 | | |
| 27 | + | |
| 28 | + | |
21 | 29 | | |
| 30 | + | |
22 | 31 | | |
23 | 32 | | |
24 | 33 | | |
25 | 34 | | |
26 | 35 | | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
27 | 41 | | |
28 | 42 | | |
| 43 | + | |
| 44 | + | |
29 | 45 | | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
30 | 50 | | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
31 | 54 | | |
| 55 | + | |
32 | 56 | | |
33 | 57 | | |
| 58 | + | |
34 | 59 | | |
35 | 60 | | |
36 | 61 | | |
| 62 | + | |
37 | 63 | | |
| 64 | + | |
38 | 65 | | |
39 | 66 | | |
40 | 67 | | |
| |||
48 | 75 | | |
49 | 76 | | |
50 | 77 | | |
| 78 | + | |
51 | 79 | | |
52 | 80 | | |
53 | 81 | | |
54 | 82 | | |
| 83 | + | |
| 84 | + | |
55 | 85 | | |
56 | 86 | | |
57 | 87 | | |
| |||
61 | 91 | | |
62 | 92 | | |
63 | 93 | | |
64 | | - | |
65 | 94 | | |
66 | | - | |
| 95 | + | |
67 | 96 | | |
| 97 | + | |
68 | 98 | | |
69 | 99 | | |
70 | 100 | | |
| |||
76 | 106 | | |
77 | 107 | | |
78 | 108 | | |
| 109 | + | |
| 110 | + | |
79 | 111 | | |
80 | 112 | | |
0 commit comments