From 0b47284cd1d5a92b96ddf4be79b72b4f726fd53d Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 28 Dec 2020 11:06:03 -0500 Subject: [PATCH 01/15] Test workload --- ...t.NET.Runtime.MonoAOTCompiler.Task.pkgproj | 18 +++++++++ .../Sdk/Sdk.props | 22 +++++++++++ ...Microsoft.NET.Runtime.Workload.AOT.pkgproj | 12 ++++++ .../WorkloadManifest.json | 17 +++++++++ .../WorkloadManifest.targets | 5 +++ src/mono/netcore/nuget/descriptions.json | 37 +++++++++++++++++++ src/mono/netcore/nuget/mono-packages.proj | 5 +++ .../sample/Android/AndroidSampleApp.csproj | 6 ++- src/mono/netcore/sample/Android/NuGet.config | 7 ++++ src/mono/netcore/sample/iOS/NuGet.config | 8 ++++ src/mono/netcore/sample/iOS/Program.csproj | 16 ++++---- .../AotCompilerTask/MonoAOTCompiler.csproj | 2 + 12 files changed, 145 insertions(+), 10 deletions(-) create mode 100644 src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj create mode 100644 src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props create mode 100644 src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/Microsoft.NET.Runtime.Workload.AOT.pkgproj create mode 100644 src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.json create mode 100644 src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.targets create mode 100644 src/mono/netcore/nuget/descriptions.json create mode 100644 src/mono/netcore/sample/Android/NuGet.config create mode 100644 src/mono/netcore/sample/iOS/NuGet.config diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj new file mode 100644 index 00000000000000..83a9f36407820d --- /dev/null +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj @@ -0,0 +1,18 @@ + + + + + + + + + + <_AOTCompilerTaskFile Include="$(ArtifactsDir)bin\MonoAOTCompiler\$(Configuration)\$(NetCoreAppToolCurrent)\MonoAOTCompiler.dll" /> + <_SDKPropsFile Include="Sdk\Sdk.props" /> + + + + + + + \ No newline at end of file diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props new file mode 100644 index 00000000000000..2186d7d6af5c61 --- /dev/null +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props @@ -0,0 +1,22 @@ + + + + + <_AOTTasksDirectoryRoot Condition=" '$(_ILLinkTasksDirectoryRoot)' == '' ">$(MSBuildThisFileDirectory)../tools/ + <_AOTTasksTFM>net5.0 + <_AOTTasksDirectory>$(_ILLinkTasksDirectoryRoot)$(_AOTTasksTFM)/ + $(_AOTTasksDirectory)MonoAOTCompiler.dll + + + + diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/Microsoft.NET.Runtime.Workload.AOT.pkgproj b/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/Microsoft.NET.Runtime.Workload.AOT.pkgproj new file mode 100644 index 00000000000000..eb7dbed7cb944d --- /dev/null +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/Microsoft.NET.Runtime.Workload.AOT.pkgproj @@ -0,0 +1,12 @@ + + + + + + <_ManifestFile Include="WorkloadManifest.json" /> + + + + + + \ No newline at end of file diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.json b/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.json new file mode 100644 index 00000000000000..d63ff6fd89ef29 --- /dev/null +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.json @@ -0,0 +1,17 @@ +{ + "version": 6, + "workloads": { + "microsoft-net-runtime-aot-task": { + "description": "Mono AOT Compiler Task", + "packs": [ + "Microsoft.NET.Runtime.MonoAOTCompiler.Task" + ] + } + }, + "packs": { + "Microsoft.NET.Runtime.MonoAOTCompiler.Task": { + "kind": "sdk", + "version": "1.0" + } + } + } \ No newline at end of file diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.targets b/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.targets new file mode 100644 index 00000000000000..cbb9234c9f9b39 --- /dev/null +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.targets @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/src/mono/netcore/nuget/descriptions.json b/src/mono/netcore/nuget/descriptions.json new file mode 100644 index 00000000000000..c2936e8478ee9b --- /dev/null +++ b/src/mono/netcore/nuget/descriptions.json @@ -0,0 +1,37 @@ +[ + { + "Name": "NuGet3MinVersion", + "Description": "When using NuGet 3.x this package requires at least version {0}.", + "CommonTypes": [ ] + }, + { + "Name": "Microsoft.NET.Runtime.Android.Sample.Mono", + "Description": "Internal package for sharing Android App Builder.", + "CommonTypes": [ ] + }, + { + "Name": "Microsoft.NET.Runtime.iOS.Sample.Mono", + "Description": "Internal package for sharing embedded Mono runtime and iOS App Builder.", + "CommonTypes": [ ] + }, + { + "Name": "Microsoft.NET.Runtime.wasm.Sample.Mono", + "Description": "Internal package for sharing wasm App Builder.", + "CommonTypes": [ ] + }, + { + "Name": "Microsoft.NET.Runtime.Workload.AOT", + "Description": "The workload pack for the MonoAOTCompiler MSBuild Task", + "CommonTypes": [ ] + }, + { + "Name": "Microsoft.NET.Runtime.MonoAOTCompiler.Task", + "Description": "The package that contains the MonoAOTCompiler MSBuild Task", + "CommonTypes": [ ] + }, + { + "Name": "Microsoft.NETCore.BrowserDebugHost.Transport", + "Description": "Internal package for sharing BrowserDebugHost.", + "CommonTypes": [ ] + } +] diff --git a/src/mono/netcore/nuget/mono-packages.proj b/src/mono/netcore/nuget/mono-packages.proj index 0bea76337616f2..00209baa87ea10 100644 --- a/src/mono/netcore/nuget/mono-packages.proj +++ b/src/mono/netcore/nuget/mono-packages.proj @@ -15,4 +15,9 @@ + + + + + diff --git a/src/mono/netcore/sample/Android/AndroidSampleApp.csproj b/src/mono/netcore/sample/Android/AndroidSampleApp.csproj index 42355b26ecc3a0..88f4d9c4c2c0fc 100644 --- a/src/mono/netcore/sample/Android/AndroidSampleApp.csproj +++ b/src/mono/netcore/sample/Android/AndroidSampleApp.csproj @@ -4,13 +4,15 @@ false $(NetCoreAppToolCurrent) false - android-$(TargetArchitecture) + true Link $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)\runtimes\android-$(TargetArchitecture)\ + /Users/steve/net5/desktop-runtime/artifacts/bin/AndroidAppBuilder/publish/AndroidAppBuilder.dll + diff --git a/src/mono/netcore/sample/Android/NuGet.config b/src/mono/netcore/sample/Android/NuGet.config new file mode 100644 index 00000000000000..d60df9721a23f6 --- /dev/null +++ b/src/mono/netcore/sample/Android/NuGet.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/mono/netcore/sample/iOS/NuGet.config b/src/mono/netcore/sample/iOS/NuGet.config new file mode 100644 index 00000000000000..f209ce1c669624 --- /dev/null +++ b/src/mono/netcore/sample/iOS/NuGet.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/mono/netcore/sample/iOS/Program.csproj b/src/mono/netcore/sample/iOS/Program.csproj index a873f64da64412..5454041a9e4503 100644 --- a/src/mono/netcore/sample/iOS/Program.csproj +++ b/src/mono/netcore/sample/iOS/Program.csproj @@ -2,17 +2,18 @@ Exe bin - $(NetCoreAppToolCurrent) iOS $(ArtifactsBinDir)microsoft.netcore.app.runtime.ios-$(TargetArchitecture)\$(Configuration)\runtimes\ios-$(TargetArchitecture)\ - false - ios-$(TargetArchitecture) + + net6.0-ios + ios-x64 true Link $(DefineConstants);CI_TEST + @@ -49,14 +49,14 @@ + LLVMPath="$(RuntimePackPath)native\cross"> @@ -64,7 +64,7 @@ TargetOS="$(TargetOS)" Arch="$(TargetArchitecture)" ProjectName="HelloiOS" - MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)native\include\mono-2.0" + MonoRuntimeHeaders="$(RuntimePackPath)native\include\mono-2.0" Assemblies="@(BundleAssemblies)" MainLibraryFileName="Program.dll" GenerateXcodeProject="True" diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj index 66d2cfb9c2e1e7..7751463db7a8a4 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj @@ -22,4 +22,6 @@ PreserveNewest + + From 3ef55be60a66033c81d1dbb350c8d254aab13a97 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Thu, 31 Dec 2020 11:39:44 -0500 Subject: [PATCH 02/15] Remove hardcoded path to MonoAOTCompiler Remove changes related to testing the MonoAOTCompiler NuPkg Remove changes to deprecated files that led to file additions --- ...t.NET.Runtime.MonoAOTCompiler.Task.pkgproj | 2 +- src/mono/netcore/nuget/descriptions.json | 37 ------------------- .../sample/Android/AndroidSampleApp.csproj | 6 +-- src/mono/netcore/sample/Android/NuGet.config | 7 ---- src/mono/netcore/sample/iOS/NuGet.config | 8 ---- src/mono/netcore/sample/iOS/Program.csproj | 16 ++++---- 6 files changed, 11 insertions(+), 65 deletions(-) delete mode 100644 src/mono/netcore/nuget/descriptions.json delete mode 100644 src/mono/netcore/sample/Android/NuGet.config delete mode 100644 src/mono/netcore/sample/iOS/NuGet.config diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj index 83a9f36407820d..6743ce170e074a 100644 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj @@ -7,7 +7,7 @@ - <_AOTCompilerTaskFile Include="$(ArtifactsDir)bin\MonoAOTCompiler\$(Configuration)\$(NetCoreAppToolCurrent)\MonoAOTCompiler.dll" /> + <_AOTCompilerTaskFile Include="$(MonoAOTCompilerTasksAssemblyPath)" /> <_SDKPropsFile Include="Sdk\Sdk.props" /> diff --git a/src/mono/netcore/nuget/descriptions.json b/src/mono/netcore/nuget/descriptions.json deleted file mode 100644 index c2936e8478ee9b..00000000000000 --- a/src/mono/netcore/nuget/descriptions.json +++ /dev/null @@ -1,37 +0,0 @@ -[ - { - "Name": "NuGet3MinVersion", - "Description": "When using NuGet 3.x this package requires at least version {0}.", - "CommonTypes": [ ] - }, - { - "Name": "Microsoft.NET.Runtime.Android.Sample.Mono", - "Description": "Internal package for sharing Android App Builder.", - "CommonTypes": [ ] - }, - { - "Name": "Microsoft.NET.Runtime.iOS.Sample.Mono", - "Description": "Internal package for sharing embedded Mono runtime and iOS App Builder.", - "CommonTypes": [ ] - }, - { - "Name": "Microsoft.NET.Runtime.wasm.Sample.Mono", - "Description": "Internal package for sharing wasm App Builder.", - "CommonTypes": [ ] - }, - { - "Name": "Microsoft.NET.Runtime.Workload.AOT", - "Description": "The workload pack for the MonoAOTCompiler MSBuild Task", - "CommonTypes": [ ] - }, - { - "Name": "Microsoft.NET.Runtime.MonoAOTCompiler.Task", - "Description": "The package that contains the MonoAOTCompiler MSBuild Task", - "CommonTypes": [ ] - }, - { - "Name": "Microsoft.NETCore.BrowserDebugHost.Transport", - "Description": "Internal package for sharing BrowserDebugHost.", - "CommonTypes": [ ] - } -] diff --git a/src/mono/netcore/sample/Android/AndroidSampleApp.csproj b/src/mono/netcore/sample/Android/AndroidSampleApp.csproj index 88f4d9c4c2c0fc..42355b26ecc3a0 100644 --- a/src/mono/netcore/sample/Android/AndroidSampleApp.csproj +++ b/src/mono/netcore/sample/Android/AndroidSampleApp.csproj @@ -4,15 +4,13 @@ false $(NetCoreAppToolCurrent) false - + android-$(TargetArchitecture) true Link $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)\runtimes\android-$(TargetArchitecture)\ - /Users/steve/net5/desktop-runtime/artifacts/bin/AndroidAppBuilder/publish/AndroidAppBuilder.dll - + diff --git a/src/mono/netcore/sample/Android/NuGet.config b/src/mono/netcore/sample/Android/NuGet.config deleted file mode 100644 index d60df9721a23f6..00000000000000 --- a/src/mono/netcore/sample/Android/NuGet.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/mono/netcore/sample/iOS/NuGet.config b/src/mono/netcore/sample/iOS/NuGet.config deleted file mode 100644 index f209ce1c669624..00000000000000 --- a/src/mono/netcore/sample/iOS/NuGet.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/mono/netcore/sample/iOS/Program.csproj b/src/mono/netcore/sample/iOS/Program.csproj index 5454041a9e4503..a873f64da64412 100644 --- a/src/mono/netcore/sample/iOS/Program.csproj +++ b/src/mono/netcore/sample/iOS/Program.csproj @@ -2,18 +2,17 @@ Exe bin + $(NetCoreAppToolCurrent) iOS $(ArtifactsBinDir)microsoft.netcore.app.runtime.ios-$(TargetArchitecture)\$(Configuration)\runtimes\ios-$(TargetArchitecture)\ - - net6.0-ios - ios-x64 + false + ios-$(TargetArchitecture) true Link $(DefineConstants);CI_TEST - + + @@ -49,14 +49,14 @@ + LLVMPath="$(MicrosoftNetCoreAppRuntimePackDir)native\cross"> @@ -64,7 +64,7 @@ TargetOS="$(TargetOS)" Arch="$(TargetArchitecture)" ProjectName="HelloiOS" - MonoRuntimeHeaders="$(RuntimePackPath)native\include\mono-2.0" + MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)native\include\mono-2.0" Assemblies="@(BundleAssemblies)" MainLibraryFileName="Program.dll" GenerateXcodeProject="True" From 4dadc9d2ef76b55b7a2d5ce663cf26a5c3ab15ad Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Thu, 31 Dec 2020 14:18:11 -0500 Subject: [PATCH 03/15] Inline pkg descriptions for MonoAOTCompiler Task and workload packs --- .../Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj | 7 +++++-- .../Microsoft.NET.Runtime.Workload.AOT.pkgproj | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj index 6743ce170e074a..b36fb9609cbc74 100644 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj @@ -1,7 +1,10 @@ - - + + + The package that contains the MonoAOTCompiler MSBuild Task + + diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/Microsoft.NET.Runtime.Workload.AOT.pkgproj b/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/Microsoft.NET.Runtime.Workload.AOT.pkgproj index eb7dbed7cb944d..a5b38d88b6261c 100644 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/Microsoft.NET.Runtime.Workload.AOT.pkgproj +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/Microsoft.NET.Runtime.Workload.AOT.pkgproj @@ -1,7 +1,10 @@ - - + + + The workload pack for the MonoAOTCompiler MSBuild Task + + <_ManifestFile Include="WorkloadManifest.json" /> From 153ba7f514ef36e5d0b0a25882fcf318ccb6e2a6 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 4 Jan 2021 12:53:10 -0500 Subject: [PATCH 04/15] Remove Workload AOT additions --- .../Microsoft.NET.Runtime.Workload.AOT.pkgproj | 15 --------------- .../WorkloadManifest.json | 17 ----------------- .../WorkloadManifest.targets | 5 ----- src/mono/netcore/nuget/mono-packages.proj | 1 - 4 files changed, 38 deletions(-) delete mode 100644 src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/Microsoft.NET.Runtime.Workload.AOT.pkgproj delete mode 100644 src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.json delete mode 100644 src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.targets diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/Microsoft.NET.Runtime.Workload.AOT.pkgproj b/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/Microsoft.NET.Runtime.Workload.AOT.pkgproj deleted file mode 100644 index a5b38d88b6261c..00000000000000 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/Microsoft.NET.Runtime.Workload.AOT.pkgproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - - The workload pack for the MonoAOTCompiler MSBuild Task - - - - <_ManifestFile Include="WorkloadManifest.json" /> - - - - - - \ No newline at end of file diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.json b/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.json deleted file mode 100644 index d63ff6fd89ef29..00000000000000 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 6, - "workloads": { - "microsoft-net-runtime-aot-task": { - "description": "Mono AOT Compiler Task", - "packs": [ - "Microsoft.NET.Runtime.MonoAOTCompiler.Task" - ] - } - }, - "packs": { - "Microsoft.NET.Runtime.MonoAOTCompiler.Task": { - "kind": "sdk", - "version": "1.0" - } - } - } \ No newline at end of file diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.targets b/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.targets deleted file mode 100644 index cbb9234c9f9b39..00000000000000 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.Workload.AOT/WorkloadManifest.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/src/mono/netcore/nuget/mono-packages.proj b/src/mono/netcore/nuget/mono-packages.proj index 00209baa87ea10..c8442acff12abd 100644 --- a/src/mono/netcore/nuget/mono-packages.proj +++ b/src/mono/netcore/nuget/mono-packages.proj @@ -17,7 +17,6 @@ - From 33c73b57d53615bc9b6c961450e1f6422ff17be5 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 4 Jan 2021 13:42:34 -0500 Subject: [PATCH 05/15] Replace _ILLinkTasksDirectoryRoot with _AOTTasksDirectoryRoot --- .../Sdk/Sdk.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props index 2186d7d6af5c61..ce2596498e1a5b 100644 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props @@ -12,10 +12,10 @@ Copyright (c) .NET Foundation. All rights reserved. - <_AOTTasksDirectoryRoot Condition=" '$(_ILLinkTasksDirectoryRoot)' == '' ">$(MSBuildThisFileDirectory)../tools/ + <_AOTTasksDirectoryRoot Condition="'$(_AOTTasksDirectoryRoot)' == ''">$(MSBuildThisFileDirectory)../tools/ <_AOTTasksTFM>net5.0 - <_AOTTasksDirectory>$(_ILLinkTasksDirectoryRoot)$(_AOTTasksTFM)/ - $(_AOTTasksDirectory)MonoAOTCompiler.dll + <_AOTTasksDirectory>$(_AOTTasksDirectoryRoot)$(_AOTTasksTFM)/ + $(_AOTTasksDirectory)MonoAOTCompiler.dll From 6813a96750de98235a22bc12e3c2bc1ffdeb4d10 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 4 Jan 2021 16:11:07 -0500 Subject: [PATCH 06/15] Add TargetsMobile condition --- src/mono/netcore/nuget/mono-packages.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/netcore/nuget/mono-packages.proj b/src/mono/netcore/nuget/mono-packages.proj index c8442acff12abd..9359f347321c71 100644 --- a/src/mono/netcore/nuget/mono-packages.proj +++ b/src/mono/netcore/nuget/mono-packages.proj @@ -16,7 +16,7 @@ - + From b98f20a2b1aeb34058262548a78169231c2650f4 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Tue, 5 Jan 2021 13:00:13 -0500 Subject: [PATCH 07/15] Remove temporary variables --- .../Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props index ce2596498e1a5b..53922a2cc053b3 100644 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props @@ -13,9 +13,7 @@ Copyright (c) .NET Foundation. All rights reserved. <_AOTTasksDirectoryRoot Condition="'$(_AOTTasksDirectoryRoot)' == ''">$(MSBuildThisFileDirectory)../tools/ - <_AOTTasksTFM>net5.0 - <_AOTTasksDirectory>$(_AOTTasksDirectoryRoot)$(_AOTTasksTFM)/ - $(_AOTTasksDirectory)MonoAOTCompiler.dll + $(_AOTTasksDirectoryRoot)net5.0/MonoAOTCompiler.dll From aa6d62d2ea447f7542b318becb7b2a853a8e36c5 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Tue, 5 Jan 2021 16:16:27 -0500 Subject: [PATCH 08/15] Reword MonoAOTCompiler NuPkg description --- .../Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj index b36fb9609cbc74..301183a9b5de55 100644 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj @@ -2,7 +2,7 @@ - The package that contains the MonoAOTCompiler MSBuild Task + Provides the MonoAOTCompiler task From ea71b3fc4a64c246c24d2fa017240b1e53bc9911 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Tue, 5 Jan 2021 16:16:56 -0500 Subject: [PATCH 09/15] Remove NuPkg import of MonoAOTCompiler UsingTask --- ...t.NET.Runtime.MonoAOTCompiler.Task.pkgproj | 2 -- .../Sdk/Sdk.props | 20 ------------------- 2 files changed, 22 deletions(-) delete mode 100644 src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj index 301183a9b5de55..348d1549862e89 100644 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj @@ -11,10 +11,8 @@ <_AOTCompilerTaskFile Include="$(MonoAOTCompilerTasksAssemblyPath)" /> - <_SDKPropsFile Include="Sdk\Sdk.props" /> - diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props deleted file mode 100644 index 53922a2cc053b3..00000000000000 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - <_AOTTasksDirectoryRoot Condition="'$(_AOTTasksDirectoryRoot)' == ''">$(MSBuildThisFileDirectory)../tools/ - $(_AOTTasksDirectoryRoot)net5.0/MonoAOTCompiler.dll - - - - From 3aed26539d71b7638e0d20bd9fe546095df5afec Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Tue, 5 Jan 2021 16:29:01 -0500 Subject: [PATCH 10/15] Add MonoAOTCompilerTaskAssemblyPath property --- .../build/Microsoft.NET.Runtime.MonoAOTCompiler.Task.props | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/build/Microsoft.NET.Runtime.MonoAOTCompiler.Task.props diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/build/Microsoft.NET.Runtime.MonoAOTCompiler.Task.props b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/build/Microsoft.NET.Runtime.MonoAOTCompiler.Task.props new file mode 100644 index 00000000000000..a0d4515ea04e36 --- /dev/null +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/build/Microsoft.NET.Runtime.MonoAOTCompiler.Task.props @@ -0,0 +1,5 @@ + + + $(MSBuildThisFileDirectory)..\tools\net5.0\MonoAOTCompiler.dll + + From 1d75af272ca338dce7fe05b88dab345fd518bf6e Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Tue, 5 Jan 2021 16:30:31 -0500 Subject: [PATCH 11/15] Cleanup Microsoft.NET.Runtime.MonoAOTCompiler.Tasks.props --- .../build/Microsoft.NET.Runtime.MonoAOTCompiler.Task.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/build/Microsoft.NET.Runtime.MonoAOTCompiler.Task.props b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/build/Microsoft.NET.Runtime.MonoAOTCompiler.Task.props index a0d4515ea04e36..2732cb7aed59c3 100644 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/build/Microsoft.NET.Runtime.MonoAOTCompiler.Task.props +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/build/Microsoft.NET.Runtime.MonoAOTCompiler.Task.props @@ -1,4 +1,4 @@ - + $(MSBuildThisFileDirectory)..\tools\net5.0\MonoAOTCompiler.dll From 6f15807e9e35d9d055c56a77126c974c5764d4b4 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Wed, 6 Jan 2021 11:30:54 -0500 Subject: [PATCH 12/15] Add README.md with example of using the NuPkg --- .../README.md | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/README.md diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/README.md b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/README.md new file mode 100644 index 00000000000000..4af7b9fff24130 --- /dev/null +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/README.md @@ -0,0 +1,35 @@ +# MonoAOTCompiler MSBuild Task NuPkg +The MonoAOTCompiler MSBuild task is useful outside the context of `dotnet/runtime`. The task is made available through a NuGet Package by packaging the `MonoAOTCompiler.dll` assembly produced from building `MonoAOTCompiler.csproj`. To use the task in a project, download the NuGet package through setting up the proper source and importing the package. + +## NuGet.config +``` + + + + + + +``` + +## In the project file +``` + + + + + + + + + + + + > + + + +``` \ No newline at end of file From a6db3978578cd19919c9f1f954c5845cdc0c7d13 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 5 Jan 2021 18:56:09 -0500 Subject: [PATCH 13/15] Specify the package files for the aot task, in the project itself --- .../Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj | 8 ++------ src/tasks/AotCompilerTask/MonoAOTCompiler.csproj | 6 +++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj index 348d1549862e89..b60e4558da06d5 100644 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj @@ -7,13 +7,9 @@ - - - - <_AOTCompilerTaskFile Include="$(MonoAOTCompilerTasksAssemblyPath)" /> - + - \ No newline at end of file + diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj index 7751463db7a8a4..7644e1c338c360 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj @@ -23,5 +23,9 @@ - + + + + + From 25ba31d0550bc2affa1e8c0d923e0597e29876ee Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Wed, 6 Jan 2021 12:02:06 -0500 Subject: [PATCH 14/15] Add comment for GetFilesToPackage target --- src/tasks/AotCompilerTask/MonoAOTCompiler.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj index 7644e1c338c360..82f2908753b0c1 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj @@ -23,6 +23,7 @@ + From a4f9fb20195b63c4b088e526b28b2236db9b5c98 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Wed, 6 Jan 2021 13:12:05 -0500 Subject: [PATCH 15/15] Update README.md Co-authored-by: Ankit Jain --- .../Microsoft.NET.Runtime.MonoAOTCompiler.Task/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/README.md b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/README.md index 4af7b9fff24130..63c8bf4ad35056 100644 --- a/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/README.md +++ b/src/mono/netcore/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/README.md @@ -1,5 +1,5 @@ # MonoAOTCompiler MSBuild Task NuPkg -The MonoAOTCompiler MSBuild task is useful outside the context of `dotnet/runtime`. The task is made available through a NuGet Package by packaging the `MonoAOTCompiler.dll` assembly produced from building `MonoAOTCompiler.csproj`. To use the task in a project, download the NuGet package through setting up the proper source and importing the package. +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 ``` @@ -32,4 +32,4 @@ The MonoAOTCompiler MSBuild task is useful outside the context of `dotnet/runtim -``` \ No newline at end of file +```