diff options
author | Jan Kotas <jkotas@microsoft.com> | 2017-06-24 21:10:44 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-24 21:10:44 +0300 |
commit | 555bcbcb5458a7aacb404f8242a6fe9267266ca7 (patch) | |
tree | dfb7caea05fb1f004869a4eba32267f2a76fe449 /src/System.Private.Reflection.Execution | |
parent | 095e43a781181d9a59ceb726a9c72a65913dbdeb (diff) |
Update CoreRT build to use latest .NET CLI and build tools (#3916)
- Pick up latest .NET Core 2.0 CLI and buildtools
- Remove all project.json references and convert everything to msbuild projects
- Stick to vanilla .NET CLI project shape as much as possible. Minimize dependencies on buildtools special behaviors
Diffstat (limited to 'src/System.Private.Reflection.Execution')
2 files changed, 3 insertions, 13 deletions
diff --git a/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.Experimental.csproj b/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.Experimental.csproj index b5580c0b4..069aa60a9 100644 --- a/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.Experimental.csproj +++ b/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.Experimental.csproj @@ -1,8 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <PropertyGroup> <AssemblyName>System.Private.Reflection.Execution.Experimental</AssemblyName> - <ProjectGuid>{B48AF2B7-7205-4449-9DFF-44936490E8A5}</ProjectGuid> <EcmaMetadataSupport>true</EcmaMetadataSupport> <JitSupport>true</JitSupport> </PropertyGroup> diff --git a/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.csproj b/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.csproj index 9771e63a0..75bcf70dc 100644 --- a/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.csproj +++ b/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.csproj @@ -1,22 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(AssemblyName)' == ''"> <AssemblyName>System.Private.Reflection.Execution</AssemblyName> - <ProjectGuid>{306A4D48-0ACF-41C4-BBA0-BCDAD9253E2D}</ProjectGuid> </PropertyGroup> <PropertyGroup> - <AssemblyName>System.Private.Reflection.Execution</AssemblyName> <AssemblyVersion>4.0.0.0</AssemblyVersion> <OutputType>Library</OutputType> - <ProjectGuid>{306A4D48-0ACF-41C4-BBA0-BCDAD9253E2D}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <PropertyGroup Condition="'$(EcmaMetadataSupport)' == 'true'"> <DefineConstants>ECMA_METADATA_SUPPORT;$(DefineConstants)</DefineConstants> </PropertyGroup> @@ -26,7 +18,7 @@ <!-- Setup the right references --> <ItemGroup> - <ReferencePath Condition="'$(EcmaMetadataSupport)' == 'true'" Include="$(EcmaMetadataDllPath)\System.Private.Reflection.Metadata.Ecma335.dll" /> + <ReferencePath Condition="'$(EcmaMetadataSupport)' == 'true'" Include="$(AotPackageReferencePath)\System.Private.Reflection.Metadata.Ecma335.dll" /> </ItemGroup> <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true'"> |