Skip to content

Commit

Permalink
Revert temporary workarounds
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelSimons committed Apr 16, 2021
1 parent a0b4457 commit 12e5caf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
7 changes: 0 additions & 7 deletions eng/Build.props

This file was deleted.

5 changes: 2 additions & 3 deletions eng/targets/Imports.targets
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,14 @@
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.CompareVersions" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SingleError" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />

<!-- The SourceBuild condition is temporary as the Arcade intermediate package contains a reference package which breaks this task -->
<Target Name="_CheckRequiredMSBuildVersion" Condition="'$(DotNetBuildFromSource)' != 'true'" BeforeTargets="BeforeBuild">
<Target Name="_CheckRequiredMSBuildVersion" BeforeTargets="BeforeBuild">
<CompareVersions Left="$(MSBuildVersion)" Right="$(MinimumMSBuildVersion)">
<Output TaskParameter="Result" PropertyName="_VersionComparisonResult"/>
</CompareVersions>

<SingleError Text="The msbuild version $(MSBuildVersion) is below the minimum required version $(MinimumMSBuildVersion)"
Condition="$(_VersionComparisonResult) &lt; 0"/>
</Target>
</Target>

<!--
This target is used to copy referenced projects to a sub-directory vs. the direct output
Expand Down

0 comments on commit 12e5caf

Please sign in to comment.