Skip to content
This repository has been archived by the owner on May 29, 2024. It is now read-only.

Merge main to live #38

Merged
merged 7 commits into from
Sep 14, 2022
Merged

Merge main to live #38

merged 7 commits into from
Sep 14, 2022

Conversation

shawnwang-ms
Copy link

pjcollins and others added 7 commits December 15, 2021 14:52
@pjcollins
Update docs using dotnet/java-interop@d64087cf (#29)
a7e9149 
Fixes: dotnet/java-interop#933
Context: dotnet/java-interop#931
Context: dotnet/java-interop#932

Changes: dotnet/java-interop@087684a...d64087c

Changes: dotnet/android@aea70ca...05dd813

Changes of note:

  * Includes a bunch of fixes for method overloads.

  * Documentation URLs have been updated to *better* match what the
    Android doc link should be.
    *Note*: these are still not all *correct*; See dotnet/java-interop#931
    and dotnet/java-interop#932.

No new documentation warnings or suggestions have been introduced:

    Total Build Warnings | 1124
    Total Build Suggestions | 902
@pjcollins
Update docs using dotnet/java-interop@d3f0c5c (#30)
b1743ec 
Fixes: dotnet/java-interop#931
Fixes: dotnet/java-interop#932
Context: dotnet/java-interop@d3f0c5c

Fixes reference documentation URLs for type members with complex
parameters.
@davidbritch
Master becomes main.
4e096ef
@davidbritch
Merge pull request #32 from xamarin/dabritch-config
5c4bf28 
Force builds to use main
@pjcollins
Update docs using dotnet/java-interop@7716ae53 (#33)
59c78f8 
Updates API docs against:

  * dotnet/android@bb2f920
  * dotnet/java-interop@51c3dae

Notable generator improvements include:

  * dotnet/java-interop@4cbc07a
  * dotnet/java-interop@13def0e
  * dotnet/java-interop@32635fd
@pjcollins
Update docs using dotnet/android@ace5f71c (#34)
8a24e2c 
Imports Google-provided API-31 Javadoc documentation for nested types
that were previously being ignored.

Notable documentation related generator changes:

  * dotnet/java-interop@4b4fedd3: [generator] Process Javadoc for nested types
  * dotnet/java-interop@265ad762: [Java.Interop.Tools.JavaSource] Fix tag parsing errors

Changes in xamarin-android and java.interop:

  * dotnet/android@c6dcefb...ace5f71
  * dotnet/java-interop@7716ae5...032f1e7
@TianqiZhang
[SEO][Rollout Monikered Canonical]Add URL moniker (#37)
658a026 
Enable build config to generate canonical URL with moniker
@shawnwang-ms
Copy link
Author

@davidbritch Could you please help merge main to live?

@opbld33
Copy link

opbld33 commented Sep 14, 2022

Docs Build status updates of commit 658a026:

⚠️ Validation status: warnings

File Status Preview URL Details
docs/Mono.Android/en/Android.Accounts/AccountManager.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.Animation/FloatArrayEvaluator.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.Animation/IntArrayEvaluator.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.Animation/LayoutTransition.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.Animation/PropertyValuesHolder.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App.Admin/DevicePolicyManager.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App.Backup/BackupAgent.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App/ActionBar.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App/Activity.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App/ActivityOptions.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App/AlarmManager.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App/Dialog.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App/Fragment.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App/Instrumentation.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App/LocalActivityManager.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App/Notification.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App/PendingIntent.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.App/Service.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.Appwidget/AppWidgetHostView.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.Appwidget/AppWidgetManager.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDeviceAppSdpSettings.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.Content.PM/LauncherApps.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.Content.PM/PackageInstaller.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.Content.PM/PackageManager.xml ⚠️Warning View Details
docs/Mono.Android/en/Android.Content.Res/AssetManager.xml ⚠️Warning View Details

This comment lists only the first 25 files in the pull request.

docs/Mono.Android/en/Android.Accounts/AccountManager.xml

  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.Accounts.AccountManager.AddOnAccountsUpdatedListener(Android.Accounts.IOnAccountsUpdateListener,+Android.OS.Handler,+Android.OS.Handler)'.

docs/Mono.Android/en/Android.Animation/FloatArrayEvaluator.xml

  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.Animation.FloatArrayEvaluator(System.Single[])'.

docs/Mono.Android/en/Android.Animation/IntArrayEvaluator.xml

  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.Animation.IntArrayEvaluator(System.Int32[])'.

docs/Mono.Android/en/Android.Animation/LayoutTransition.xml

  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.Animation.LayoutTransition.SetAnimator(Android.Animation.LayoutTransitionType,+Android.Animation.Animator)'.

docs/Mono.Android/en/Android.Animation/PropertyValuesHolder.xml

  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.Animation.FloatArrayEvaluator(System.Single[])'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.Animation.IntArrayEvaluator(System.Int32[])'.

docs/Mono.Android/en/Android.App.Admin/DevicePolicyManager.xml

  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.Admin.DevicePolicyManager.AddCrossProfileWidgetProvider(Android.Content.ComponentName,+System.String)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.Admin.DevicePolicyManager.RemoveCrossProfileWidgetProvider(Android.Content.ComponentName,+System.String)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.Admin.DevicePolicyManager.RemoveCrossProfileWidgetProvider(Android.Content.ComponentName,+System.String)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.Admin.DeviceAdminReceiver.OnLockTaskModeEntering(Android.Content.Context,+Android.Content.Intent,+Android.Content.Intent)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.Admin.DeviceAdminReceiver.OnLockTaskModeExiting(Android.Content.Context,+Android.Content.Intent)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.Admin.DevicePolicyManager.AddCrossProfileWidgetProvider(Android.Content.ComponentName,+System.String)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.Admin.DevicePolicyManager.SetAccountManagementDisabled(Android.Content.ComponentName,+System.String,+System.String)'.

docs/Mono.Android/en/Android.App.Backup/BackupAgent.xml

  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.Backup.BackupAgent.OnRestore(Android.App.Backup.BackupDataInput,+System.Int32,+System.Int32)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.Backup.BackupAgent.OnRestoreFile(Android.OS.ParcelFileDescriptor,+System.Int64,+System.Int64,+System.Int64,+System.Int64,+System.Int64)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.Backup.BackupAgent.FullBackupFile(Java.IO.File,+Android.App.Backup.FullBackupDataOutput)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.Backup.BackupAgent.OnRestoreFile(Android.OS.ParcelFileDescriptor,+System.Int64,+System.Int64,+System.Int64,+System.Int64,+System.Int64)'.

docs/Mono.Android/en/Android.App/ActionBar.xml

  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.ActionBar.AddTab(.Tab)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.ActionBar.SetDisplayOptions(Android.App.ActionBarDisplayOptions,+Android.App.ActionBarDisplayOptions)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.ActionBar.SetDisplayOptions(Android.App.ActionBarDisplayOptions,+Android.App.ActionBarDisplayOptions)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.ActionBar.SetDisplayOptions(Android.App.ActionBarDisplayOptions,+Android.App.ActionBarDisplayOptions)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.ActionBar.SetDisplayOptions(Android.App.ActionBarDisplayOptions,+Android.App.ActionBarDisplayOptions)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.ActionBar.SetDisplayOptions(Android.App.ActionBarDisplayOptions,+Android.App.ActionBarDisplayOptions)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.ActionBar.SetDisplayOptions(Android.App.ActionBarDisplayOptions,+Android.App.ActionBarDisplayOptions)'.
  • Line 0, Column 0: [Warning: xref-not-found] Cross reference not found: 'Android.App.ActionBar.SetDisplayOptions(Android.App.ActionBarDisplayOptions,+Android.App.ActionBarDisplayOptions)'.

This comment lists only the first 25 errors (including error/warning/suggestion) in the pull request.
For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings or suggestions unrelated to the files you changed. This happens when external dependencies like GitHub alias, Microsoft alias, cross repo links are updated. Please use these instructions to resolve them.

For any questions, please:

@davidbritch
Copy link
Contributor

@pjcollins Is this safe to merge? Just wondering why live isn't already up to date with main.

pjcollins
pjcollins approved these changes Sep 14, 2022
View reviewed changes
Copy link
Member

@pjcollins pjcollins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is odd, I should have merged almost of these changes as part of #36. Perhaps the squash and merge was problematic...

@davidbritch davidbritch merged commit 10da545 into live Sep 14, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@pjcollins pjcollins pjcollins approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@shawnwang-ms @opbld33 @davidbritch @pjcollins @TianqiZhang