Skip to content

Commit 087e153

Browse files
committed
Merge in 'release/8.0' changes
2 parents dfd075b + ca4f0fe commit 087e153

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,11 @@
2828
<!-- Analyzers cannot be SBRPed + an older release version is being used, meaning there is no intermediate for it
2929
In full source build, this version is overridden by previous repo outputs or come from previously source-built artifacts. -->
3030
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Analyzers/*" />
31+
32+
<!-- Transitive msbuild dependencies that when build in product source-build, latest/n-1 is used -->
33+
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager*/*7.0.*" />
34+
<UsagePattern IdentityGlob="System.Diagnostics.EventLog*/*7.0.*" />
35+
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext*/*7.0.*" />
36+
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData*/*7.0.*" />
3137
</IgnorePatterns>
32-
</UsageData>
38+
</UsageData>

eng/Version.Details.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,5 +410,14 @@
410410
<Uri>https://github.com/dotnet/installer</Uri>
411411
<Sha>46a7370763921ded24dcb70c585ee97883c615d4</Sha>
412412
</Dependency>
413+
<Dependency Name="Microsoft.Build" Version="17.8.3">
414+
<Uri>https://github.com/dotnet/msbuild</Uri>
415+
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
416+
</Dependency>
417+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
418+
<Uri>https://github.com/dotnet/msbuild</Uri>
419+
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
420+
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
421+
</Dependency>
413422
</ToolsetDependencies>
414423
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
173173
<MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
174174
<DNNEVersion>2.0.5</DNNEVersion>
175-
<MicrosoftBuildVersion>17.3.2</MicrosoftBuildVersion>
175+
<MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
176176
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
177177
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
178178
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion>

0 commit comments

Comments
 (0)