Skip to content

Commit 48f77fa

Browse files
authored
[main] Update dependencies from dotnet/msbuild (#31599)
2 parents ab6a186 + e9f048a commit 48f77fa

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<UsagePattern IdentityGlob="System.Text.Encoding.CodePages/*7.0.0*" />
5656
<UsagePattern IdentityGlob="System.Text.Encodings.Web/*6.0.0*" />
5757
<UsagePattern IdentityGlob="System.Text.Encodings.Web/*7.0.0*" />
58+
<UsagePattern IdentityGlob="System.Text.Json/*4.7.0*" />
5859
<UsagePattern IdentityGlob="System.Text.Json/*6.0.0*" />
5960
<UsagePattern IdentityGlob="System.Text.Json/*7.0.0*" />
6061
<UsagePattern IdentityGlob="System.Text.Json/*7.0.1*" />

eng/Version.Details.xml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@
4343
<Uri>https://github.com/dotnet/runtime</Uri>
4444
<Sha>958b1e046cbfff5c0bc647f531b4fcf9eb197a6c</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.Build" Version="17.6.0-preview-23174-01">
46+
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23204-03">
4747
<Uri>https://github.com/dotnet/msbuild</Uri>
48-
<Sha>e7de1330724224a542668e1ef82c997613c7080c</Sha>
48+
<Sha>413571dea9ebb0023f26e5c0f5cd514d30b61465</Sha>
4949
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
5050
</Dependency>
51-
<Dependency Name="Microsoft.Build.Localization" Version="17.6.0-preview-23174-01">
51+
<Dependency Name="Microsoft.Build.Localization" Version="17.7.0-preview-23204-03">
5252
<Uri>https://github.com/dotnet/msbuild</Uri>
53-
<Sha>e7de1330724224a542668e1ef82c997613c7080c</Sha>
53+
<Sha>413571dea9ebb0023f26e5c0f5cd514d30b61465</Sha>
5454
</Dependency>
5555
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23180.1">
5656
<Uri>https://github.com/dotnet/fsharp</Uri>
@@ -238,6 +238,10 @@
238238
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
239239
<Sha>916b9a6842c8d09c385cd25e4f02477e216eb630</Sha>
240240
</Dependency>
241+
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.5-beta1.23181.1">
242+
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
243+
<Sha>916b9a6842c8d09c385cd25e4f02477e216eb630</Sha>
244+
</Dependency>
241245
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.3.5-beta1.23181.1">
242246
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
243247
<Sha>916b9a6842c8d09c385cd25e4f02477e216eb630</Sha>
@@ -257,9 +261,9 @@
257261
<Sha>cbd9d61c5a92d7e4a0548a2c8ff4d1a28aaf6379</Sha>
258262
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
259263
</Dependency>
260-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23156.5">
264+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23204.3">
261265
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
262-
<Sha>e2279a0388f89a1f771ff7e4ded01f0e657bcafb</Sha>
266+
<Sha>2d28a5e97867316939ef8108f219a8de073d0f03</Sha>
263267
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
264268
</Dependency>
265269
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview6.1.23159.4">

eng/Versions.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,11 @@
9696
<PropertyGroup>
9797
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
9898
<MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23181.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
99+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.5-beta1.23181.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
99100
</PropertyGroup>
100101
<PropertyGroup>
101102
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
102-
<MicrosoftBuildPackageVersion>17.6.0-preview-23174-01</MicrosoftBuildPackageVersion>
103+
<MicrosoftBuildPackageVersion>17.7.0-preview-23204-03</MicrosoftBuildPackageVersion>
103104
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
104105
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
105106
so target one that matches the version in minimumMSBuildVersion.
@@ -108,7 +109,7 @@
108109
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
109110
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
110111
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
111-
<MicrosoftBuildLocalizationPackageVersion>17.6.0-preview-23174-01</MicrosoftBuildLocalizationPackageVersion>
112+
<MicrosoftBuildLocalizationPackageVersion>17.7.0-preview-23204-03</MicrosoftBuildLocalizationPackageVersion>
112113
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
113114
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
114115
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>

src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<ItemGroup>
3131
<PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="all" ExcludeAssets="runtime" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
32-
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4">
32+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)" Condition=" '$(DotNetBuildFromSource)' != 'true' ">
3333
<PrivateAssets>all</PrivateAssets>
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3535
</PackageReference>

0 commit comments

Comments
 (0)