Skip to content

Commit d1d3fa4

Browse files
cadsitjstedfast
authored andcommitted
Remove packagerefs. Leads to unintended problems (see discussion xamarin/md-addins#3946) (#38)
1 parent 179f720 commit d1d3fa4

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

Xamarin.MacDev/Xamarin.MacDev.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" Condition="Exists('$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')"/>
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -32,12 +33,6 @@
3233
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3334
</PropertyGroup>
3435
<ItemGroup>
35-
<PackageReference Include="MicroBuild.Core">
36-
<Version>0.3.0</Version>
37-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
38-
<PrivateAssets>all</PrivateAssets>
39-
</PackageReference>
40-
</ItemGroup>
4136
<ItemGroup>
4237
<FilesToSign Include="$(OutDir)\$(AssemblyName).dll">
4338
<Authenticode>Microsoft</Authenticode>
@@ -85,4 +80,5 @@
8580
<Compile Include="XamMacSdk.cs" />
8681
</ItemGroup>
8782
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
83+
<Import Project="$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets" Condition="Exists('$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')"/>
8884
</Project>

Xamarin.MacDev/Xamarin.iOSDev.csproj

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" Condition="Exists('$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')"/>
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -31,13 +32,6 @@
3132
<ConsolePause>false</ConsolePause>
3233
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3334
</PropertyGroup>
34-
<ItemGroup>
35-
<PackageReference Include="MicroBuild.Core">
36-
<Version>0.3.0</Version>
37-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
38-
<PrivateAssets>all</PrivateAssets>
39-
</PackageReference>
40-
</ItemGroup>
4135
<ItemGroup>
4236
<FilesToSign Include="$(OutDir)\$(AssemblyName).dll">
4337
<Authenticode>Microsoft</Authenticode>
@@ -85,4 +79,5 @@
8579
<Compile Include="XamMacSdk.cs" />
8680
</ItemGroup>
8781
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
82+
<Import Project="$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets" Condition="Exists('$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')"/>
8883
</Project>

0 commit comments

Comments
 (0)