Remove packagerefs. Leads to unintended problems (see discussion xama…

…rin/md-addins#3946) (#38)
xamarin · Dec 13, 2018 · d1d3fa4 · d1d3fa4
1 parent 179f720
commit d1d3fa4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/Xamarin.MacDev/Xamarin.MacDev.csproj b/Xamarin.MacDev/Xamarin.MacDev.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" Condition="Exists('$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')"/>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -32,12 +33,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MicroBuild.Core">
-      <Version>0.3.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
   <ItemGroup>
     <FilesToSign Include="$(OutDir)\$(AssemblyName).dll">
       <Authenticode>Microsoft</Authenticode>
@@ -85,4 +80,5 @@
     <Compile Include="XamMacSdk.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets" Condition="Exists('$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')"/>
 </Project>
diff --git a/Xamarin.MacDev/Xamarin.iOSDev.csproj b/Xamarin.MacDev/Xamarin.iOSDev.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" Condition="Exists('$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')"/>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -31,13 +32,6 @@
     <ConsolePause>false</ConsolePause>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="MicroBuild.Core">
-      <Version>0.3.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
   <ItemGroup>
     <FilesToSign Include="$(OutDir)\$(AssemblyName).dll">
       <Authenticode>Microsoft</Authenticode>
@@ -85,4 +79,5 @@
     <Compile Include="XamMacSdk.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets" Condition="Exists('$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')"/>
 </Project>