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.Core | |
| 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.Core')
| -rw-r--r-- | src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.Experimental.csproj | 4 | ||||
| -rw-r--r-- | src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.csproj | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.Experimental.csproj b/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.Experimental.csproj index b7b298a97..75f14057a 100644 --- a/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.Experimental.csproj +++ b/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.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.Core.Experimental</AssemblyName> - <ProjectGuid>{50CDFB37-A390-499E-B3B6-690BE70AB706}</ProjectGuid> <EcmaMetadataSupport>true</EcmaMetadataSupport> <JitSupport>true</JitSupport> </PropertyGroup> diff --git a/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.csproj b/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.csproj index 8e87be884..f0f7d213d 100644 --- a/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.csproj +++ b/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.csproj @@ -1,9 +1,7 @@ -<?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.Core</AssemblyName> - <ProjectGuid>{999BB20D-A032-4836-A587-627D243C1668}</ProjectGuid> </PropertyGroup> <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> @@ -16,9 +14,6 @@ <PropertyGroup Condition="'$(EcmaMetadataSupport)' == 'true'"> <DefineConstants>ECMA_METADATA_SUPPORT;$(DefineConstants)</DefineConstants> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <ProjectReference Include="..\..\AotPackageReference\AotPackageReference.depproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> @@ -35,7 +30,7 @@ </ItemGroup> <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true' and '$(EcmaMetadataSupport)' == 'true'"> <ProjectReference Include="..\..\System.Private.TypeLoader\src\System.Private.TypeLoader.Experimental.csproj" /> - <ReferencePath Include="$(EcmaMetadataDllPath)\System.Private.Reflection.Metadata.Ecma335.dll" /> + <ReferencePath Include="$(AotPackageReferencePath)\System.Private.Reflection.Metadata.Ecma335.dll" /> </ItemGroup> <ItemGroup Condition="'$(EcmaMetadataSupport)' == 'true'"> <Compile Include="System\Reflection\Runtime\Assemblies\EcmaFormat\EcmaFormatRuntimeAssembly.cs" /> |