Skip to content

Commit 5c87259

Browse files
[main] Update dependencies from dotnet/deployment-tools (dotnet#42225)
[main] Update dependencies from dotnet/deployment-tools - Update Microsoft.NET.Sdk.WorkloadManifestReader.csproj - Update Microsoft.DotNet.TemplateLocator.csproj - Update one more hit - Merge branch 'main' into darc-main-9b783a04-485a-4117-959d-4c9fb4b6e462 - Merge branch 'main' into darc-main-9b783a04-485a-4117-959d-4c9fb4b6e462 - Update System.Text.Json version in VerifyDependencies target
1 parent 3c3fb4e commit 5c87259

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,9 @@
448448
<Sha>4d5ba7206ed1d56612b36560334494652ed486b2</Sha>
449449
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
450450
</Dependency>
451-
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.24305.1">
451+
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.24366.1">
452452
<Uri>https://github.com/dotnet/deployment-tools</Uri>
453-
<Sha>d882ae4af9fb09a89e36487a9c8cb7dfde713927</Sha>
453+
<Sha>790d2fd96379448c91306c67768b41521a4c130f</Sha>
454454
</Dependency>
455455
<Dependency Name="Microsoft.Build.Tasks.Git" Version="9.0.0-beta.24215.3">
456456
<Uri>https://github.com/dotnet/sourcelink</Uri>
@@ -483,9 +483,9 @@
483483
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
484484
</Dependency>
485485
<!-- Intermediate is necessary for source build. -->
486-
<Dependency Name="Microsoft.SourceBuild.Intermediate.deployment-tools" Version="9.0.0-preview.1.24305.1">
486+
<Dependency Name="Microsoft.SourceBuild.Intermediate.deployment-tools" Version="9.0.0-preview.1.24366.1">
487487
<Uri>https://github.com/dotnet/deployment-tools</Uri>
488-
<Sha>d882ae4af9fb09a89e36487a9c8cb7dfde713927</Sha>
488+
<Sha>790d2fd96379448c91306c67768b41521a4c130f</Sha>
489489
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
490490
</Dependency>
491491
<!-- Intermediate is necessary for source build. -->

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
8080
<SystemCommandLineVersion>2.0.0-beta4.24324.3</SystemCommandLineVersion>
8181
<SystemCommandLineRenderingVersion>0.4.0-alpha.24324.3</SystemCommandLineRenderingVersion>
82-
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24305.1</MicrosoftDeploymentDotNetReleasesVersion>
82+
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24366.1</MicrosoftDeploymentDotNetReleasesVersion>
8383
<MicrosoftDiaSymReaderVersion>2.2.0-beta.24327.2</MicrosoftDiaSymReaderVersion>
8484
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
8585
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>

src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@
5858
</ItemGroup>
5959

6060
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
61-
<PackageReference Include="System.Text.Json" VersionOverride="8.0.0" />
61+
<PackageReference Include="System.Text.Json" VersionOverride="8.0.4" />
6262
</ItemGroup>
6363
</Project>

src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
9090
<!-- Netfx version builds against the lowest version of System.Text.Json that's guaranteed to be shipped with MSBuild in VS -->
9191
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="8.0.0" />
92-
<PackageReference Include="System.Text.Json" VersionOverride="8.0.0" />
92+
<PackageReference Include="System.Text.Json" VersionOverride="8.0.4" />
9393
<Reference Include="System" />
9494
<Reference Include="System.Core" />
9595
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets="All" ExcludeAssets="Runtime" />
@@ -137,7 +137,7 @@
137137

138138
<ItemGroup>
139139
<ExpectedDependencies Include="Microsoft.Deployment.DotNet.Releases, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
140-
<ExpectedDependencies Include="System.Text.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
140+
<ExpectedDependencies Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
141141
<ExpectedDependencies Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
142142
<ExpectedDependencies Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
143143
<ExpectedDependencies Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
2929
<!-- Netfx version builds against the lowest version of System.Text.Json that's guaranteed to be shipped with MSBuild in VS -->
3030
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="8.0.0" />
31-
<PackageReference Include="System.Text.Json" VersionOverride="8.0.0" />
31+
<PackageReference Include="System.Text.Json" VersionOverride="8.0.4" />
3232
<Reference Include="System" />
3333
<Reference Include="System.Core" />
3434
</ItemGroup>

0 commit comments

Comments
 (0)