diff options
| author | Bret Johnson <bret.johnson@microsoft.com> | 2022-01-14 22:58:01 +0300 |
|---|---|---|
| committer | Bret Johnson <bret.johnson@microsoft.com> | 2022-01-14 22:58:01 +0300 |
| commit | aa8bc4641c18821269ef10117f05e71f7b7110be (patch) | |
| tree | b2d3a3c04953baeb811b419bd9e383935e381437 | |
| parent | e919e936e01e619ae21a33990f5b3a1becf64ffb (diff) | |
Fixup Mac and Tests project build options
| -rw-r--r-- | Directory.Build.props | 6 | ||||
| -rw-r--r-- | Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj | 14 | ||||
| -rw-r--r-- | Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj | 26 |
3 files changed, 17 insertions, 29 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index dfcb57f..138326c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,3 +1,7 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <!-- Deliberately empty so we don't inherit files from whoever submodules this repository --> + <PropertyGroup> + <IsMac>$([MSBuild]::IsOSPlatform('OSX'))</IsMac> + <IsWindows>$([MSBuild]::IsOSPlatform('Windows'))</IsWindows> + <IsLinux>$([MSBuild]::IsOSPlatform('Linux'))</IsLinux> + </PropertyGroup> </Project> diff --git a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj index 13acdb4..42c433b 100644 --- a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj +++ b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj @@ -1,21 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net6.0</TargetFramework> - <XamarinMacAnalyzerMinimumOSVersion>10.12</XamarinMacAnalyzerMinimumOSVersion> + <TargetFramework>net6.0-macos</TargetFramework> + <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion> </PropertyGroup> <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Drawing" /> - <Reference Include="Xamarin.Mac"> - <HintPath Condition="Exists('/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/x86_64/full/Xamarin.Mac.dll')">/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/x86_64/full/Xamarin.Mac.dll</HintPath> - <HintPath 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</HintPath> - </Reference> - </ItemGroup> - - <ItemGroup> <ProjectReference Include="..\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj" /> </ItemGroup> diff --git a/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj b/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj index ef2a41d..78474b4 100644 --- a/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj +++ b/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj @@ -1,28 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> + <PropertyGroup Condition=" $(IsMac) "> + <TargetFramework>net6.0</TargetFramework> + </PropertyGroup> + <PropertyGroup Condition=" $(IsWindows) "> <TargetFramework>net472</TargetFramework> - <RestorePackagesPath>$(MSBuildThisFileDirectory)packages\</RestorePackagesPath> </PropertyGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Drawing" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Xml" /> - </ItemGroup> + <PropertyGroup> + <RestorePackagesPath>$(MSBuildThisFileDirectory)packages\</RestorePackagesPath> + </PropertyGroup> <ItemGroup> <PackageReference Include="Moq" Version="4.10.1" /> <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" /> - <PackageReference Include="NUnit" Version="3.11.0" /> - <PackageReference Include="NUnit.ConsoleRunner" Version="3.9.0" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" /> + <PackageReference Include="NUnit" Version="3.13.2" /> + <PackageReference Include="NUnit.ConsoleRunner" Version="3.13.2" /> + <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" /> </ItemGroup> <ItemGroup> |