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: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>
<PropertyGroup>
<!-- The .NET product branding version -->
<ProductVersion>5.0.4</ProductVersion>
<ProductVersion>5.0.5</ProductVersion>
<!-- File version numbers -->
<MajorVersion>5</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>4</PatchVersion>
<PatchVersion>5</PatchVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<!-- Set assembly version to align with major and minor version,
as for the patches and revisions should be manually updated per assembly if it is serviced. -->
Expand Down
3 changes: 0 additions & 3 deletions src/libraries/libraries-packages.proj
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
<ProjectReference Include="$(PkgDir)*\*.proj" Exclude="$(PkgDir)test\*" Condition="'$(BuildAllOOBPackages)' == 'true'" />
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\**\*.pkgproj" Condition="('$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true') And '$(BuildAllOOBPackages)' == 'true'" />
<!-- If setting BuildAllOOBPackages to false, add bellow the individual OOB packages you want to continue to build -->
<ProjectReference Include="$(PkgDir)runtime.native.System.IO.Ports\runtime.native.System.IO.Ports.proj" />
<ProjectReference Include="$(LibrariesProjectRoot)\System.IO.Ports\pkg\System.IO.Ports.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
<!-- This is merge marker 1 to help automerge -->
<ProjectReference Include="$(LibrariesProjectRoot)\System.Drawing.Common\pkg\System.Drawing.Common.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
<!-- This is merge marker 2 to help automerge -->
<!-- This is merge marker 3 to help automerge -->
<!-- This is merge marker 4 to help automerge -->
Expand Down