Add nuget with additional logging

dotnet · Jul 4, 2024 · eeb12b4 · eeb12b4
1 parent c924cd0
commit eeb12b4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml
@@ -312,17 +312,17 @@ stages:
         vmrBranch: ${{ parameters.vmrBranch }}
     jobs:
 
-    - template: ../jobs/vmr-build.yml
-      parameters:
-        buildName: ${{ format('{0}_DevVersions', variables.ubuntuName) }}
-        isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
-        vmrBranch: ${{ variables.VmrBranch }}
-        architecture: x64
-        pool: ${{ parameters.pool_Linux }}
-        container: ${{ variables.ubuntuContainer }}
-        targetOS: linux
-        targetArchitecture: x64
-        useDevVersions: true # Use dev versions for CI validation of the experience. If we decide to ship assets from this leg, then we should remove this option.
+    #- template: ../jobs/vmr-build.yml
+    #  parameters:
+    #    buildName: ${{ format('{0}_DevVersions', variables.ubuntuName) }}
+    #    isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+    #    vmrBranch: ${{ variables.VmrBranch }}
+    #    architecture: x64
+    #    pool: ${{ parameters.pool_Linux }}
+    #    container: ${{ variables.ubuntuContainer }}
+    #    targetOS: linux
+    #    targetArchitecture: x64
+    #    useDevVersions: true # Use dev versions for CI validation of the experience. If we decide to ship assets from this leg, then we should remove this option.
 
     - template: ../jobs/vmr-build.yml
       parameters:

diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh
@@ -228,6 +228,12 @@ function Build {
 
     InitializeToolset
 
+    "$DOTNET_INSTALL_DIR/dotnet" build-server shutdown
+
+    tdnf install -y unzip || true
+
+    unzip -o -j "$scriptroot/eng/nuget-files.zip" -d "$DOTNET_INSTALL_DIR/sdk/9.0.100-preview.6.24311.23/"
+
     # Manually unset NUGET_PACKAGES as InitializeToolset sets it unconditionally.
     # The env var shouldn't be set so that the RestorePackagesPath msbuild property is respected.
     unset NUGET_PACKAGES

diff --git a/src/SourceBuild/content/eng/build.ps1 b/src/SourceBuild/content/eng/build.ps1
@@ -79,6 +79,10 @@ if ($dev) {
 function Build {
   InitializeToolset
 
+  & "$env:DOTNET_INSTALL_DIR\dotnet.exe" build-server shutdown
+
+  Expand-Archive -Force -Path $PSScriptRoot\nuget-files.zip -Destination $env:DOTNET_INSTALL_DIR\sdk\9.0.100-preview.6.24311.23\
+
   # Manually unset NUGET_PACKAGES as InitializeToolset sets it unconditionally.
   # The env var shouldn't be set so that the RestorePackagesPath msbuild property is respected.
   $env:NUGET_PACKAGES=''

diff --git a/src/SourceBuild/content/eng/nuget-files.zip b/src/SourceBuild/content/eng/nuget-files.zip