[build] Move to packagereferences for our nugets

2 files changed, 7 insertions, 48 deletions

diff --git a/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj b/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj
index 0a0541c..433fb53 100644
--- a/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj
+++ b/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Choose>
-    <When Condition="Exists('..\..\..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props')">
-      <PropertyGroup>
-        <NunitImportPath>..\..\..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props</NunitImportPath>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <NunitImportPath>..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props</NunitImportPath>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <Import Project="$(NunitImportPath)" Condition="Exists($(NunitImportPath))" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -24,8 +11,7 @@
     <AssemblyName>Xamarin.PropertyEditing.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <RestorePackagesPath>$(MSBuildThisFileDirectory)packages\</RestorePackagesPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,14 +37,12 @@
     <DefineConstants>$(DefineConstants);STRONG_NAMED</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <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" />
     <Reference Include="System.Drawing" />
@@ -68,9 +52,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AsyncSynchronizationContext.cs" />
@@ -131,7 +112,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Manual\BrushEditor.md" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj">
@@ -142,12 +122,5 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists($(NunitImportPath))" Text="$([System.String]::Format('$(ErrorText)', $(NunitImportPath)))" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/Xamarin.PropertyEditing.Tests/packages.config b/Xamarin.PropertyEditing.Tests/packages.config
deleted file mode 100644
index 06e0c6b..0000000
--- a/Xamarin.PropertyEditing.Tests/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Castle.Core" version="3.3.3" targetFramework="net452" />
-  <package id="Moq" version="4.5.30" targetFramework="net452" />
-  <package id="NUnit" version="3.7.1" targetFramework="net452" />
-  <package id="NUnit.ConsoleRunner" version="3.6.1" targetFramework="net452" />
-  <package id="NUnit.Extension.NUnitProjectLoader" version="3.5.0" targetFramework="net452" />
-  <package id="NUnit.Extension.NUnitV2Driver" version="3.6.0" targetFramework="net452" />
-  <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.5.0" targetFramework="net452" />
-  <package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net452" />
-  <package id="NUnit.Extension.VSProjectLoader" version="3.5.0" targetFramework="net452" />
-  <package id="NUnit.Runners" version="3.6.1" targetFramework="net452" />
-  <package id="NUnit3TestAdapter" version="3.8.0" targetFramework="net452" />
-</packages>
\ No newline at end of file