Skip to content

Commit

Permalink
Merge in 'release/8.0' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Apr 16, 2024
2 parents dfd075b + ca4f0fe commit 087e153
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
8 changes: 7 additions & 1 deletion eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,11 @@
<!-- Analyzers cannot be SBRPed + an older release version is being used, meaning there is no intermediate for it
In full source build, this version is overridden by previous repo outputs or come from previously source-built artifacts. -->
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Analyzers/*" />

<!-- Transitive msbuild dependencies that when build in product source-build, latest/n-1 is used -->
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager*/*7.0.*" />
<UsagePattern IdentityGlob="System.Diagnostics.EventLog*/*7.0.*" />
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext*/*7.0.*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData*/*7.0.*" />
</IgnorePatterns>
</UsageData>
</UsageData>
9 changes: 9 additions & 0 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -410,5 +410,14 @@
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>46a7370763921ded24dcb70c585ee97883c615d4</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.8.3">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
<NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
<MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
<DNNEVersion>2.0.5</DNNEVersion>
<MicrosoftBuildVersion>17.3.2</MicrosoftBuildVersion>
<MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion>
Expand Down

0 comments on commit 087e153

Please sign in to comment.