Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/runtime #41616

Merged
merged 21 commits into from
Jun 20, 2024
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5e579ba
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 15, 2024
7d290a8
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 15, 2024
90b7f00
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 16, 2024
983c68f
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 16, 2024
e949a0d
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 16, 2024
9107db9
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 17, 2024
f15abdb
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 18, 2024
f810905
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 18, 2024
44a1c89
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 19, 2024
b8c8d3a
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 19, 2024
e74e2ac
Create 0002-versionsprops-and-details.patch
ViktorHofer Jun 19, 2024
561b332
Update 0002-versionsprops-and-details.patch
ViktorHofer Jun 19, 2024
b6363ce
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 19, 2024
cb50c57
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 19, 2024
2c0e486
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jun 20, 2024
a8b7fbe
Merge branch 'main' into darc-main-3068b376-438b-4176-b12b-63b822ad1cd3
ViktorHofer Jun 20, 2024
6eca81a
Update dependencies from windowsdesktop (manually)
ViktorHofer Jun 20, 2024
03170fe
Update centos8 to centos9
akoeplinger Jun 20, 2024
2983277
Create 0001-Remove-System.IO.Hashing-dependency-from-framework.patch
ViktorHofer Jun 20, 2024
aad0644
Update 0001-Remove-System.IO.Hashing-dependency-from-framework.patch
ViktorHofer Jun 20, 2024
5030d34
Delete src/SourceBuild/patches/windowsdesktop/0001-Remove-System.IO.H…
ViktorHofer Jun 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .vsts-ci.yml
Original file line number Diff line number Diff line change
@@ -65,8 +65,6 @@ extends:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
cblMariner20Fpm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
centosStream8:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
centosStream9:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
debian11Amd64:
2 changes: 0 additions & 2 deletions .vsts-pr.yml
Original file line number Diff line number Diff line change
@@ -18,8 +18,6 @@ resources:
containers:
- container: alpine319WithNode
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
- container: centosStream8
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
- container: centosStream9
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
- container: debian11Amd64
116 changes: 58 additions & 58 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -15,42 +15,42 @@
<Sha>df6965525ff1b8bf600b553976ef37dd5f093e49</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.6.24307.2">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.6.24307.2">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-preview.6.24307.2">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.6.24307.2">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-preview.6.24307.2">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-preview.6.24307.2">
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-preview.6.24307.2">
<Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.6.24307.2">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.6.24307.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
@@ -59,14 +59,14 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.6.24277.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.6.24317.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>fae2c9534679912d43304de91e622f63e7110919</Sha>
<Sha>9880d891ddfddee1b1182c149468a43b89c090a0</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.0-preview.6.24277.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.0-preview.6.24317.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>fae2c9534679912d43304de91e622f63e7110919</Sha>
<Sha>9880d891ddfddee1b1182c149468a43b89c090a0</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.11.0-preview-24318-05">
@@ -226,46 +226,46 @@
<Sha>3d2ea06c998a002f640b01f5d84fdefb14167502</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.6.24307.2">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="9.0.0-preview.6.24307.2">
<Dependency Name="System.CodeDom" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-preview.6.24307.2">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-preview.6.24307.2">
<Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="9.0.0-preview.6.24307.2">
<Dependency Name="System.Resources.Extensions" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.6.24318.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.6.24320.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>2eaeedd24bd1ac0f0dbe79379f83f2476b0f5581</Sha>
<Sha>fd4882363adaf9e2c883de99c3993199a3dfcf29</Sha>
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.6.24318.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.6.24320.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>2eaeedd24bd1ac0f0dbe79379f83f2476b0f5581</Sha>
<Sha>fd4882363adaf9e2c883de99c3993199a3dfcf29</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.6.24318.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.6.24320.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>2eaeedd24bd1ac0f0dbe79379f83f2476b0f5581</Sha>
<Sha>fd4882363adaf9e2c883de99c3993199a3dfcf29</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.6.24318.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.6.24320.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>2eaeedd24bd1ac0f0dbe79379f83f2476b0f5581</Sha>
<Sha>fd4882363adaf9e2c883de99c3993199a3dfcf29</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-preview.6.24317.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-preview.7.24320.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>d5d26f90bf937e6fa60e5ef7f78a527515452069</Sha>
<Sha>4093a1649f50d767671a58b8a2a0f738480e51ff</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.6.24309.2">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -382,13 +382,13 @@
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</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="9.0.0-preview.6.24317.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.6.24319.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>8cbf7ea9a86cb42828fdc5af826f986bce3d2e98</Sha>
<Sha>77be8127d323f322a9c168acaf5920d84271096c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.6.24317.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.7.24320.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>d5d26f90bf937e6fa60e5ef7f78a527515452069</Sha>
<Sha>4093a1649f50d767671a58b8a2a0f738480e51ff</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24317.2">
<Uri>https://github.com/dotnet/xdt</Uri>
@@ -495,29 +495,29 @@
<SourceBuild RepoName="symreader" ManagedOnly="true" />
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.6.24307.2">
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.6.24307.2">
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.6.24307.2">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-preview.6.24307.2">
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-preview.6.24307.2">
<Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
@@ -551,9 +551,9 @@
<Sha>579b9d3c2a51de22be7685f0bd624bf83265c901</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-preview.6.24307.2">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-preview.6.24319.11">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24256.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
54 changes: 27 additions & 27 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -79,12 +79,12 @@
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.6.24307.2</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.6.24319.11</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.6.24307.2</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.6.24319.11</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.24209.3</SystemCommandLineVersion>
<SystemCommandLineRenderingVersion>0.4.0-alpha.24209.3</SystemCommandLineRenderingVersion>
@@ -119,7 +119,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.6.24317.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.6.24319.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -130,29 +130,29 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.6.24307.2</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.6.24307.2</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.6.24307.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.6.24307.2</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>9.0.0-preview.6.24307.2</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.6.24307.2</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.6.24307.2</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.6.24307.2</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.6.24307.2</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.6.24307.2</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.6.24307.2</SystemServiceProcessServiceControllerVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.6.24319.11</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.6.24319.11</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>9.0.0-preview.6.24319.11</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.6.24319.11</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.6.24319.11</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.6.24319.11</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.6.24319.11</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.6.24319.11</SystemServiceProcessServiceControllerVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.6.24307.2</MicrosoftNETCorePlatformsPackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.6.24307.2</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.6.24307.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETCorePlatformsPackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.6.24319.11</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETCoreAppHostwinx64PackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.6.24318.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.6.24318.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.6.24318.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.6.24318.1</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.6.24320.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.6.24320.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.6.24320.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.6.24320.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -177,9 +177,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>9.0.0-preview.6.24307.2</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.6.24307.2</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.6.24307.2</SystemResourcesExtensionsPackageVersion>
<SystemCodeDomPackageVersion>9.0.0-preview.6.24319.11</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.6.24319.11</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.6.24319.11</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
@@ -257,8 +257,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.6.24317.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.6.24317.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24320.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24320.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Runtime and Apphost aliases">
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
@@ -348,7 +348,7 @@
<XamarinMacOSWorkloadManifestVersion>14.2.9088-net9-p1</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>17.2.9088-net9-p1</XamarinTvOSWorkloadManifestVersion>
<!-- Workloads from dotnet/emsdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.6.24277.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.6.24317.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
<EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
6 changes: 2 additions & 4 deletions eng/pipelines/templates/jobs/sdk-job-matrix.yml
Original file line number Diff line number Diff line change
@@ -43,10 +43,8 @@ parameters:
# See: https://github.com/dotnet/sdk/issues/40935
runTests: false
- categoryName: ContainerBased
# The centosStream9 assets are not published. So, we need to use 8 for the time being.
# See: https://github.com/dotnet/runtime/issues/102344
container: centosStream8
helixTargetContainer: $(helixTargetContainerPrefix)centos-stream8-helix
container: centosStream9
helixTargetContainer: $(helixTargetContainerPrefix)centos-stream9-helix
osProperties: /p:OSName=linux
# Skipping all container-based testing for now.
# See: https://github.com/dotnet/sdk/issues/40935
2 changes: 1 addition & 1 deletion eng/pipelines/templates/jobs/vmr-build.yml
Original file line number Diff line number Diff line change
@@ -272,7 +272,7 @@ jobs:
fi
if [[ '${{ parameters.withPreviousSDK }}' == 'True' ]]; then
# Source-built artifacts are from CentOS 8 Stream or Alpine 3.19. We want to download them without
# Source-built artifacts are from CentOS 9 Stream or Alpine 3.19. We want to download them without
# downloading portable versions from the internet.
customPrepArgs="${customPrepArgs} --no-sdk --no-bootstrap"
prepSdk=false
4 changes: 2 additions & 2 deletions src/SourceBuild/content/README.md
Original file line number Diff line number Diff line change
@@ -142,7 +142,7 @@ You can also build the repository using a Docker image which has the required pr
The example below creates a Docker volume named `vmr` and clones and builds the VMR there.

```sh
docker run --rm -it -v vmr:/vmr -w /vmr mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
docker run --rm -it -v vmr:/vmr -w /vmr mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
git clone https://github.com/dotnet/dotnet .
# - Microsoft based build
@@ -152,7 +152,7 @@ git clone https://github.com/dotnet/dotnet .
./prep-source-build.sh && ./build.sh -sb --clean-while-building
mkdir -p $HOME/.dotnet
tar -zxf artifacts/assets/Release/dotnet-sdk-9.0.100-centos.8-x64.tar.gz -C $HOME/.dotnet
tar -zxf artifacts/assets/Release/dotnet-sdk-9.0.100-centos.9-x64.tar.gz -C $HOME/.dotnet
ln -s $HOME/.dotnet/dotnet /usr/bin/dotnet
```

Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
From 642134215a2c7285e958dfc8aa6fb058a836c6da Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 19 Jun 2024 10:32:23 +0000
Subject: [PATCH] Correctly define versions for runtime dependencies

System.ComponentModel.Composition and
System.IO.Hashing were missing Versions.props and
Version.Details.xml entries.

This is necessary so that the VMR can upgrade
the dependencies when building all dependencies
live.

Similar to c74b31bd8313865fa3becf0d8f91f00d528ca5ad
Unblocks runtime dependency flow:
https://github.com/dotnet/sdk/pull/41616

Backport PR: https://github.com/dotnet/roslyn/pull/74060

---
eng/Directory.Packages.props | 4 ++--
eng/Version.Details.xml | 8 ++++++++
eng/Versions.props | 2 ++
.../Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj | 2 +-
4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index 83ab7a5601433..e93b49fa24c55 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -190,10 +190,10 @@
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
<PackageVersion Include="System.Composition" Version="$(SystemCompositionVersion)" />
- <PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
+ <PackageVersion Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionVersion)" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
<PackageVersion Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogVersion)" />
- <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
+ <PackageVersion Include="System.IO.Hashing" Version="$(SystemIOHashingVersion)" />
<PackageVersion Include="System.IO.Pipelines" Version="$(SystemIOPipelinesVersion)" />
<PackageVersion Include="System.IO.Pipes.AccessControl" Version="5.0.0" />
<PackageVersion Include="System.Memory" Version="4.5.5" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0e070103b4b0c..7852558f7c3e6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -64,10 +64,18 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
+ <Dependency Name="System.ComponentModel.Composition" Version="8.0.0">
+ <Uri>https://github.com/dotnet/runtime</Uri>
+ <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+ </Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="8.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
+ <Dependency Name="System.IO.Hashing" Version="8.0.0">
+ <Uri>https://github.com/dotnet/runtime</Uri>
+ <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+ </Dependency>
<Dependency Name="System.IO.Pipelines" Version="8.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 0f39e2822c158..1f9c7b8d08ec2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -25,7 +25,9 @@
<SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsEventLogVersion>8.0.0</SystemDiagnosticsEventLogVersion>
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
+ <SystemComponentModelCompositionVersion>8.0.0</SystemComponentModelCompositionVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0</SystemDiagnosticsDiagnosticSourceVersion>
+ <SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
<SystemIOPipelinesVersion>8.0.0</SystemIOPipelinesVersion>
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>8.0.0</SystemResourcesExtensionsVersion>
diff --git a/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj b/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj
index 8a011c5f82948..4310078bf9b32 100644
--- a/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj
+++ b/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj
@@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
- <PackageReference Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionVersion)" />
+ <PackageReference Include="System.ComponentModel.Composition" />
</ItemGroup>

<ItemGroup>