Skip to content

Commit

Permalink
Workaround for dotnet/cli#10528 - fix NU1605 error when Maestro updat…
Browse files Browse the repository at this point in the history
…es corefx dependencies (#1021)
  • Loading branch information
natemcmaster authored Jan 30, 2019
1 parent d2b1ad3 commit bab09cd
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 0 deletions.
1 change: 1 addition & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@
<Import Project="eng\targets\Packaging.targets" Condition=" '$(MSBuildProjectExtension)' == '.csproj' " />
<Import Project="eng\targets\ResolveReferences.targets" Condition=" '$(DisableReferenceRestrictions)' != 'true' AND '$(MSBuildProjectExtension)' == '.csproj' " />
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Import Project="eng\Workarounds.AfterArcade.targets" />
</Project>
4 changes: 4 additions & 0 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>044fa99d22e576fcfaf63f09ee9bba821855dddb</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview.19073.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0000</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 4 additions & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview.19073.11</SystemSecurityCryptographyXmlPackageVersion>
<SystemTextEncodingsWebPackageVersion>4.6.0-preview.19073.11</SystemTextEncodingsWebPackageVersion>
</PropertyGroup>
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
<PropertyGroup>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.19073.11</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup>
<!-- Stable dependencies which are not expected to update via automation -->
<PropertyGroup>
<SystemMemoryPackageVersion>4.5.2</SystemMemoryPackageVersion>
Expand Down
6 changes: 6 additions & 0 deletions eng/Workarounds.AfterArcade.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project>
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
<PropertyGroup>
<BundledNETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
</PropertyGroup>
</Project>

0 comments on commit bab09cd

Please sign in to comment.