Build fixes.

Author: jpobst

Configuration.props

@@ -238,12 +238,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(XABuildingForNetCoreApp)' != 'True' And '$(XAShouldAnalyzeAssembly)' == 'True' ">
-    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
     <WarningsAsErrors>$(WarningsAsErrors);CA1309;CA1310</WarningsAsErrors>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(XABuildingForNetCoreApp)' == 'True' And '$(XAShouldAnalyzeAssembly)' == 'True' ">
-    <NoWarn>$(NoWarn);CA1309;CA1310</NoWarn>
-  </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)build-tools\scripts\Ndk.targets" />
   <Import Project="$(MSBuildThisFileDirectory)build-tools\scripts\RoslynAnalyzers.projitems" Condition=" '$(EnableRoslynAnalyzers)' == 'true' " />

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj

@@ -20,6 +20,8 @@
     <GenerateResxSource>true</GenerateResxSource>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
+    <!-- Causes issues with linker files imported from Mono -->
+    <NoWarn>$(NoWarn);CA1310</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj

@@ -16,9 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="$(LinkerSourceFullPath)\analyzer\common\Mono.Options\Options.cs">
-      <Link>Options.cs</Link>
-    </Compile>
     <Compile Include="..\..\external\Java.Interop\src\utils\StringRocks.cs">
       <Link>StringRocks.cs</Link>
     </Compile>
@@ -53,6 +50,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Xml.SgmlReader" Version="1.8.14" />
+    <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Include="Xamarin.LibZipSharp" Version="$(LibZipSharpVersion)" />
   </ItemGroup>