Skip to content

Commit 75f5f3b

Browse files
committed
Merge remote-tracking branch 'libtemplate/microbuild' into dev/andarno/fixOptProf
2 parents c53cbb7 + 8537863 commit 75f5f3b

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"powershell": {
6-
"version": "7.3.4",
6+
"version": "7.3.5",
77
"commands": [
88
"pwsh"
99
]

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(CodefixTestingVersion)" />
2323
<PackageVersion Include="Microsoft.Diagnostics.Runtime.Utilities" Version="$(MicrosoftDiagnosticsRuntimeVersion)" />
2424
<PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="$(MicrosoftDiagnosticsRuntimeVersion)" />
25-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
25+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
2626
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
2727
<PackageVersion Include="Microsoft.VisualStudio.Interop" Version="17.4.33103.184" />
2828
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.4.33103.184" />

src/Directory.Build.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
<Project>
2+
<!-- Include and reference README in nuge package, if a README is in the project directory. -->
3+
<PropertyGroup>
4+
<PackageReadmeFile Condition="Exists('README.md')">README.md</PackageReadmeFile>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<None Condition="Exists('README.md')" Include="README.md" Pack="true" PackagePath="" />
8+
</ItemGroup>
9+
210
<Import Project="$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..))" />
311

412
<PropertyGroup>

0 commit comments

Comments
 (0)