diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 3e55e0e22b9f..438379e48afc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -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: diff --git a/.vsts-pr.yml b/.vsts-pr.yml index af218304162f..3e5ff3c36e5d 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -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 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af96a6433e32..d6d1516c2efa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ df6965525ff1b8bf600b553976ef37dd5f093e49 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd @@ -59,14 +59,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - fae2c9534679912d43304de91e622f63e7110919 + 9880d891ddfddee1b1182c149468a43b89c090a0 - + https://github.com/dotnet/emsdk - fae2c9534679912d43304de91e622f63e7110919 + 9880d891ddfddee1b1182c149468a43b89c090a0 @@ -226,46 +226,46 @@ 3d2ea06c998a002f640b01f5d84fdefb14167502 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/windowsdesktop - 2eaeedd24bd1ac0f0dbe79379f83f2476b0f5581 + fd4882363adaf9e2c883de99c3993199a3dfcf29 - + https://github.com/dotnet/windowsdesktop - 2eaeedd24bd1ac0f0dbe79379f83f2476b0f5581 + fd4882363adaf9e2c883de99c3993199a3dfcf29 - + https://github.com/dotnet/windowsdesktop - 2eaeedd24bd1ac0f0dbe79379f83f2476b0f5581 + fd4882363adaf9e2c883de99c3993199a3dfcf29 - + https://github.com/dotnet/windowsdesktop - 2eaeedd24bd1ac0f0dbe79379f83f2476b0f5581 + fd4882363adaf9e2c883de99c3993199a3dfcf29 - + https://github.com/dotnet/wpf - d5d26f90bf937e6fa60e5ef7f78a527515452069 + 4093a1649f50d767671a58b8a2a0f738480e51ff https://github.com/dotnet/aspnetcore @@ -382,13 +382,13 @@ - + https://github.com/dotnet/winforms - 8cbf7ea9a86cb42828fdc5af826f986bce3d2e98 + 77be8127d323f322a9c168acaf5920d84271096c - + https://github.com/dotnet/wpf - d5d26f90bf937e6fa60e5ef7f78a527515452069 + 4093a1649f50d767671a58b8a2a0f738480e51ff https://github.com/dotnet/xdt @@ -495,29 +495,29 @@ - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd @@ -551,9 +551,9 @@ 579b9d3c2a51de22be7685f0bd624bf83265c901 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 1d474b8971cc..bddf702e1f7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,12 +79,12 @@ 8.0.0 4.0.0 8.0.0 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24319.11 4.3.0 4.3.0 4.0.5 7.0.3 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24319.11 4.6.0 2.0.0-beta4.24209.3 0.4.0-alpha.24209.3 @@ -119,7 +119,7 @@ - 9.0.0-preview.6.24317.1 + 9.0.0-preview.6.24319.5 @@ -130,29 +130,29 @@ - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 8.0.0-rc.1.23414.4 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 2.1.0 - 9.0.0-preview.6.24318.1 - 9.0.0-preview.6.24318.1 - 9.0.0-preview.6.24318.1 - 9.0.0-preview.6.24318.1 + 9.0.0-preview.6.24320.1 + 9.0.0-preview.6.24320.1 + 9.0.0-preview.6.24320.1 + 9.0.0-preview.6.24320.1 @@ -177,9 +177,9 @@ - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 @@ -257,8 +257,8 @@ - 9.0.0-preview.6.24317.1 - 9.0.0-preview.6.24317.1 + 9.0.0-preview.7.24320.2 + 9.0.0-preview.7.24320.2 @@ -348,7 +348,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.6.24277.2 + 9.0.0-preview.6.24317.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/eng/pipelines/templates/jobs/sdk-job-matrix.yml b/eng/pipelines/templates/jobs/sdk-job-matrix.yml index c3060113e48a..daad5746ff73 100644 --- a/eng/pipelines/templates/jobs/sdk-job-matrix.yml +++ b/eng/pipelines/templates/jobs/sdk-job-matrix.yml @@ -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 diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 873bf943123d..f651daadc4d1 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -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 diff --git a/src/SourceBuild/content/README.md b/src/SourceBuild/content/README.md index ec1c43fd9c56..60e8db54f945 100644 --- a/src/SourceBuild/content/README.md +++ b/src/SourceBuild/content/README.md @@ -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 ``` diff --git a/src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch b/src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch new file mode 100644 index 000000000000..31286b95da58 --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch @@ -0,0 +1,93 @@ +From 642134215a2c7285e958dfc8aa6fb058a836c6da Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +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 @@ + + + +- ++ + + +- ++ + + + +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 @@ + https://github.com/dotnet/runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + ++ ++ https://github.com/dotnet/runtime ++ 5535e31a712343a63f5d7d796cd874e563e5ac14 ++ + + https://github.com/dotnet/runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + ++ ++ https://github.com/dotnet/runtime ++ 5535e31a712343a63f5d7d796cd874e563e5ac14 ++ + + https://github.com/dotnet/runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 +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 @@ + 8.0.0 + 8.0.0 + 8.0.0 ++ 8.0.0 + 8.0.0 ++ 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 +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 @@ + + + +- ++ + + +