Merge branch 'main' into mono_workaround

Author: marcpopMSFT

.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:

.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

eng/Version.Details.xml

@@ -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

eng/Versions.props

@@ -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

eng/pipelines/templates/jobs/sdk-job-matrix.yml

@@ -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
 ```
 

eng/pipelines/templates/jobs/vmr-build.yml

@@ -8,13 +8,20 @@
           BeforeTargets="AfterBuild"
           DependsOnTargets="DetermineSourceBuiltSdkVersion"
           Inputs="$(SdkTarballPath)"
-          Outputs="$(DotNetSdkExtractDir)">
+          Outputs="$(BaseIntermediateOutputPath)ExtractSdkArchive.complete">
     <MakeDir Directories="$(DotNetSdkExtractDir)" />
+
     <Exec Condition="'$(ArchiveExtension)' == '.tar.gz'"
           Command="tar -xzf $(SdkTarballPath) -C $(DotNetSdkExtractDir)" />
     <Unzip Condition="'$(ArchiveExtension)' == '.zip'"
            SourceFiles="$(SdkTarballPath)"
            DestinationFolder="$(DotNetSdkExtractDir)" />
+
+    <Message Text="Extracted SDK archive file '$(SdkTarballPath)' to '$(DotNetSdkExtractDir)'." Importance="high" />
+
+    <Touch Files="$(BaseIntermediateOutputPath)ExtractSdkArchive.complete" AlwaysCreate="true">
+      <Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
+    </Touch>
   </Target>
 
 </Project>

src/SourceBuild/content/README.md

@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="runtime" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">

src/SourceBuild/content/eng/extract-sdk-archive.proj

@@ -234,15 +234,15 @@ Microsoft.SourceLink.GitHub.x.y.z.nupkg: 53061
 Microsoft.SourceLink.GitLab.x.y.z.nupkg: 53221
 Microsoft.SourceLink.GitWeb.x.y.z.nupkg: 54812
 Microsoft.SourceLink.Tools.x.y.z.nupkg: 6687
-Microsoft.TemplateEngine.Abstractions.x.y.z.nupkg: 58045
+Microsoft.TemplateEngine.Abstractions.x.y.z.nupkg: 112360
 Microsoft.TemplateEngine.Cli.x.y.z.nupkg: 396205
-Microsoft.TemplateEngine.Core.Contracts.x.y.z.nupkg: 18452
-Microsoft.TemplateEngine.Core.x.y.z.nupkg: 116388
-Microsoft.TemplateEngine.Edge.x.y.z.nupkg: 268933
-Microsoft.TemplateEngine.IDE.x.y.z.nupkg: 24725
-Microsoft.TemplateEngine.Orchestrator.RunnableProjects.x.y.z.nupkg: 247668
+Microsoft.TemplateEngine.Core.Contracts.x.y.z.nupkg: 33438
+Microsoft.TemplateEngine.Core.x.y.z.nupkg: 228453
+Microsoft.TemplateEngine.Edge.x.y.z.nupkg: 540936
+Microsoft.TemplateEngine.IDE.x.y.z.nupkg: 45873
+Microsoft.TemplateEngine.Orchestrator.RunnableProjects.x.y.z.nupkg: 495533
 Microsoft.TemplateEngine.Samples.x.y.z.nupkg: 41756
-Microsoft.TemplateEngine.Utils.x.y.z.nupkg: 101303
+Microsoft.TemplateEngine.Utils.x.y.z.nupkg: 199080
 Microsoft.TemplateSearch.Common.x.y.z.nupkg: 85026
 Microsoft.TestPlatform.Build.x.y.z.nupkg: 62637
 Microsoft.TestPlatform.CLI.x.y.z.nupkg: 2185903
@@ -1588,10 +1588,10 @@ sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 1382
 sdk/x.y.z/cs/MSBuild.resources.dll: 62464
 sdk/x.y.z/cs/System.CommandLine.resources.dll: 8704
 sdk/x.y.z/cs/vstest.console.resources.dll: 40448
-sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ImportAfter/Microsoft.TestPlatform.CrossTargeting.targets: 4316
+sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ImportAfter/Microsoft.TestPlatform.CrossTargeting.targets: 7161
 sdk/x.y.z/Current/Microsoft.Common.props: 11168
 sdk/x.y.z/Current/Microsoft.Common.targets/ImportAfter/Microsoft.NET.Build.Extensions.targets: 1024
-sdk/x.y.z/Current/Microsoft.Common.targets/ImportAfter/Microsoft.TestPlatform.ImportAfter.targets: 1033
+sdk/x.y.z/Current/Microsoft.Common.targets/ImportAfter/Microsoft.TestPlatform.ImportAfter.targets: 1482
 sdk/x.y.z/Current/SolutionFile/ImportAfter/Microsoft.NET.Sdk.Solution.targets: 1527
 sdk/x.y.z/Current/SolutionFile/ImportAfter/Microsoft.NuGet.ImportAfter.targets: 921
 sdk/x.y.z/datacollector.deps.json: 28365
@@ -1654,7 +1654,6 @@ sdk/x.y.z/DotnetTools/dotnet-format/BuildHost-netcore/Newtonsoft.Json.dll: 69273
 sdk/x.y.z/DotnetTools/dotnet-format/BuildHost-netcore/pl/System.CommandLine.resources.dll: 8704
 sdk/x.y.z/DotnetTools/dotnet-format/BuildHost-netcore/pt-BR/System.CommandLine.resources.dll: 8704
 sdk/x.y.z/DotnetTools/dotnet-format/BuildHost-netcore/ru/System.CommandLine.resources.dll: 9216
-sdk/x.y.z/DotnetTools/dotnet-format/BuildHost-netcore/System.Collections.Immutable.dll: 236544
 sdk/x.y.z/DotnetTools/dotnet-format/BuildHost-netcore/System.CommandLine.dll: 136192
 sdk/x.y.z/DotnetTools/dotnet-format/BuildHost-netcore/tr/System.CommandLine.resources.dll: 8704
 sdk/x.y.z/DotnetTools/dotnet-format/BuildHost-netcore/zh-Hans/System.CommandLine.resources.dll: 8704
@@ -1932,7 +1931,6 @@ sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-netcore/Newt
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-netcore/pl/System.CommandLine.resources.dll: 8704
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-netcore/pt-BR/System.CommandLine.resources.dll: 8704
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-netcore/ru/System.CommandLine.resources.dll: 9216
-sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-netcore/System.Collections.Immutable.dll: 236544
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-netcore/System.CommandLine.dll: 136192
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-netcore/tr/System.CommandLine.resources.dll: 8704
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/BuildHost-netcore/zh-Hans/System.CommandLine.resources.dll: 8704
@@ -2011,6 +2009,12 @@ sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Workspaces.dll: 3880960
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Workspaces.MSBuild.dll: 101376
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.DiaSymReader.dll: 76800
+sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Extensions.DependencyInjection.Abstractions.dll: 55296
+sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Extensions.DependencyInjection.dll: 82944
+sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Extensions.Logging.Abstractions.dll: 55808
+sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Extensions.Logging.dll: 41984
+sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Extensions.Options.dll: 55296
+sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll: 34304
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll: 43008
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll: 692736
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/dotnet-watch.resources.dll: 7168
@@ -2037,7 +2041,9 @@ sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnaly
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll: 7680
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll: 47104
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll: 9216
+sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll: 163328
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll: 790528
+sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll: 309760
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll: 61952
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CodeDom.dll: 174080
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll: 136192
@@ -2047,9 +2053,12 @@ sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Hos
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Runtime.dll: 15360
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.TypedParts.dll: 54784
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Configuration.ConfigurationManager.dll: 432640
+sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Diagnostics.EventLog.dll: 43008
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.MetadataLoadContext.dll: 242688
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Resources.Extensions.dll: 65024
+sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.Pkcs.dll: 256000
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll: 26624
+sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.Xml.dll: 189440
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll: 103936
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll: 16896
 sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll: 7168
@@ -2694,8 +2703,6 @@ sdk/x.y.z/Roslyn/bincore/pt-BR/Microsoft.CodeAnalysis.VisualBasic.resources.dll:
 sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll: 589312
 sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll: 49152
 sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.VisualBasic.resources.dll: 398336
-sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll: 718336
-sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll: 1058304
 sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.CSharp.resources.dll: 421888
 sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.resources.dll: 37376
 sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.VisualBasic.resources.dll: 291840
@@ -2895,7 +2902,7 @@ sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.Stati
 sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.CrossTargeting.targets: 4439
 sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.EmbeddedAssets.targets: 18113
 sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.FingerprintingPatterns.props: 1469
-sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets: 15080
+sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets: 22723
 sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.Pack.CrossTargeting.targets: 5801
 sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.Pack.targets: 11356
 sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.props: 930