Merge pull request #106045 from dotnet/merge/release/8.0-to-release/8.0-staging

[automated] Merge branch 'release/8.0' => 'release/8.0-staging'

Author: carlossanlop

NuGet.config

@@ -9,6 +9,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
+    <add key="darc-pub-dotnet-emsdk-2674f58" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2674f580/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-emsdk-e92f92e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-emsdk-e92f92e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-4/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-emsdk-e92f92e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-3/nuget/v3/index.json" />

eng/Version.Details.xml

@@ -92,11 +92,11 @@
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.8">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>e92f92efe5854b6fe013787830b59166cb9b4ed9</Sha>
+      <Sha>2674f580a4b1d27322914df8488498065e71a3f2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.8-servicing.24358.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.8-servicing.24367.1">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>e92f92efe5854b6fe013787830b59166cb9b4ed9</Sha>
+      <Sha>2674f580a4b1d27322914df8488498065e71a3f2</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24372.3">

eng/Versions.props

@@ -1,11 +1,11 @@
 <Project>
   <PropertyGroup>
     <!-- The .NET product branding version -->
-    <ProductVersion>8.0.8</ProductVersion>
+    <ProductVersion>8.0.9</ProductVersion>
     <!-- File version numbers -->
     <MajorVersion>8</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <PatchVersion>8</PatchVersion>
+    <PatchVersion>9</PatchVersion>
     <SdkBandVersion>8.0.100</SdkBandVersion>
     <PackageVersionNet7>7.0.20</PackageVersionNet7>
     <PackageVersionNet6>6.0.$([MSBuild]::Add($(PatchVersion),25))</PackageVersionNet6>

eng/pipelines/common/upload-intermediate-artifacts-step.yml

@@ -2,6 +2,7 @@ parameters:
   name: ''
   publishPackagesCondition: always()
   publishVSSetupCondition: false
+  isOfficialBuild: true
 
 steps:
 - task: CopyFiles@2
@@ -27,7 +28,7 @@ steps:
 
 - template: /eng/pipelines/common/templates/publish-build-artifacts.yml
   parameters:
-    isOfficialBuild: true
+    isOfficialBuild: ${{ parameters.isOfficialBuild }}
     displayName: Publish intermediate artifacts
     inputs:
       PathtoPublish: '$(Build.StagingDirectory)/IntermediateArtifacts'

eng/pipelines/coreclr/perf-non-wasm-jobs.yml

@@ -417,6 +417,7 @@ jobs:
           - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
             parameters:
               name: MonoRuntimePacks
+              isOfficialBuild: false
 
   # build PerfBDN app
   - template: /eng/pipelines/common/platform-matrix.yml

src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj

@@ -35,7 +35,7 @@
     <WasmExtraFilesToDeploy Include="package.json" />
     <WasmExtraFilesToDeploy Include="package-lock.json" />
 
-    <NodeNpmModule Include="ws" Alias="WebSocket" />
+    <NodeNpmModule Include="ws" />
     <NodeNpmModule Include="node-fetch" />
     <NodeNpmModule Include="node-abort-controller" />
 

src/libraries/System.Net.Http/tests/FunctionalTests/package-lock.json

@@ -3,8 +3,8 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "node-abort-controller": "3.0.1",
-    "node-fetch": "2.6.7",
-    "ws": "8.4.0"
+    "node-abort-controller": "3.1.1",
+    "node-fetch": "3.3.2",
+    "ws": "8.17.1"
   }
 }

src/libraries/System.Net.Http/tests/FunctionalTests/package.json

@@ -26,7 +26,7 @@
     <WasmExtraFilesToDeploy Include="package.json" />
     <WasmExtraFilesToDeploy Include="package-lock.json" />
 
-    <NodeNpmModule Include="ws" Alias="WebSocket" />
+    <NodeNpmModule Include="ws" />
   </ItemGroup>
 
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->