Skip to content

Commit

Permalink
Merge in 'release/6.0' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Feb 15, 2023
2 parents 0aa8845 + 322dd57 commit 22da7ee
Show file tree
Hide file tree
Showing 5 changed files with 770 additions and 401 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@

<!-- When building from source, ensure the RID we're building for is part of the RID graph -->
<AdditionalRuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalRuntimeIdentifiers);$(OutputRID)</AdditionalRuntimeIdentifiers>
<ServicingVersion>7</ServicingVersion>
<ServicingVersion>8</ServicingVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
Expand Down
Loading

0 comments on commit 22da7ee

Please sign in to comment.