diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-08-08 21:22:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-08 21:22:47 +0300 |
| commit | d4f5c8b037bbadcfff89805c72f8ef2d36e59d43 (patch) | |
| tree | 9a8c56c75dc49a930933e48ccfb28168bf31d265 /dir.props | |
| parent | 0fe1582afb59c8e6a89b8631cb2871e36167590e (diff) | |
Update Roslyn compiler to Microsoft.Net.Compilers 2.0.0-beta3 (#1620)
Microsoft.Net.Compilers 2.0.0-beta3 has support for byref locals and returns that will allow us to improve and simplify number of low-level constructs in the runtime.
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 21 |
1 files changed, 4 insertions, 17 deletions
@@ -8,12 +8,6 @@ <OsEnvironment Condition="'$(OsEnvironment)'==''">$(OS)</OsEnvironment> </PropertyGroup> - <!-- Build Tools Versions --> - <PropertyGroup> - <RoslynVersion>1.0.0-rc3-20150510-01</RoslynVersion> - <RoslynPackageName>Microsoft.Net.ToolsetCompilers</RoslynPackageName> - </PropertyGroup> - <!-- Switching to the .NET Core version of the BuildTools tasks seems to break numerous scenarios, such as VS intellisense and resource designer. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks. @@ -151,19 +145,11 @@ <RestorePackages>false</RestorePackages> </PropertyGroup> - <!-- - Set up Roslyn predefines - --> - <PropertyGroup> - <RoslynPackageDir>$(PackagesDir)/$(RoslynPackageName).$(RoslynVersion)/</RoslynPackageDir> - <RoslynPropsFile>$(RoslynPackageDir)build/Microsoft.Net.ToolsetCompilers.props</RoslynPropsFile> - </PropertyGroup> - <!-- Use Roslyn Compilers to build --> <PropertyGroup> <UseSharedCompilation>true</UseSharedCompilation> </PropertyGroup> - + <!-- On Unix we always use a version of Roslyn we restore from NuGet and we have to work around some known issues. --> @@ -206,7 +192,7 @@ <NoExplicitReferenceToStdLib>true</NoExplicitReferenceToStdLib> <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences> <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute> - <LangVersion>6</LangVersion> + <LangVersion>7</LangVersion> </PropertyGroup> <!-- Set up handling of build warnings --> @@ -246,7 +232,8 @@ <SkipTests Condition="'$(SkipTests)'=='' and ('$(OsEnvironment)'=='Windows_NT' and '$(TargetsWindows)'!='true')">true</SkipTests> </PropertyGroup> - <Import Project="$(RoslynPropsFile)" Condition="Exists('$(RoslynPropsFile)')" /> + <!-- Use the latest Roslyn compilers --> + <Import Condition="'$(CompilerPropsAlreadyImported)'!='true' and '$(OsEnvironment)'=='Windows_NT'" Project="$(BuildToolsTaskDir)roslyn/build/Microsoft.Net.Compilers.props" /> <PropertyGroup> <!-- |