Skip to content

Commit

Permalink
Revert System.Runtime.Experimental
Browse files Browse the repository at this point in the history
Revert to the 6.0.0 release of System.Runtime.Experimental and re-apply the workaround until dotnet/runtime#65018 is resolved.
  • Loading branch information
martincostello committed Feb 10, 2022
1 parent c28785b commit 1280378
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
12 changes: 12 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,16 @@
<Using Include="Xunit" />
<Using Include="Xunit.Abstractions" />
</ItemGroup>
<!--
HACK Workaround for https://github.com/dotnet/runtime/issues/65018
-->
<Target Name="RemoveSystemRuntimeFromRefPack"
BeforeTargets="_HandlePackageFileConflicts"
Condition="'@(Reference -> WithMetadataValue('NugetPackageId', 'System.Runtime.Experimental'))' != ''">
<ItemGroup>
<Reference Remove="@(Reference)"
Condition="$([System.String]::Copy(%(Reference.Identity)).Contains('System.Runtime.dll')) and
'%(Reference.NuGetPackageId)' == 'Microsoft.NETCore.App.Ref'" />
</ItemGroup>
</Target>
</Project>
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="4.5.3" />
<PackageVersion Include="Shouldly" Version="4.0.3" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.376" />
<PackageVersion Include="System.Runtime.Experimental" Version="6.0.2-mauipre.1.22054.8" />
<PackageVersion Include="System.Runtime.Experimental" Version="6.0.0" />
<PackageVersion Include="xunit" Version="2.4.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
Expand Down

0 comments on commit 1280378

Please sign in to comment.