[build] Update to netstandard2 and/or net472

2 files changed, 22 insertions, 128 deletions

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>
+