diff options
| author | Matt Ward <matt.ward@microsoft.com> | 2022-05-11 19:32:37 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@microsoft.com> | 2022-05-11 19:32:37 +0300 |
| commit | f99c2aa2e75333169cdbedd9b4c1358e9939ed7d (patch) | |
| tree | 5e32403c5fe552852f59bdac29d874e01f4fbeb8 | |
| parent | df9c66b50912c59227e39c181b825db14f102a12 (diff) | |
Support building with .NET 7dev/mrward/building-with-net7
Change the build imports to not be net6 specific.
| -rw-r--r-- | Directory.Build.props | 12 | ||||
| -rw-r--r-- | Xwt.XamMac/Xwt.XamMac.csproj | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index a4dfa642..cc3592b8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,19 +1,19 @@ <Project> + <Import Project="$(MSBuildThisFileDirectory)..\..\msbuild\NetCore.props" Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\NetCore.props')" /> <PropertyGroup> <InMonoDevelopTree>False</InMonoDevelopTree> - <Net6>False</Net6> + <NetCore>False</NetCore> <InMonoDevelopTree Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\MonoDevelop.AfterCommon.props')">True</InMonoDevelopTree> - <Net6 Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\Net6.props')">True</Net6> + <NetCore Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\NetCore.props')">True</NetCore> <DotNetFrameworkTarget>net461</DotNetFrameworkTarget> <DotNetCoreTarget>netstandard2.0</DotNetCoreTarget> - <MacTargetFramework Condition="!$(Net6)">$(DotNetFrameworkTarget)</MacTargetFramework> - <MacTargetFramework Condition="$(Net6)">net6.0-macos</MacTargetFramework> + <MacTargetFramework Condition="!$(NetCore)">$(DotNetFrameworkTarget)</MacTargetFramework> - <TargetFramework Condition="!$(Net6)">$(DotNetFrameworkTarget)</TargetFramework> - <TargetFramework Condition="$(Net6)">$(DotNetCoreTarget)</TargetFramework> + <TargetFramework Condition="!$(NetCore)">$(DotNetFrameworkTarget)</TargetFramework> + <TargetFramework Condition="$(NetCore)">$(DotNetCoreTarget)</TargetFramework> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> </PropertyGroup> diff --git a/Xwt.XamMac/Xwt.XamMac.csproj b/Xwt.XamMac/Xwt.XamMac.csproj index c170efe0..d2c1aaf6 100644 --- a/Xwt.XamMac/Xwt.XamMac.csproj +++ b/Xwt.XamMac/Xwt.XamMac.csproj @@ -39,7 +39,7 @@ <AllowUnsafeBlocks>True</AllowUnsafeBlocks> <DebugSymbols>true</DebugSymbols> </PropertyGroup> - <PropertyGroup Condition="!$(Net6)"> + <PropertyGroup Condition="!$(NetCore)"> <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> @@ -52,7 +52,7 @@ <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Drawing" /> - <Reference Include="Xamarin.Mac" Condition="!$(Net6)"> + <Reference Include="Xamarin.Mac" Condition="!$(NetCore)"> <HintPath>$(XamMacPath)</HintPath> </Reference> </ItemGroup> |