diff options
| author | Egor Bogatov <egorbo@gmail.com> | 2019-08-02 17:05:22 +0300 |
|---|---|---|
| committer | Steve Pfister <steveisok@users.noreply.github.com> | 2019-08-02 17:05:22 +0300 |
| commit | 40f28b2e6371c708989ff59dd1cb4f7dcc22aedc (patch) | |
| tree | f5aa809f8811e816953de2a9ce1cbb004bcee9c8 /netcore | |
| parent | 3a9df67a64c129fa3c5c32334c231739965f1efb (diff) | |
Make System.Private.CoreLib.csproj VS friendly (#15965)
Now it's possible to open System.Private.CoreLib.csproj in an IDE and build (use Roslyn version from eng/Versions.props).
Diffstat (limited to 'netcore')
| -rw-r--r-- | netcore/Makefile | 3 | ||||
| -rw-r--r-- | netcore/System.Private.CoreLib/System.Private.CoreLib.csproj | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/netcore/Makefile b/netcore/Makefile index e0ed1ac8506..902c0c49a49 100644 --- a/netcore/Makefile +++ b/netcore/Makefile @@ -4,12 +4,11 @@ include config.make NETCORETESTS_VERSION := $(shell cat ../eng/Versions.props | sed -n 's/.*MicrosoftPrivateCoreFxNETCoreAppVersion>\(.*\)<\/MicrosoftPrivateCoreFxNETCoreAppVersion.*/\1/p' ) NETCOREAPP_VERSION := $(shell cat ../eng/Versions.props | sed -n 's/.*MicrosoftNETCoreAppVersion>\(.*\)<\/MicrosoftNETCoreAppVersion.*/\1/p' ) +ROSLYN_VERSION:= $(shell cat ../eng/Versions.props | sed -n 's/.*MicrosoftNetCompilersVersion>\(.*\)<\/MicrosoftNetCompilersVersion.*/\1/p' ) # Extracted from https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/latest.version ASPNETCOREAPP_VERSION := 3.0.0-preview-18614-0151 -ROSLYN_VERSION := 3.3.0-beta2-19374-02 - ifeq ($(HOST_PLATFORM),win32) PLATFORM_AOT_SUFFIX := .dll PLATFORM_AOT_PREFIX := diff --git a/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj index 82e91746405..3f0b5dd0241 100644 --- a/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project Sdk="Microsoft.NET.Sdk"> + <Import Project="..\..\eng\Versions.props"/> <PropertyGroup> <EnableDefaultItems>false</EnableDefaultItems> <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> @@ -297,7 +298,7 @@ <Import Project="shared\System.Private.CoreLib.Shared.projitems" /> <!-- Use Roslyn Compilers to build --> - <Import Condition="'$(RoslynPropsFile)' != ''" Project="$(RoslynPropsFile)" /> + <Import Project="../roslyn/packages/microsoft.net.compilers.toolset/$(MicrosoftNetCompilersVersion)/build/Microsoft.Net.Compilers.Toolset.props" /> <ItemGroup> <EmbeddedResource LogicalName="System.Private.CoreLib.xml" Include="src\LinkerDescriptor\System.Private.CoreLib.xml"/> |