Merge pull request #570 from xamarin/update-to-ns2

[build] Update to netstandard2 and/or net472

11 files changed, 41 insertions, 316 deletions

diff --git a/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj b/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj
index b936acb..bd08d7e 100644
--- a/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj
+++ b/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj
@@ -9,7 +9,7 @@
     <RootNamespace>Xamarin.PropertyEditing.Mac.Standalone</RootNamespace>

     <AssemblyName>Xamarin.PropertyEditing.Mac.Standalone</AssemblyName>

     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>

-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>

     <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
index d39da81..65bcdba 100644
--- a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
+++ b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>

     <RootNamespace>Xamarin.PropertyEditing.Mac</RootNamespace>

     <AssemblyName>Xamarin.PropertyEditing.Mac</AssemblyName>

-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>

     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>

     <TargetFrameworkProfile />

   </PropertyGroup>

diff --git a/Xamarin.PropertyEditing.Tests/Properties/AssemblyInfo.cs b/Xamarin.PropertyEditing.Tests/Properties/AssemblyInfo.cs
index 20ed5dd..2dde9db 100644
--- a/Xamarin.PropertyEditing.Tests/Properties/AssemblyInfo.cs
+++ b/Xamarin.PropertyEditing.Tests/Properties/AssemblyInfo.cs
@@ -5,11 +5,7 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Xamarin.PropertyEditing.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xamarin.PropertyEditing.Tests")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -22,15 +18,3 @@ using System.Runtime.InteropServices;
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("84101d04-9ce4-4ce7-916e-21f86ee96898")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj b/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj
index 683293f..1b1316a 100644
--- a/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj
+++ b/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj
@@ -1,50 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{84101D04-9CE4-4CE7-916E-21F86EE96898}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xamarin.PropertyEditing.Tests</RootNamespace>
-    <AssemblyName>Xamarin.PropertyEditing.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>net472</TargetFramework>
     <RestorePackagesPath>$(MSBuildThisFileDirectory)packages\</RestorePackagesPath>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Build with strong naming if built as part of some Xamarin VSIX, normally referencing this project as a git submodule under external/Xamarin.PropertyEditing -->
+
   <PropertyGroup Condition="Exists('..\..\..\xamarin.snk')">
     <AssemblyOriginatorKeyFile>..\..\..\xamarin.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <DefineConstants>$(DefineConstants);STRONG_NAMED</DefineConstants>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Moq" Version="4.5.30.0" />
-    <PackageReference Include="NUnit" Version="3.7.1" />
-    <PackageReference Include="NUnit.ConsoleRunner" Version="3.6.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
-  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -56,84 +22,28 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="AddValueConverterViewModelTests.cs" />
-    <Compile Include="AsyncValueTests.cs" />
-    <Compile Include="AsyncWorkQueueTests.cs" />
-    <Compile Include="BoolViewModelTests.cs" />
-    <Compile Include="BrushPropertyViewModelTests.cs" />
-    <Compile Include="BytePropertyViewModelTests.cs" />
-    <Compile Include="CollectionPropertyViewModelTests.cs" />
-    <Compile Include="CreateBindingViewModelTests.cs" />
-    <Compile Include="CreateResourceViewModelTests.cs" />
-    <Compile Include="CreateVariantViewModelTests.cs" />
-    <Compile Include="MaterialDesignColorViewModelTests.cs" />
-    <Compile Include="CombinablePredefinedViewModelTests.cs" />
-    <Compile Include="MockBindingEditor.cs" />
-    <Compile Include="MockBindingProvider.cs" />
-    <Compile Include="MockControls\MockResourceProvider.cs" />
-    <Compile Include="MockPropertyInfo\MockBrushPropertyInfo.cs" />
-    <Compile Include="MockValueConverter.cs" />
-    <Compile Include="NumericTests.cs" />
-    <Compile Include="NumericViewModelTests.cs" />
-    <Compile Include="OrderedDictionaryTests.cs" />
-    <Compile Include="PanelGroupViewModelTests.cs" />
-    <Compile Include="ResourceSelectorViewModelTests.cs" />
-    <Compile Include="ResourceTests.cs" />
-    <Compile Include="SimpleCollectionViewTests.cs" />
-    <Compile Include="CommonColorTests.cs" />
-    <Compile Include="Helpers.cs" />
-    <Compile Include="IPropertyConverter.cs" />
-    <Compile Include="MockControls\MockControl.cs" />
-    <Compile Include="MockControls\MockSampleControl.cs" />
-    <Compile Include="MockControls\MockWpfButton.cs" />
-    <Compile Include="MockControls\MockWpfControl.cs" />
-    <Compile Include="MockEditorProvider.cs" />
-    <Compile Include="MockPropertyInfo\MockEventInfo.cs" />
-    <Compile Include="MockPropertyInfo\MockPropertyCategories.cs" />
-    <Compile Include="MockPropertyInfo\MockPropertyInfo.cs" />
-    <Compile Include="MockPropertyInfo\MockEnumPropertyInfo.cs" />
-    <Compile Include="MockPropertyProviderTests.cs" />
-    <Compile Include="MultiAvailabilityConstraintTests.cs" />
-    <Compile Include="ObjectPropertyViewModelTests.cs" />
-    <Compile Include="ObservableLookupTests.cs" />
-    <Compile Include="PointViewModelTests.cs" />
-    <Compile Include="PropertyGroupViewModelTests.cs" />
-    <Compile Include="RadialGradientBrushPropertyViewModelTests.cs" />
-    <Compile Include="LinearGradientBrushPropertyViewModelTests.cs" />
-    <Compile Include="ImageBrushPropertyViewModelTests.cs" />
-    <Compile Include="SizeViewModelTests.cs" />
-    <Compile Include="SolidBrushPropertyViewModelTests.cs" />
-    <Compile Include="ConstrainedPropertyViewModelTests.cs" />
-    <Compile Include="EventViewModelTests.cs" />
-    <Compile Include="FloatingPropertyViewModelTests.cs" />
-    <Compile Include="IntegerPropertyViewModelTests.cs" />
-    <Compile Include="MockObjectEditor.cs" />
-    <Compile Include="PanelViewModelTests.cs" />
-    <Compile Include="PredefinedValuesViewModelTests.cs" />
-    <Compile Include="PropertiesViewModelTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyViewModelTests.cs" />
-    <Compile Include="ReflectionPropertyProviderTests.cs" />
-    <Compile Include="StringViewModelTests.cs" />
-    <Compile Include="TestContext.cs" />
-    <Compile Include="ThicknessPropertyViewModelTests.cs" />
-    <Compile Include="ValueInfoTests.cs" />
-    <Compile Include="MockControls\MockNSControl.cs" />
-    <Compile Include="MockControls\MockNSButton.cs" />
-    <Compile Include="RatioViewModelTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Manual\BrushEditor.md" />
+    <PackageReference Include="Moq" Version="4.10.1" />
+    <PackageReference Include="NUnit" Version="3.11.0" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.9.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj">
-      <Project>{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}</Project>
-      <Name>Xamarin.PropertyEditing</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <CustomToolNamespace>Xamarin.PropertyEditing</CustomToolNamespace>
+      <Generator>MSBuild:GenerateStringResources</Generator>
+      <Public>true</Public>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Properties\Resources.*.resx">
+      <Visible>false</Visible>
+    </EmbeddedResource>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
+
diff --git a/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj b/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj
index 4597c02..5b57579 100644
--- a/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj
+++ b/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xamarin.PropertyEditing.Windows.Standalone</RootNamespace>
     <AssemblyName>Xamarin.PropertyEditing.Windows.Standalone</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
diff --git a/Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj b/Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj
index bef6888..003a835 100644
--- a/Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj
+++ b/Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xamarin.PropertyEditing.Windows</RootNamespace>
     <AssemblyName>Xamarin.PropertyEditing.Windows</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/Xamarin.PropertyEditing/Properties/AssemblyInfo.cs b/Xamarin.PropertyEditing/Properties/AssemblyInfo.cs
index 917d438..d259d18 100644
--- a/Xamarin.PropertyEditing/Properties/AssemblyInfo.cs
+++ b/Xamarin.PropertyEditing/Properties/AssemblyInfo.cs
@@ -2,7 +2,6 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle ("Xamarin.PropertyEditing")]
 [assembly: ComVisible (false)]
 [assembly: Guid ("a0b6fe73-d046-4e1c-ba9d-f20683889c5a")]
 
diff --git a/Xamarin.PropertyEditing/Properties/GlobalAssemblyInfo.cs b/Xamarin.PropertyEditing/Properties/GlobalAssemblyInfo.cs
index 6917499..b4f0d02 100644
--- a/Xamarin.PropertyEditing/Properties/GlobalAssemblyInfo.cs
+++ b/Xamarin.PropertyEditing/Properties/GlobalAssemblyInfo.cs
@@ -1,12 +1,6 @@
 using System.Reflection;
 
 [assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("Microsoft Corporation")]
-[assembly: AssemblyProduct ("Xamarin.PropertyEditing")]
 [assembly: AssemblyCopyright ("Copyright © 2017 Microsoft Corporation")]
 [assembly: AssemblyTrademark ("")]
 [assembly: AssemblyCulture ("")]
-
-[assembly: AssemblyVersion ("1.0.0.0")]
-[assembly: AssemblyFileVersion ("1.0.0.0")]
\ No newline at end of file
diff --git a/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj b/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj
index 330eeeb..e56a9c8 100644
--- a/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj
+++ b/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj
@@ -1,188 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xamarin.PropertyEditing</RootNamespace>
-    <AssemblyName>Xamarin.PropertyEditing</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Build with strong naming if built as part of some Xamarin VSIX, normally referencing this project as a git submodule under external/Xamarin.PropertyEditing -->
+
   <PropertyGroup Condition="Exists('..\..\..\xamarin.snk')">
     <AssemblyOriginatorKeyFile>..\..\..\xamarin.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <DefineConstants>$(DefineConstants);STRONG_NAMED</DefineConstants>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <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>
-  <ItemGroup>
-    <Compile Include="AssignableTypesResult.cs" />
-    <Compile Include="AsyncValue.cs" />
-    <Compile Include="AsyncWorkQueue.cs" />
-    <Compile Include="BidirectionalDictionary.cs" />
-    <Compile Include="CategoryComparer.cs" />
-    <Compile Include="Common\CommonValueConverter.cs" />
-    <Compile Include="Drawing\CommonAlignment.cs" />
-    <Compile Include="Drawing\CommonBrush.cs" />
-    <Compile Include="Drawing\CommonBrushMappingMode.cs" />
-    <Compile Include="Drawing\CommonBrushType.cs" />
-    <Compile Include="Drawing\CommonColor.cs" />
-    <Compile Include="Drawing\CommonColorInterpolationMode.cs" />
-    <Compile Include="Drawing\CommonColorToCommonBrushConverter.cs" />
-    <Compile Include="Drawing\CommonGradientBrush.cs" />
-    <Compile Include="Drawing\CommonGradientSpreadMethod.cs" />
-    <Compile Include="Drawing\CommonGradientStop.cs" />
-    <Compile Include="Drawing\CommonLinearGradientBrush.cs" />
-    <Compile Include="Drawing\CommonPoint.cs" />
-    <Compile Include="Drawing\CommonRadialGradientBrush.cs" />
-    <Compile Include="Drawing\CommonRectangle.cs" />
-    <Compile Include="Drawing\CommonSize.cs" />
-    <Compile Include="Drawing\CommonSolidBrush.cs" />
-    <Compile Include="Drawing\CommonStretch.cs" />
-    <Compile Include="Drawing\CommonThickness.cs" />
-    <Compile Include="Drawing\CommonTileBrush.cs" />
-    <Compile Include="Drawing\CommonTileMode.cs" />
-    <Compile Include="Drawing\CommonImageBrush.cs" />
-    <Compile Include="IAssemblyInfo.cs" />
-    <Compile Include="IAvailabilityConstraint.cs" />
-    <Compile Include="IBindingProvider.cs" />
-    <Compile Include="ICanNavigateToSource.cs" />
-    <Compile Include="IClampedPropertyInfo.cs" />
-    <Compile Include="IColorSpaced.cs" />
-    <Compile Include="ICoerce.cs" />
-    <Compile Include="ICompleteValues.cs" />
-    <Compile Include="IEditorProvider.cs" />
-    <Compile Include="IHaveInputModes.cs" />
-    <Compile Include="IObjectEventEditor.cs" />
-    <Compile Include="IEventInfo.cs" />
-    <Compile Include="INameableObject.cs" />
-    <Compile Include="IObjectEditor.cs" />
-    <Compile Include="IHavePredefinedValues.cs" />
-    <Compile Include="IPropertyInfo.cs" />
-    <Compile Include="IProvidePath.cs" />
-    <Compile Include="IResourceProvider.cs" />
-    <Compile Include="ISelfConstrainedPropertyInfo.cs" />
-    <Compile Include="IIconProvider.cs" />
-    <Compile Include="ITypeInfo.cs" />
-    <Compile Include="IValidator.cs" />
-    <Compile Include="KnownProperty.cs" />
-    <Compile Include="MultiAvailabilityConstraint.cs" />
-    <Compile Include="NotifyingObject.cs" />
-    <Compile Include="Numeric.cs" />
-    <Compile Include="ObservableCollectionEx.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\GlobalAssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="PropertyBinding.cs" />
-    <Compile Include="PropertyVariationOption.cs" />
-    <Compile Include="PropertyVariation.cs" />
-    <Compile Include="Reflection\ReflectionEditorProvider.cs" />
-    <Compile Include="Reflection\ReflectionEnumPropertyInfo.cs" />
-    <Compile Include="Reflection\ReflectionEventInfo.cs" />
-    <Compile Include="Reflection\ReflectionObjectEditor.cs" />
-    <Compile Include="Reflection\ReflectionPropertyInfo.cs" />
-    <Compile Include="Resource.cs" />
-    <Compile Include="ResourceSource.cs" />
-    <Compile Include="TargetPlatform.cs" />
-    <Compile Include="ValueInfo.cs" />
-    <Compile Include="ValueSource.cs" />
-    <Compile Include="ViewModels\AddValueConverterViewModel.cs" />
-    <Compile Include="ViewModels\ArrangeModeViewModel.cs" />
-    <Compile Include="ViewModels\BrushPropertyViewModel.cs" />
-    <Compile Include="ViewModels\CollectionPropertyViewModel.cs" />
-    <Compile Include="ViewModels\CreateBindingRequestedEventArgs.cs" />
-    <Compile Include="ViewModels\CreateBindingViewModel.cs" />
-    <Compile Include="ViewModels\CreateResourceRequestedEventArgs.cs" />
-    <Compile Include="ViewModels\CreateResourceViewModel.cs" />
-    <Compile Include="ViewModels\CreateVariationViewModel.cs" />
-    <Compile Include="ViewModels\MaterialColorScale.cs" />
-    <Compile Include="ViewModels\MaterialDesignColorViewModel.cs" />
-    <Compile Include="ViewModels\CombinablePropertyViewModel.cs" />
-    <Compile Include="ViewModels\PropertyTreeElement.cs" />
-    <Compile Include="ViewModels\ResourceRequestedEventArgs.cs" />
-    <Compile Include="ViewModels\ResourceSelectorViewModel.cs" />
-    <Compile Include="ViewModels\SimpleCollectionView.cs" />
-    <Compile Include="ViewModels\ConstrainedPropertyViewModel.cs" />
-    <Compile Include="ViewModels\EditorViewModel.cs" />
-    <Compile Include="Extensions.cs" />
-    <Compile Include="ViewModels\EventViewModel.cs" />
-    <Compile Include="ViewModels\IFilterable.cs" />
-    <Compile Include="ViewModels\NumericPropertyViewModel.cs" />
-    <Compile Include="ViewModels\ObjectPropertyViewModel.cs" />
-    <Compile Include="ViewModels\ObjectViewModel.cs" />
-    <Compile Include="ViewModels\PanelViewModel.cs" />
-    <Compile Include="ViewModels\PointPropertyViewModel.cs" />
-    <Compile Include="ViewModels\PredefinedValuesViewModel.cs" />
-    <Compile Include="ViewModels\PropertiesViewModel.cs" />
-    <Compile Include="ViewModels\PropertyGroupViewModel.cs" />
-    <Compile Include="ViewModels\PropertyViewModel.cs" />
-    <Compile Include="ViewModels\RelayCommand.cs" />
-    <Compile Include="ViewModels\SizePropertyViewModel.cs" />
-    <Compile Include="ViewModels\SolidBrushViewModel.cs" />
-    <Compile Include="ViewModels\StringPropertyViewModel.cs" />
-    <Compile Include="PropertyArrangeMode.cs" />
-    <Compile Include="IGroupingList.cs" />
-    <Compile Include="ObservableLookup.cs" />
-    <Compile Include="IMutableLookup.cs" />
-    <Compile Include="OrderedDictionary.cs" />
-    <Compile Include="Controls\ValidationType.cs" />
-    <Compile Include="Controls\StringConversionExtensions.cs" />
-    <Compile Include="ViewModels\RectanglePropertyViewModel.cs" />
-    <Compile Include="ViewModels\ThicknessPropertyViewModel.cs" />
-    <Compile Include="ViewModels\ObjectTreeElement.cs" />
-    <Compile Include="ViewModels\TypePropertyViewModel.cs" />
-    <Compile Include="ViewModels\TypeSelectorViewModel.cs" />
-    <Compile Include="ViewModels\RatioViewModel.cs" />
-    <Compile Include="Drawing\CommonRatio.cs" />
-    <Compile Include="IReadOnlyOrderedDictionary.cs" />
-    <Compile Include="ViewModels\CreateVariationEventArgs.cs" />
-    <Compile Include="ViewModels\IPropertyValue.cs" />
-    <Compile Include="Common\FilePath.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.*.resx">
+    <EmbeddedResource Update="Properties\Resources.*.resx">
       <Visible>false</Visible>
     </EmbeddedResource>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
diff --git a/bot-provisioning/dependencies.csx b/bot-provisioning/dependencies.csx
index 8d31a1d..78de89c 100644
--- a/bot-provisioning/dependencies.csx
+++ b/bot-provisioning/dependencies.csx
@@ -2,5 +2,6 @@
 
 using static Xamarin.Provisioning.ProvisioningScript;
 
-Item ("https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/xcode10/b40230c09d557991b776de918b047442cd41533f/211/package/xamarin.mac-5.0.0.0.pkg");
+Item ("https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-08/248/fdb26b0a4454f60d20df1ea6c01fd851ffa4084a/MonoFramework-MDK-5.18.1.3.macos10.xamarin.universal.pkg");
+Item ("https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/d16-0/50f7527307faf601c7b7754ac77a839fd5d0c820/26/package/xamarin.mac-5.6.0.25.pkg");
 Item (XreItem.Xcode_10_0_0).XcodeSelect();
diff --git a/build.proj b/build.proj
index 8186618..ebafb7b 100644
--- a/build.proj
+++ b/build.proj
@@ -29,13 +29,11 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<BinDir>bin\Debug\</BinDir>
-		<BinDir Condition=" '$(Release)' ">bin\Release\</BinDir>
 
 		<CommonBuildProperties>$(CommonBuildProperties);Configuration=$(Configuration)</CommonBuildProperties>
 
-		<TestAssemblyDirectory>Xamarin.PropertyEditing.Tests\$(BinDir)\</TestAssemblyDirectory>
-		<TestAssembly>$(TestAssemblyDirectory)Xamarin.PropertyEditing.Tests.dll</TestAssembly>
+		<TestAssemblyBaseDirectory>Xamarin.PropertyEditing.Tests\bin\</TestAssemblyBaseDirectory>
+		<TestAssemblyName>Xamarin.PropertyEditing.Tests.dll</TestAssemblyName>
 
 		<Out Condition="'$(Out)' == ''">out</Out>
 	</PropertyGroup>
@@ -65,8 +63,11 @@
 	</Target>
 
 	<Target Name="Test" DependsOnTargets="TestMac;TestWindows">
+		<ItemGroup>
+			<TestAssembly Include="$(TestAssemblyBaseDirectory)**\$(TestAssemblyName)" />
+		</ItemGroup>
 		<MakeDir Directories="$(Out)" />
-		<Exec Command="$(Mono64) @(NunitConsoleRunner) $(TestAssembly) -result=$(Out)\TestResult.xml" />
+		<Exec Command="$(Mono64) @(NunitConsoleRunner) @(TestAssembly) -result=$(Out)\TestResult.xml" />
 	</Target>
 
 	<Target Name="TestMac" Condition=" '$(IsMac)' ">