Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric St. John <ericstj@microsoft.com>2017-02-02 02:02:12 +0300
committerEric St. John <ericstj@microsoft.com>2017-02-02 05:28:02 +0300
commit7223eab1c15822cabf3624c7b85089221f684c9a (patch)
treea3fe16d920055eefaef2112f52dfb38d060b5fa8 /external/runtime
parent36a7f40e06aa5bd2bb04afe14f23f32aca8a68b7 (diff)
Combine coreclr and NETNative runtime projects
Combine these so we have a common runtime project. Thanks to @joperezr for this change.
Diffstat (limited to 'external/runtime')
-rw-r--r--external/runtime/Configurations.props10
-rw-r--r--external/runtime/NETNative/project.json.template12
-rw-r--r--external/runtime/project.json.template17
-rw-r--r--external/runtime/runtime.depproj21
4 files changed, 60 insertions, 0 deletions
diff --git a/external/runtime/Configurations.props b/external/runtime/Configurations.props
new file mode 100644
index 0000000000..38f4dab7aa
--- /dev/null
+++ b/external/runtime/Configurations.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <BuildConfigurations>
+ netcoreapp;
+ uap;
+ uapaot;
+ </BuildConfigurations>
+ </PropertyGroup>
+</Project> \ No newline at end of file
diff --git a/external/runtime/NETNative/project.json.template b/external/runtime/NETNative/project.json.template
new file mode 100644
index 0000000000..4c592e3625
--- /dev/null
+++ b/external/runtime/NETNative/project.json.template
@@ -0,0 +1,12 @@
+{
+ "frameworks": {
+ "{TFM}": {
+ "dependencies": {
+ "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24931-00"
+ }
+ }
+ },
+ "runtimes": {
+ "{RID}": {}
+ }
+}
diff --git a/external/runtime/project.json.template b/external/runtime/project.json.template
new file mode 100644
index 0000000000..944e8d8842
--- /dev/null
+++ b/external/runtime/project.json.template
@@ -0,0 +1,17 @@
+{
+ "frameworks": {
+ "{TFM}": {
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "2.0.0-beta-25001-02",
+ "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-24930-03",
+ "Microsoft.NETCore.TestHost": "2.0.0-beta-24930-03",
+ "runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24913-02",
+ "Microsoft.NETCore.DotNetHost": "1.2.0-beta-001259-00",
+ "Microsoft.NETCore.DotNetHostPolicy": "1.2.0-beta-001259-00"
+ }
+ }
+ },
+ "runtimes": {
+ "{RID}": {}
+ }
+}
diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj
new file mode 100644
index 0000000000..68ddad5f54
--- /dev/null
+++ b/external/runtime/runtime.depproj
@@ -0,0 +1,21 @@
+<?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>
+ <!-- WORKAROUND: Force external packages to be restored for x64 until arm packages are fully broughtup-->
+ <NugetRuntimeIdentifier Condition="'$(ArchGroup)' == 'arm'">$(RuntimeOS)-x64</NugetRuntimeIdentifier>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
+ <ProjectJsonTemplate>$(MSBuildThisFileDirectory)NETNative/project.json.template</ProjectJsonTemplate>
+ <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
+ </PropertyGroup>
+ <ItemGroup Condition="'$(TargetGroup)' == 'uapaot'">
+ <TargetingPackReference Include="System.Private.CoreLib" />
+ <TargetingPackReference Include="System.Private.CoreLib.Augments" />
+ <TargetingPackReference Include="System.Private.CoreLib.DynamicDelegate" />
+ <TargetingPackReference Include="System.Private.CoreLib.WinRTInterop" />
+ <TargetingPackReference Include="System.Private.Interop" />
+ <TargetingPackReference Include="System.Private.Threading" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+</Project> \ No newline at end of file