Skip to content

Commit 117e9d0

Browse files
github-actions[bot]psfinakiKevinRansombenhopkinstechabonie
authored
[automated] Merge branch 'main' => 'feature/lsp' (#18359)
* Update MSBuild (#18347) * msbuild * Update Versions.props * Revert "Update Versions.props" This reverts commit c1c61eb. * Update SourceBuildPrebuiltBaseline.xml --------- Co-authored-by: Kevin Ransom (msft) <[email protected]> * Update xcopy-msbuild to latest available version (#18351) --------- Co-authored-by: Petr <[email protected]> Co-authored-by: Kevin Ransom (msft) <[email protected]> Co-authored-by: Ben Hopkins <[email protected]> Co-authored-by: Adam Boniecki <[email protected]>
1 parent f386188 commit 117e9d0

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,12 @@
2626
<!-- Tracked in https://github.com/dotnet/source-build/issues/3438 -->
2727
<UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/3.2.2146" />
2828
</IgnorePatterns>
29+
30+
<Usages>
31+
<Usage Id="Microsoft.Build.Framework" Version="17.12.6" IsDirectDependency="true" />
32+
<Usage Id="Microsoft.Build.Tasks.Core" Version="17.12.6" IsDirectDependency="true" />
33+
<Usage Id="Microsoft.Build.Utilities.Core" Version="17.12.6" IsDirectDependency="true" />
34+
<Usage Id="Microsoft.NET.StringTools" Version="17.12.6" />
35+
<Usage Id="System.Formats.Asn1" Version="8.0.1" />
36+
</Usages>
2937
</UsageData>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<MicrosoftVisualStudioShellPackagesVersion>17.10.40152</MicrosoftVisualStudioShellPackagesVersion>
9595
<VisualStudioProjectSystemPackagesVersion>17.10.526-pre-g1b474069f5</VisualStudioProjectSystemPackagesVersion>
9696
<MicrosoftVisualStudioThreadingPackagesVersion>17.10.41</MicrosoftVisualStudioThreadingPackagesVersion>
97-
<MicrosoftBuildVersion>17.11.0-preview-24178-03</MicrosoftBuildVersion>
97+
<MicrosoftBuildVersion>17.12.6</MicrosoftBuildVersion>
9898
<!-- Roslyn packages -->
9999
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
100100
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"Microsoft.VisualStudio.Component.FSharp"
1212
]
1313
},
14-
"xcopy-msbuild": "17.12.0"
14+
"xcopy-msbuild": "17.13.0"
1515
},
1616
"native-tools": {
1717
"perl": "5.38.2.2"

0 commit comments

Comments
 (0)