Skip to content

Commit

Permalink
[msbuild] Fix merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@spouliot
spouliot committed Aug 24, 2018
1 parent 2b74bd8 commit 7a50fb9
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion msbuild/tests/Xamarin.iOS.Tasks.Tests/Xamarin.iOS.Tasks.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@
</Compile>
<Compile Include="ProjectsTests\ProjectWithSpaces.cs" />
<Compile Include="ProjectsTests\ProjectReference.cs" />
<Compile Include="ProjectsTests\ResponseFileArguments.cs" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down

2 comments on commit 7a50fb9

@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.

🔥 Jenkins job (on internal Jenkins) failed in stage 'Test run' 🔥 : org.jenkinsci.plugins.workflow.steps.FlowInterruptedException

✅ Build succeeded
✅ API Diff (from stable)
✅ API Diff (from PR only) (no change)
✅ Generator Diff (only version changes)

@rolfbjarne
Copy link
Member

Choose a reason for hiding this comment

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

Test run timeout is due to https://github.com/xamarin/maccore/issues/952.

Please sign in to comment.