Skip to content

Commit

Permalink
Merged PR 34160: [internal/release/frameshift/6.0.4xx] Update depende…
Browse files Browse the repository at this point in the history
…ncies from dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:972ce726-6675-4ba6-cadf-08dbbf3cebf2)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 972ce726-6675-4ba6-cadf-08dbbf3cebf2
- **Build**: 20230930.38
- **Date Produced**: October 1, 2023 1:52:12 AM UTC
- **Commit**: bb5ae4829da51d315033bedb73116477b0390cd3
- **Branch**: refs/heads/internal/release/frameshift/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.415-servicing.23480.28 to 6.0.415-servicing.23480.38][1]
  - **Microsoft.NET.Sdk**: [from 6.0.415-servicing.23480.28 to 6.0.415-servicing.23480.38][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfe3cff583e&targetVersion=GCbb5ae4829d&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:972ce726-6675-4ba6-cadf-08dbbf3cebf2)
  • Loading branch information
dotnet-bot authored and wtgodbe committed Oct 1, 2023
1 parent 462a638 commit 6963d2d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.415-servicing.23480.28">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.415-servicing.23480.38">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778</Sha>
<Sha>bb5ae4829da51d315033bedb73116477b0390cd3</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.415-servicing.23480.28">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.415-servicing.23480.38">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778</Sha>
<Sha>bb5ae4829da51d315033bedb73116477b0390cd3</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.23-servicing.23480.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.415-servicing.23480.28</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.415-servicing.23480.28</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.415-servicing.23480.38</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.415-servicing.23480.38</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down

0 comments on commit 6963d2d

Please sign in to comment.