Skip to content

Commit

Permalink
[msbuild] Enable nuget package conflict resolution (#4945)
Browse files Browse the repository at this point in the history 
Fixes mono/mono#10602 .

From the issue:
```
We need to enable this to support the system assemblies conflict
resolution which we now rely on for any new packages to enhance
developers experience and get us out of dependency on specific package
versions.
```
  • Loading branch information
@radical @spouliot
radical authored and spouliot committed Oct 11, 2018
1 parent 6f2ebed commit 73fbb53
Show file tree
Hide file tree
Showing 21 changed files with 64 additions and 0 deletions.
3 changes: 3 additions & 0 deletions msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.AppExtension.CSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ Copyright (C) 2014 Xamarin. All rights reserved.
<!-- This must be set before importing Microsoft.CSharp.targets -->
<!-- See Xamarin.iOS.AppExtension.CSharp.targets for a detailed explanation of this variable -->
<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)' == ''">true</CopyNuGetImplementations>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.CSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ Copyright (C) 2014 Xamarin. All rights reserved.
<TargetFrameworkVersion Condition="'$(TargetFrameworkIdentifier)' == '' And '$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>

<DefineConstants>__UNIFIED__;__MACOS__;$(DefineConstants)</DefineConstants>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.FSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt>
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb</_DebugFileExt>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<Import Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')"
Expand Down
5 changes: 5 additions & 0 deletions msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.CSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
</Otherwise>
</Choose>

<PropertyGroup>
<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.ObjCBinding.CSharp.props"/>
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.CSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
<DefineConstants Condition="!$(_IsUnifiedDefined)">__UNIFIED__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsMobileDefined)">__MOBILE__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsTVOSDefined)">__TVOS__;$(DefineConstants)</DefineConstants>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.Common.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.

<!-- See Xamarin.iOS.AppExtension.CSharp.targets for a detailed explanation of this variable -->
<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)' == ''">true</CopyNuGetImplementations>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)Xamarin.TVOS.Common.targets" />
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.AppExtension.FSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt>
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb</_DebugFileExt>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<Import Project="Xamarin.TVOS.AppExtension.Common.targets" />
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.CSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
<DefineConstants Condition="!$(_IsUnifiedDefined)">__UNIFIED__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsMobileDefined)">__MOBILE__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsTVOSDefined)">__TVOS__;$(DefineConstants)</DefineConstants>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS.FSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt>
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb</_DebugFileExt>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<!-- xbuild searches multiple MSBuildExtensionsPath32, but only in the Import element so we can't determine this with a variable -->
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.CSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
<DefineConstants Condition="!$(_IsUnifiedDefined)">__UNIFIED__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsMobileDefined)">__MOBILE__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsWATCHOSDefined)">__WATCHOS__;$(DefineConstants)</DefineConstants>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="Xamarin.WatchOS.App.Common.targets" />
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.FSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt>
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb</_DebugFileExt>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<!-- xbuild searches multiple MSBuildExtensionsPath32, but only in the Import element so we can't determine this with a variable -->
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.CSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
<DefineConstants Condition="!$(_IsUnifiedDefined)">__UNIFIED__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsMobileDefined)">__MOBILE__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsWATCHOSDefined)">__WATCHOS__;$(DefineConstants)</DefineConstants>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="Xamarin.WatchOS.AppExtension.Common.targets" />
Expand Down
2 changes: 2 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
<!-- See Xamarin.iOS.AppExtension.CSharp.targets for a detailed explanation of this variable -->
<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)' == ''">true</CopyNuGetImplementations>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
<UseFakeWatchOS4_3Sdk Condition="'$(UseFakeWatchOS4_3Sdk)' == ''">True</UseFakeWatchOS4_3Sdk>
</PropertyGroup>

Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.FSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt>
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb</_DebugFileExt>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<!-- xbuild searches multiple MSBuildExtensionsPath32, but only in the Import element so we can't determine this with a variable -->
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.CSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
<DefineConstants Condition="!$(_IsUnifiedDefined)">__UNIFIED__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsMobileDefined)">__MOBILE__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsWATCHOSDefined)">__WATCHOS__;$(DefineConstants)</DefineConstants>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="Xamarin.WatchOS.Common.targets" />
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.FSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt>
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb</_DebugFileExt>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>
<Import Project="Xamarin.WatchOS.Common.targets" />

Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.CSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
<DefineConstants Condition="!$(_IsUnifiedDefined)">__UNIFIED__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsMobileDefined)">__MOBILE__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsIOSDefined)">__IOS__;$(DefineConstants)</DefineConstants>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="Xamarin.iOS.AppExtension.Common.targets" />
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.FSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt>
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb</_DebugFileExt>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<Import Project="Xamarin.iOS.AppExtension.Common.targets" />
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.CSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
<DefineConstants Condition="!$(_IsUnifiedDefined)">__UNIFIED__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsMobileDefined)">__MOBILE__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsIOSDefined)">__IOS__;$(DefineConstants)</DefineConstants>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="Xamarin.iOS.Common.targets" />
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.FSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
remove this -->
<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt>
<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb</_DebugFileExt>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>

<!-- xbuild searches multiple MSBuildExtensionsPath32, but only in the Import element so we can't determine this with a variable -->
Expand Down
3 changes: 3 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.CSharp.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
<DefineConstants Condition="!$(_IsUnifiedDefined)">__UNIFIED__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsMobileDefined)">__MOBILE__;$(DefineConstants)</DefineConstants>
<DefineConstants Condition="!$(_IsIOSDefined)">__IOS__;$(DefineConstants)</DefineConstants>

<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="Xamarin.iOS.WatchApp.Common.targets" />
Expand Down

1 comment on commit 73fbb53

@xamarin-release-manager
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ Build was (probably) aborted

🔥 Jenkins job (on internal Jenkins) failed in stage(s) 'Test run' 🔥 : hudson.AbortException: script returned exit code 2

✅ Build succeeded
✅ API Diff (from stable)
ℹ️ API Diff (from PR only) (please review changes)
✅ Generator Diff (no change)
🔥 Test run failed 🔥

Test results

2 tests failed, 0 tests skipped, 223 tests passed.

Failed tests

  • apitest/Mac Classic/All: TimedOut (Execution timed out after 1200 seconds.)
  • monotouch-test/watchOS - simulator/Debug: Crashed

Please sign in to comment.