Skip to content

Commit bb7fe3d

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/blobs-in-lib
* main: [build] Remove NuGet.exe provisioning (#8506) [Mono.Android] Replicate automated docs build (#8498)
2 parents e875b3e + 3f2b090 commit bb7fe3d

File tree

10 files changed

+25
-87
lines changed

10 files changed

+25
-87
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
5252
<ELFSharpVersion>2.13.1</ELFSharpVersion>
5353
<HumanizerVersion>2.14.1</HumanizerVersion>
54-
<MdocPackageVersion Condition=" '$(MdocPackageVersion)' == '' ">5.8.9.2</MdocPackageVersion>
54+
<MdocPackageVersion Condition=" '$(MdocPackageVersion)' == '' ">5.9.2.4</MdocPackageVersion>
5555
</PropertyGroup>
5656

5757
</Project>

‎build-tools/xaprepare/xaprepare/Application/Scenario.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ public void Init (Context context)
5959
}
6060

6161
protected virtual void AddStartSteps (Context context)
62-
{
63-
// These are steps that have to be executed by all the scenarios
64-
Steps.Add (new Step_DownloadNuGet ());
65-
}
62+
{}
6663

6764
protected virtual void AddEndSteps (Context context)
6865
{}

‎build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ public static partial class Urls
4545
/// </summary>
4646
public static readonly Uri AndroidToolchain_AndroidUri = new Uri ("https://dl.google.com/android/repository/");
4747

48-
public static readonly Uri NugetUri = new Uri ("https://dist.nuget.org/win-x86-commandline/v6.0.0/nuget.exe");
49-
5048
public static Uri MonoArchive_BaseUri = new Uri ("https://xamjenkinsartifact.azureedge.net/mono-sdks/");
5149

5250
public static Uri BinutilsArchive = new Uri ($"https://github.com/xamarin/xamarin-android-binutils/releases/download/{BinutilsVersion}/xamarin-android-toolchain-{BinutilsVersion}.7z");
@@ -238,7 +236,6 @@ public static partial class Paths
238236
public static readonly string BuildToolsScriptsDir = Path.Combine (BuildToolsDir, "scripts");
239237
public static readonly string BinDirRoot = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "bin");
240238
public static readonly string ExternalDir = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "external");
241-
public static readonly string LocalNugetPath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, ".nuget", "NuGet.exe");
242239
public static readonly string ExternalGitDepsFilePath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, ".external");
243240
public static readonly string ExternalGitDepsDestDir = ExternalDir;
244241
public static readonly string ExternalXamarinAndroidToolsSln = Path.Combine (ExternalDir, "xamarin-android-tools", "Xamarin.Android.Tools.sln");

‎build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Arch.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class LinuxArch : Linux
2727
new ArchLinuxProgram ("libzip"),
2828
new ArchLinuxProgram ("m4"),
2929
new ArchLinuxProgram ("make"),
30-
new ArchLinuxProgram ("nuget"),
3130
new ArchLinuxProgram ("patch"),
3231
new ArchLinuxProgram ("pkg-config"),
3332
new ArchLinuxProgram ("referenceassemblies-pcl"),

‎build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.DebianCommon.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ abstract class LinuxDebianCommon : Linux
2424
new DebianLinuxProgram ("linux-libc-dev"),
2525
new DebianLinuxProgram ("make"),
2626
new DebianLinuxProgram ("ninja-build", "ninja"),
27-
new DebianLinuxProgram ("nuget"),
2827
new DebianLinuxProgram ("p7zip-full", "7z"),
2928
new DebianLinuxProgram ("sqlite3"),
3029
new DebianLinuxProgram ("vim-common"),

‎build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Fedora.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class LinuxFedora : Linux
2727
new FedoraLinuxProgram ("libzip"),
2828
new FedoraLinuxProgram ("m4"),
2929
new FedoraLinuxProgram ("make"),
30-
new FedoraLinuxProgram ("nuget"),
3130
new FedoraLinuxProgram ("patch"),
3231
new FedoraLinuxProgram ("pkgconf"),
3332
new FedoraLinuxProgram ("referenceassemblies-pcl"),

‎build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Gentoo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class LinuxGentoo : Linux
2727
new GentooLinuxProgram ("dev-libs/libzip"),
2828
new GentooLinuxProgram ("sys-devel/m4"),
2929
new GentooLinuxProgram ("sys-devel/make"),
30-
//new GentooLinuxProgram ("nuget"),
3130
new GentooLinuxProgram ("sys-devel/patch"),
3231
new GentooLinuxProgram ("dev-util/pkgconf"),
3332
//new GentooLinuxProgram ("referenceassemblies-pcl"),

‎build-tools/xaprepare/xaprepare/Steps/Step_DownloadNuGet.cs

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎src/Mono.Android/Mono.Android.targets

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@
243243
<DocsFxMoniker Condition=" '$(DocsFxMoniker)' == '' ">net-android-$(DocsApiLevel).0</DocsFxMoniker>
244244
<DocsExportOutput Condition=" '$(DocsExportOutput)' == '' ">$(_MonoAndroidNETDefaultOutDir)Mono.Android.xml</DocsExportOutput>
245245
<_LogPrefix>$(MSBuildThisFileDirectory)../../bin/Build$(Configuration)/UpdateApiDocs-$([System.DateTime]::Now.ToString ("yyyyMMddTHHmmss"))</_LogPrefix>
246-
<_Mdoc Condition=" '$(Pkgmdoc)' != '' ">"$(Pkgmdoc)/tools/mdoc.exe"</_Mdoc>
247-
<_Mdoc Condition=" '$(Pkgmdoc)' == '' ">"$(XAPackagesDir)/mdoc/$(MdocPackageVersion)/tools/mdoc.exe"</_Mdoc>
246+
<_Mdoc Condition=" '$(Pkgmdoc)' != '' ">"$(Pkgmdoc)/tools/net471/mdoc.exe"</_Mdoc>
247+
<_Mdoc Condition=" '$(Pkgmdoc)' == '' ">"$(XAPackagesDir)/mdoc/$(MdocPackageVersion)/tools/net471/mdoc.exe"</_Mdoc>
248248
</PropertyGroup>
249249

250250
<!-- Generate documentation using MDoc -->
@@ -277,40 +277,43 @@
277277
<Target Name="_RunMdoc">
278278
<PropertyGroup>
279279
<_Libdir>-L "$(DotNetPreviewPath)packs/Microsoft.NETCore.App.Ref"</_Libdir>
280-
<_AssemblyBasename>$(_MonoAndroidNETDefaultOutDir)Mono.Android</_AssemblyBasename>
281-
<_ImportXml>-i "$(_AssemblyBasename).xml"</_ImportXml>
282-
<_Assembly>$(_AssemblyBasename).dll</_Assembly>
283-
<_JIAssembly>$(_MonoAndroidNETDefaultOutDir)Java.Interop.dll</_JIAssembly>
284280
<_Output>-o "$(MSBuildThisFileDirectory)../../external/android-api-docs/docs/Mono.Android/en"</_Output>
285281
<_DocTypeArgs Condition=" '$(DocTypeName)' != '' ">--type=$(DocTypeName)</_DocTypeArgs>
286282
<_RootFxDir>$(BaseIntermediateOutputPath)docs-gen-temp/</_RootFxDir>
287283
<_FxConfig>-fx "$(_RootFxDir)"</_FxConfig>
288-
<_Lang>--lang fsharp</_Lang>
289-
<!-- $(FrameworksXmlContent) describes the docs versions found at android-api-docs/tree/master/docs/Mono.Android/en/FrameworksIndex/
290-
and https://learn.microsoft.com/en-us/dotnet/api/android?view=xamarin-android-sdk-13 -->
291-
<FrameworksXmlContent>
292-
<![CDATA[
293-
<Frameworks>
294-
<Framework Name="$(DocsFxMoniker)" Source="$(DocsFxMoniker)" />
295-
</Frameworks>
296-
]]>
297-
</FrameworksXmlContent>
284+
<_ExtraMdocArgs>-lang docid -lang fsharp --debug --delete</_ExtraMdocArgs>
298285
</PropertyGroup>
299-
<!-- Create a temporary directory which contains frameworks.xml and our framework assembly.
300-
Copy Mono.Android.dll and Java.Interop.dll to the %(Source) path described in frameworks.xml (e.g. net-android-34.0) -->
286+
<ItemGroup>
287+
<_FxAssembly Include="$(_MonoAndroidNETDefaultOutDir)*.dll" />
288+
<_FxAssemblyXml Include="@(_FxAssembly->'%(RelativeDir)%(Filename).xml')" Condition=" Exists('%(RelativeDir)%(Filename).xml') " />
289+
</ItemGroup>
290+
<!-- Create a docs framework directory which contains:
291+
src/Mono.Android/obj/docs-gen-temp
292+
├── frameworks.xml
293+
└── net-android-34.0
294+
├── Java.Interop.dll
295+
├── Java.Interop.xml
296+
├── Mono.Android.Runtime.dll
297+
├── Mono.Android.dll
298+
└── Mono.Android.xml
299+
-->
301300
<RemoveDir Directories="$(_RootFxDir)" />
302301
<MakeDir Directories="$(_RootFxDir)" />
303302
<MakeDir Directories="$(_RootFxDir)$(DocsFxMoniker)" />
304303
<Copy
305-
SourceFiles="$(_Assembly);$(_JIAssembly)"
304+
SourceFiles="@(_FxAssembly);@(_FxAssemblyXml)"
306305
DestinationFolder="$(_RootFxDir)$(DocsFxMoniker)"
307306
/>
308307
<WriteLinesToFile
309308
File="$(_RootFxDir)frameworks.xml"
310309
Lines="$(FrameworksXmlContent)"
311310
/>
312311
<Exec
313-
Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) --debug update --use-docid --delete $(_Libdir) $(_ImportXml) $(_Output) $(_DocTypeArgs) $(_FxConfig) $(_Lang)"
312+
Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) fx-bootstrap -fx $(_RootFxDir) -importContent true"
313+
WorkingDirectory="$(MSBuildThisFileDirectory)"
314+
/>
315+
<Exec
316+
Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) update $(_Libdir) $(_Output) $(_DocTypeArgs) $(_FxConfig) $(_ExtraMdocArgs)"
314317
WorkingDirectory="$(MSBuildThisFileDirectory)"
315318
/>
316319
</Target>

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
</EmbeddedResource>
2121
</ItemGroup>
2222
<ItemGroup>
23-
<Content Include="..\..\..\..\.nuget\NuGet.exe">
24-
<Link>..\nuget\NuGet.exe</Link>
25-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
26-
</Content>
2723
<Content Include="FrameworkPath.targets">
2824
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2925
</Content>

0 commit comments

Comments
 (0)