Skip to content

Commit

Permalink
[release/6.0.4xx] Update dependencies from dotnet/installer (#15070)
Browse files Browse the repository at this point in the history
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22178.2 to 6.0.200-1.22219.3 (parent: Microsoft.Dotnet.Sdk.Internal)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.Dotnet.Sdk.Internal)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)





[marker]: <> (Begin:0bad9cd0-4c4e-45c7-a7bc-08da39bb24cd)
## From https://github.com/dotnet/installer
- **Subscription**: 0bad9cd0-4c4e-45c7-a7bc-08da39bb24cd
- **Build**: 20220520.3
- **Date Produced**: May 20, 2022 11:29:09 PM UTC
- **Commit**: b6032c3f2c1274c360ed2d9c0908c68aa60f6fd7
- **Branch**: refs/heads/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Dotnet.Sdk.Internal**: [from 6.0.301-rtm.22254.17 to 6.0.400-preview.22270.3][13]
  - **Microsoft.NET.ILLink.Tasks**: [from 6.0.200-1.22178.2 to 6.0.200-1.22219.3][14]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.5][15]

[13]: dotnet/installer@3fed194...b6032c3
[14]: dotnet/linker@01c4f59...28db36b
[15]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCf9ae0f5&targetVersion=GCe5f183b&_a=files

[DependencyUpdate]: <> (End)


[marker]: <> (End:0bad9cd0-4c4e-45c7-a7bc-08da39bb24cd)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <[email protected]>
  • Loading branch information
3 people authored May 23, 2022
1 parent 4273d32 commit 8fee76d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ endif
# The sdk version band has the last two digits set to 0: https://github.com/dotnet/sdk/blob/22c4860dcb2cf6b123dd641cc4a87a50380759d5/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs#L52-L53
DOTNET_MANIFEST_VERSION_BAND=$(shell echo $(DOTNET_VERSION_BAND) | sed 's/..$$/00/')
# We must do the same for our version band: the last two digits must be set to 0.
MANIFEST_VERSION_BAND=6.0.300
MANIFEST_VERSION_BAND=6.0.400
# The toolchain can either be hardcoded to something like 6.0.200, or set to MANIFEST_VERSION_BAND.
# Typically it should be MANIFEST_VERSION_BAND, but it usually takes a while after MANIFEST_VERSION_BAND is bumped
# for this to follow suit, in which case we can keep things working by hardcoding the previous version band.
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.301-rtm.22254.17">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.400-preview.22270.3">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>3fed194c0b277b0ac0986f92401a50dd6c34f43d</Sha>
<Sha>b6032c3f2c1274c360ed2d9c0908c68aa60f6fd7</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22178.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22219.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>01c4f5905959c29f86781b85187bb676fc517ee9</Sha>
<Sha>28db36b95cf83c8e2ad11e67a2ad0de301b4cad6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>15626cf7e26af1c3800127242e47237698faed61</Sha>
</Dependency>
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>f9ae0f5d30be2de3c0de61b5673bd8873231d70a</Sha>
<Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.301-rtm.22254.17</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22178.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.400-preview.22270.3</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22219.3</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.6</MicrosoftNETCoreAppRefPackageVersion>
Expand Down

4 comments on commit 8fee76d

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

Please sign in to comment.