Skip to content

[mono] Add MonoAOTCompiler MSBuild Task to produce NuPkg #46537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdh1418 merged 15 commits into from
Jan 6, 2021
Merged

[mono] Add MonoAOTCompiler MSBuild Task to produce NuPkg #46537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0b47284
Test workload
Dec 28, 2020
3ef55be
Remove hardcoded path to MonoAOTCompiler
Dec 31, 2020
4dadc9d
Inline pkg descriptions for MonoAOTCompiler Task and workload packs
Dec 31, 2020
153ba7f
Remove Workload AOT additions
Jan 4, 2021
33c73b5
Replace _ILLinkTasksDirectoryRoot with _AOTTasksDirectoryRoot
Jan 4, 2021
6813a96
Add TargetsMobile condition
Jan 4, 2021
b98f20a
Remove temporary variables
Jan 5, 2021
aa6d62d
Reword MonoAOTCompiler NuPkg description
Jan 5, 2021
ea71b3f
Remove NuPkg import of MonoAOTCompiler UsingTask
Jan 5, 2021
3aed265
Add MonoAOTCompilerTaskAssemblyPath property
Jan 5, 2021
1d75af2
Cleanup Microsoft.NET.Runtime.MonoAOTCompiler.Tasks.props
Jan 5, 2021
6f15807
Add README.md with example of using the NuPkg
Jan 6, 2021
a6db397
Specify the package files for the aot task, in the project itself
radical Jan 5, 2021
25ba31d
Add comment for GetFilesToPackage target
Jan 6, 2021
a4f9fb2
Update README.md
mdh1418 Jan 6, 2021
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
15 changes: 15 additions & 0 deletions ...osoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Project DefaultTargets="Build">
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />

<PropertyGroup>
<PackageDescription>Provides the MonoAOTCompiler task</PackageDescription>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(RepoTasksDir)AotCompilerTask\MonoAOTCompiler.csproj" />

<PackageFile Include="build\$(MSBuildProjectName).props" TargetPath="build" />
</ItemGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
35 changes: 35 additions & 0 deletions src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# MonoAOTCompiler MSBuild Task NuPkg
The `MonoAOTCompiler` MSBuild task is also useful outside the context of `dotnet/runtime`. The task is made available through a NuGet Package containing the `MonoAOTCompiler.dll` assembly produced from building `MonoAOTCompiler.csproj`. To use the task in a project, reference the NuGet package, with the appropriate nuget source.

## NuGet.config
```
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
</packageSources>
</configuration>
```

## In the project file
```
<!-- Import the NuGet package into the project -->
<ItemGroup>
<PackageReference Include="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="<desired-dotnet-6-sdk-version>" />
</ItemGroup>

<!-- Set up the MSBuild task using the assembly path provided by the NuGet package -->
<UsingTask TaskName="MonoAOTCompiler"
AssemblyFile="$(MonoAOTCompilerTaskAssemblyPath)"/>

<!-- Use the MonoAOTCompiler task in a target -->
<Target>
<MonoAOTCompiler
CompilerBinaryPath="$(CompilerBinaryPath)"
Assemblies="@(Assemblies)"
<!-- Other parameters -->
>
<Output TaskParameter="CompiledAssemblies" ItemName="CompiledAssemblies" />
</MonoAOTCompiler>
</Target>
```
5 changes: 5 additions & 0 deletions ...t.NET.Runtime.MonoAOTCompiler.Task/build/Microsoft.NET.Runtime.MonoAOTCompiler.Task.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<MonoAOTCompilerTaskAssemblyPath>$(MSBuildThisFileDirectory)..\tools\net5.0\MonoAOTCompiler.dll</MonoAOTCompilerTaskAssemblyPath>
</PropertyGroup>
</Project>
4 changes: 4 additions & 0 deletions src/mono/netcore/nuget/mono-packages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@
<ItemGroup Condition="'$(TargetOS)' == 'iOS'">
<ProjectReference Include="Microsoft.NET.Runtime.iOS.Sample.Mono\Microsoft.NET.Runtime.iOS.Sample.Mono.pkgproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetsMobile)' == 'true'">
<ProjectReference Include="Microsoft.NET.Runtime.MonoAOTCompiler.Task\Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj" />
</ItemGroup>
</Project>
7 changes: 7 additions & 0 deletions src/tasks/AotCompilerTask/MonoAOTCompiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,11 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<!-- GetFilesToPackage assists to place `MonoAOTCompiler.dll` in a NuGet package in Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj for external use -->
<Target Name="GetFilesToPackage" Returns="@(FilesToPackage)">
<ItemGroup>
<FilesToPackage Include="$(OutputPath)$(NetCoreAppToolCurrent)\$(AssemblyName).dll" TargetPath="tools\$(NetCoreAppToolCurrent)" />
</ItemGroup>
</Target>
</Project>