Merge pull request dotnet/aspnetcore-tooling#1221 from dotnet-maestro-bot/merge/release/3.1-preview1-to-release/3.1
[automated] Merge branch 'release/3.1-preview1' => 'release/3.1'\n\nCommit migrated from b19a3f70a7
This commit is contained in:
commit
abef940002
|
|
@ -111,12 +111,6 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||||
<UseSharedCompilation>true</UseSharedCompilation>
|
<UseSharedCompilation>true</UseSharedCompilation>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp' OR '$(TargetFrameworkVersion)' != 'v3.0') AND
|
|
||||||
('$(TargetFrameworkIdentifier)' != '.NETStandard' OR '$(TargetFrameworkVersion)' != 'v2.1')">
|
|
||||||
<MaxSupportedLangVersion Condition="'$(MaxSupportedLangVersion)' == ''">7.3</MaxSupportedLangVersion>
|
|
||||||
<LangVersion Condition="'$(LangVersion)' == ''">$(MaxSupportedLangVersion)</LangVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<Csc
|
<Csc
|
||||||
AdditionalLibPaths="$(AdditionalLibPaths)"
|
AdditionalLibPaths="$(AdditionalLibPaths)"
|
||||||
AddModules="@(AddModules)"
|
AddModules="@(AddModules)"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue