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

github.com/mono/xwt.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandy Armstrong <sandy@xamarin.com>2022-02-04 17:51:25 +0300
committerGitHub <noreply@github.com>2022-02-04 17:51:25 +0300
commit4671fb8adf9f25d65eab95f9c39d23a9083e2f8d (patch)
tree70dcbae7f638d205675e20e93700b78c08b52fe7
parentf4e700578e3d21aa8befca61aa841b2d8db275de (diff)
parentd7e7d9071cbbbbd0c815ea5415808a828419a3df (diff)
Merge pull request #1080 from mono/dev/sandy/remove-xm
Xwt.XamMac: Only reference XM when not a net6 build
-rw-r--r--Xwt.XamMac/Xwt.XamMac.csproj4
1 files changed, 2 insertions, 2 deletions
diff --git a/Xwt.XamMac/Xwt.XamMac.csproj b/Xwt.XamMac/Xwt.XamMac.csproj
index 16b515fd..b790f931 100644
--- a/Xwt.XamMac/Xwt.XamMac.csproj
+++ b/Xwt.XamMac/Xwt.XamMac.csproj
@@ -34,7 +34,7 @@
<DebugSymbols>true</DebugSymbols>
<LangVersion>6</LangVersion>
</PropertyGroup>
- <PropertyGroup>
+ <PropertyGroup Condition="!$(Net6)">
<XamMacPath>\Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\x86_64\full\Xamarin.Mac.dll</XamMacPath>
<XamMacPath Condition="Exists('\Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\64bits\full\Xamarin.Mac.dll')">\Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\64bits\full\Xamarin.Mac.dll</XamMacPath>
<XamMacPath Condition="Exists('$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll')">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll</XamMacPath>
@@ -47,7 +47,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
- <Reference Include="Xamarin.Mac">
+ <Reference Include="Xamarin.Mac" Condition="!$(Net6)">
<HintPath>$(XamMacPath)</HintPath>
</Reference>
</ItemGroup>