Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Documentation/docs-mobile/messages/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ or 'Help->Report a Problem' in Visual Studio for Mac.
+ XA1018: Specified AndroidManifest file does not exist: {file}.
+ XA1019: No longer emitted by current SDKs.
+ XA1020: At least one Java library is required for binding. Check that a Java library is included in the project and has the appropriate build action: 'LibraryProjectZip' (for AAR or ZIP), 'EmbeddedJar', 'InputJar' (for JAR), or 'LibraryProjectProperties' (project.properties).
+ XA1021: Specified source Java library not found: {file}
+ XA1021: No longer emitted by current SDKs.
+ XA1022: Specified reference Java library not found: {file}
+ [XA1023](xa1023.md): Using the DX DEX Compiler is deprecated.
+ XA1024: Removed in .NET 11.
Expand Down Expand Up @@ -353,14 +353,11 @@ and `NNN` is a 3 digit number indicating the type of the unhandled `Exception`.
* `GPM` - `GeneratePackageManagerJava`
* `GRD` - `GenerateResourceDesigner`
* `IAS` - `InstallApkSet`
* `JDC` - `JavaDoc`
* `JVC` - `Javac`
* `JTX` - `JarToXml`
* `KEY` - `KeyTool`
* `LNK` - `LinkAssemblies`
* `LNS` - `LinkAssembliesNoShrink`
* `LNT` - `Lint`
* `MDC` - `MDoc`
* `PAW` - `ParseAndroidWearProjectAndManifest`
* `PRO` - `Proguard`
* `PWA` - `PrepareWearApplicationFiles`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ This item group populates the Build Action drop-down in IDEs.
<AvailableItemName Include="AndroidGradleProject" />
<AvailableItemName Include="TransformFile" />
<AvailableItemName Include="LibraryProjectProperties" />
<AvailableItemName Include="JavaDocIndex" />
<AvailableItemName Include="JavaDocJar" />
<AvailableItemName Include="JavaSourceJar" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,10 @@ This file is only used by binding projects.

<ItemGroup>
<_AndroidDocumentationPath Include="@(_JavaSourceJavadocXml)" />
<_AndroidDocumentationPath Include="@(JavaDocIndex->'%(RootDir)\%(Directory)')" />
<_AndroidDocumentationPath Include="$(JavaDocPaths)" />
<_AndroidDocumentationPath Include="$(Java7DocPaths)" />
<_AndroidDocumentationPath Include="$(Java8DocPaths)" />
<_AndroidDocumentationPath Include="$(DroidDocPaths)" />
<_AndroidDocumentationPath Include="@(JavaDocJar->'$(IntermediateOutputPath)javadocs\%(FileName)')" />
</ItemGroup>
<ClassParse
OutputFile="$(ApiOutputFile).class-parse"
Expand Down Expand Up @@ -83,7 +81,7 @@ This file is only used by binding projects.
</Target>

<Target Name="_GetJavaSourceJarJavadocFiles"
Condition=" '$(_UseLegacyJavadocImport)' != 'True' And '@(JavaSourceJar->Count())' != '0' ">
Condition=" '@(JavaSourceJar->Count())' != '0' ">

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🤖 💡 Testing — Could the existing BindingBuildTest.JavaSourceJar test also cover $(_UseLegacyJavadocImport)=true? Removing this guard (and the corresponding extraction/documentation guards) intentionally makes projects retaining that old setting use the modern documentation pipeline. The existing test leaves the property unset, so it only covers the unchanged default behavior. A parameterized case that retains its XML-content assertions would lock in successful documentation import when the obsolete setting is still present.

{Rule: Test behavioral changes and assert generated output}

<ComputeHash
CopyMetadata="True"
Source="@(JavaSourceJar)">
Expand All @@ -95,7 +93,7 @@ This file is only used by binding projects.
</Target>

<Target Name="_ExtractJavadocsFromJavaSourceJars"
Condition=" '$(_UseLegacyJavadocImport)' != 'True' And '@(JavaSourceJar->Count())' != '0' "
Condition=" '@(JavaSourceJar->Count())' != '0' "
DependsOnTargets="_GetJavaSourceJarJavadocFiles"
Inputs="@(JavaSourceJar)"
Outputs="@(_JavaSourceJavadocXml)">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ It is shared between "legacy" binding projects and .NET 5 projects.
<_OtherGeneratorStampFile Condition=" '$(_AndroidUnmanagedCallersOnlyCallbacksState)' != 'true' ">$(_GeneratorUcoCallbacksTrueStamp)</_OtherGeneratorStampFile>
</PropertyGroup>

<PropertyGroup Condition=" '$(_UseLegacyJavadocImport)' != 'true' ">
<PropertyGroup>
<DocumentationFile Condition=" '$(GenerateDocumentationFile)' != 'true' " />
<DocumentationFile Condition=" '$(DocumentationFile)' == '' and '$(GenerateDocumentationFile)' == 'true' and '$(_ComputeFilesToPublishForRuntimeIdentifiers)' != 'true' ">$([MSBuild]::EnsureTrailingSlash('$(OutputPath)'))$(AssemblyName).xml</DocumentationFile>
<NoWarn Condition=" '$(DocumentationFile)' != '' ">$(NoWarn);CS1573;CS1591</NoWarn>
Expand Down

This file was deleted.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,6 @@ When it appears in the middle of a sentence, "lint" is not capitalized.
<value>At least one Java library is required for binding. Check that a Java library is included in the project and has the appropriate build action: 'LibraryProjectZip' (for AAR or ZIP), 'EmbeddedJar', 'InputJar' (for JAR), or 'LibraryProjectProperties' (project.properties).</value>
<comment>The following are literal names and should not be translated: LibraryProjectZip, EmbeddedJar, InputJar, LibraryProjectProperties, project.properties</comment>
</data>
<data name="XA1021" xml:space="preserve">
<value>Specified source Java library not found: {0}</value>
<comment>In this message, the term "source Java library" refers to the library that will be processed. In this case, the term "source" does not refer to "source code."
{0} - The file name of the library</comment>
</data>
<data name="XA1022" xml:space="preserve">
<value>Specified reference Java library not found: {0}</value>
<comment>In this message, the term "reference Java library" refers to a library that is included as a reference so that types from the library can be resolved during the build process.
Expand Down
Loading