Skip to content

Commit c055fa8

Browse files
authored
[Microsoft.Android.Build] Bump to MSBuild 16.10.0 (#125)
Related: dotnet/android#6014 Drops the OS specific MSBuild NuGet and system references and instead uses MSBuild 16.10.0 NuGet packages. This introduces an issue in our usage of `Microsoft.Build.Construction.ProjectRootElement.Create` in xamarin/xamarin-android on macOS, however we can work around it there.
1 parent 49936d6 commit c055fa8

File tree

1 file changed

+2
-31
lines changed

1 file changed

+2
-31
lines changed

src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,49 +4,20 @@
44
<Project>
55
<!--Import this file in projects needing to reference Microsoft.Build.*.dll -->
66
<PropertyGroup>
7-
<MSBuildReferenceVersion>15.1.0.0</MSBuildReferenceVersion>
8-
<MSBuildPackageReferenceVersion>16.5</MSBuildPackageReferenceVersion>
7+
<MSBuildPackageReferenceVersion>16.10.0</MSBuildPackageReferenceVersion>
98
<LibZipSharpVersion>2.0.0-alpha6</LibZipSharpVersion>
109
<MonoUnixVersion>7.0.0-alpha8.21302.6</MonoUnixVersion>
1110
</PropertyGroup>
1211

13-
<ItemGroup Condition="$([MSBuild]::IsOSPlatform('windows'))" >
14-
<!-- Only use these on Windows as it causes problems with running unit tests in the IDE's on MacOS -->
12+
<ItemGroup>
1513
<PackageReference Include="Microsoft.Build" Version="$(MSBuildPackageReferenceVersion)" />
1614
<PackageReference Include="Microsoft.Build.Framework" Version="$(MSBuildPackageReferenceVersion)" />
1715
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MSBuildPackageReferenceVersion)" />
1816
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageReferenceVersion)" />
19-
</ItemGroup>
20-
21-
<ItemGroup Condition="!$([MSBuild]::IsOSPlatform('windows'))">
22-
<Reference Include="Microsoft.Build, Version=$(MSBuildReferenceVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" >
23-
<SpecificVersion>True</SpecificVersion>
24-
<HintPath>$(MSBuildToolsPath)\Microsoft.Build.dll</HintPath>
25-
</Reference>
26-
<Reference Include="Microsoft.Build.Framework, Version=$(MSBuildReferenceVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" >
27-
<SpecificVersion>True</SpecificVersion>
28-
<HintPath>$(MSBuildToolsPath)\Microsoft.Build.Framework.dll</HintPath>
29-
</Reference>
30-
<Reference Include="Microsoft.Build.Tasks.Core, Version=$(MSBuildReferenceVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" >
31-
<SpecificVersion>True</SpecificVersion>
32-
<HintPath>$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll</HintPath>
33-
</Reference>
34-
<Reference Include="Microsoft.Build.Utilities.Core, Version=$(MSBuildReferenceVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" >
35-
<SpecificVersion>True</SpecificVersion>
36-
<HintPath>$(MSBuildToolsPath)\Microsoft.Build.Utilities.Core.dll</HintPath>
37-
</Reference>
38-
</ItemGroup>
39-
40-
<ItemGroup>
4117
<PackageReference Include="K4os.Compression.LZ4" Version="1.1.11" />
4218
<PackageReference Include="Xamarin.Build.AsyncTask" Version="0.3.4" GeneratePathProperty="true" />
4319
<PackageReference Include="Xamarin.LibZipSharp" Version="$(LibZipSharpVersion)" GeneratePathProperty="true" />
4420
<PackageReference Include="Mono.Unix" Version="$(MonoUnixVersion)" GeneratePathProperty="true" />
45-
<PackageReference Include="System.Buffers" Version="4.5.1" />
46-
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
47-
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
48-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
49-
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
5021
</ItemGroup>
5122

5223
</Project>

0 commit comments

Comments
 (0)