Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ This file should be imported by eng/Versions.props
<SystemTextEncodingCodePagesPackageVersion>10.0.0-rc.2.25416.109</SystemTextEncodingCodePagesPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.2.25416.109</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.2.25416.109</SystemWindowsExtensionsPackageVersion>
<!-- dotnet/core-setup dependencies -->
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
Copy link
Member

Choose a reason for hiding this comment

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

Removing this would break the bundled versions generation I think. with the property empty, the build will pass, but it will write a blank and then later use that as a version number at compile time when building a project that targets 2.1

Copy link
Member Author

Choose a reason for hiding this comment

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

The property won't be empty since we set it here:

<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>

Copy link
Member

Choose a reason for hiding this comment

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

doh, I forgot we split out the props recently. nvm

<!-- microsoft/testfx dependencies -->
<MicrosoftTestingPlatformPackageVersion>1.9.0-preview.25427.3</MicrosoftTestingPlatformPackageVersion>
<MSTestPackageVersion>3.11.0-preview.25427.3</MSTestPackageVersion>
Expand Down Expand Up @@ -274,8 +272,6 @@ This file should be imported by eng/Versions.props
<SystemTextEncodingCodePagesVersion>$(SystemTextEncodingCodePagesPackageVersion)</SystemTextEncodingCodePagesVersion>
<SystemTextJsonVersion>$(SystemTextJsonPackageVersion)</SystemTextJsonVersion>
<SystemWindowsExtensionsVersion>$(SystemWindowsExtensionsPackageVersion)</SystemWindowsExtensionsVersion>
<!-- dotnet/core-setup dependencies -->
<NETStandardLibraryRefVersion>$(NETStandardLibraryRefPackageVersion)</NETStandardLibraryRefVersion>
<!-- microsoft/testfx dependencies -->
<MicrosoftTestingPlatformVersion>$(MicrosoftTestingPlatformPackageVersion)</MicrosoftTestingPlatformVersion>
<MSTestVersion>$(MSTestPackageVersion)</MSTestVersion>
Expand Down
6 changes: 0 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,6 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<!-- Change blob version in GenerateInstallerLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.15.0-preview-25416-109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
Expand Down
Loading