Skip to content
Merged
Changes from 1 commit
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
5 changes: 5 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,13 @@
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<PropertyGroup Label="Product dependencies">
<<<<<<< HEAD
<AspireHostingTestingVersion>9.0.0</AspireHostingTestingVersion>
<MicrosoftBuildVersion>17.11.4</MicrosoftBuildVersion>
=======
<AspireHostingTestingVersion>9.5.1</AspireHostingTestingVersion>
<MicrosoftBuildVersion>17.11.48</MicrosoftBuildVersion>
>>>>>>> Update Microsoft.Build.Utilities.Core to 17.11.48
<MicrosoftCodeAnalysisVersion>3.11.0</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisVersionForTests>4.10.0</MicrosoftCodeAnalysisVersionForTests>
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.25173.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
Expand Down
Loading