diff options
| author | Eric Mellino <erme@microsoft.com> | 2017-02-17 23:08:02 +0300 |
|---|---|---|
| committer | Eric Mellino <erme@microsoft.com> | 2017-03-01 03:31:56 +0300 |
| commit | 93c04061b231306546666de03448e3f8d0ed44e2 (patch) | |
| tree | 445cf69c63459b0ea9069bed536661491666ec7b /external | |
| parent | 0521745e315bb375192c7581faac72d8faf44627 (diff) | |
Restore ilasm from external directory
* Also, re-enable all of the projects that were disabled because ilasm
didn't work outside Windows.
Diffstat (limited to 'external')
| -rw-r--r-- | external/dir.proj | 1 | ||||
| -rw-r--r-- | external/ilasm/Configurations.props | 9 | ||||
| -rw-r--r-- | external/ilasm/ilasm.depproj | 11 | ||||
| -rw-r--r-- | external/ilasm/project.json.template | 14 |
4 files changed, 35 insertions, 0 deletions
diff --git a/external/dir.proj b/external/dir.proj index cd67dddc8f..8d1b033ca6 100644 --- a/external/dir.proj +++ b/external/dir.proj @@ -14,6 +14,7 @@ <Project Include="harvestPackages/harvestPackages.depproj" /> <Project Include="portable\portable.depproj" /> <Project Include="uapaotredist/uapaotredist.depproj" /> + <Project Include="ilasm/ilasm.depproj" /> </ItemGroup> <Import Project="../dir.traversal.targets" /> diff --git a/external/ilasm/Configurations.props b/external/ilasm/Configurations.props new file mode 100644 index 0000000000..1040c9ba37 --- /dev/null +++ b/external/ilasm/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp-Windows_NT; + netcoreapp-Unix; + </BuildConfigurations> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/external/ilasm/ilasm.depproj b/external/ilasm/ilasm.depproj new file mode 100644 index 0000000000..f29e13c68c --- /dev/null +++ b/external/ilasm/ilasm.depproj @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <NugetRuntimeIdentifier Condition="'$(OSGroup)' == 'Unix' AND '$(RunningOnUnix)' != 'true'">ubuntu.14.04-x64</NugetRuntimeIdentifier> + <!-- WORKAROUND: Force external packages to be restored for x64 until arm packages are fully broughtup--> + <NugetRuntimeIdentifier Condition="'$(ArchGroup)' == 'armel'">$(RuntimeOS)-x64</NugetRuntimeIdentifier> + <OutputPath>$(ToolsDir)ilasm</OutputPath> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/external/ilasm/project.json.template b/external/ilasm/project.json.template new file mode 100644 index 0000000000..d6fe156172 --- /dev/null +++ b/external/ilasm/project.json.template @@ -0,0 +1,14 @@ +{ + "frameworks": { + "{TFM}": { + "dependencies": { + "Microsoft.NETCore.Platforms": "2.0.0-beta-25027-01", + "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25028-02", + "Microsoft.NETCore.ILAsm": "2.0.0-beta-25028-02", + } + } + }, + "runtimes": { + "{RID}": {} + } +} |