Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono-addins.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLluis Sanchez <llsan@microsoft.com>2021-07-15 11:56:33 +0300
committerLluis Sanchez <llsan@microsoft.com>2021-07-15 11:56:33 +0300
commitb175f65f6a82a8165e5ae8729e777dfb869434b9 (patch)
tree9f3aa385c9ba397b4a49c1f7b05742810a88a3ad
parent847c4a1b8c7631528024b8b7e583e31a0289f1ae (diff)
Use .net 6 when building for VSM/.net 6
-rw-r--r--TargetFrameworks.props11
1 files changed, 9 insertions, 2 deletions
diff --git a/TargetFrameworks.props b/TargetFrameworks.props
index 0526e42..6b3528e 100644
--- a/TargetFrameworks.props
+++ b/TargetFrameworks.props
@@ -1,10 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
- <InMonoDevelopTree Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\MonoDevelop.AfterCommon.props')">true</InMonoDevelopTree>
+ <InMonoDevelopTree>False</InMonoDevelopTree>
+ <Net6>False</Net6>
+ <InMonoDevelopTree Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\MonoDevelop.AfterCommon.props')">True</InMonoDevelopTree>
+ <Net6 Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\enable_net6')">True</Net6>
+
<DotNetFrameworkTarget>net461</DotNetFrameworkTarget>
<DotNetCoreTarget>netstandard2.0</DotNetCoreTarget>
- <TargetFrameworks>$(DotNetFrameworkTarget)</TargetFrameworks>
+
+ <TargetFrameworks Condition="!$(Net6)">$(DotNetFrameworkTarget)</TargetFrameworks>
+ <TargetFrameworks Condition="$(Net6)">$(DotNetCoreTarget)</TargetFrameworks>
+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
</Project>