Use Private Nuget Feed for OneBranch (#4557)

microsoft · Sep 24, 2024 · ee4a1bc · ee4a1bc
1 parent 44ff05a
commit ee4a1bc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/.azure/nuget.config b/.azure/nuget.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="msquic_PublicPackages" value="https://pkgs.dev.azure.com/mscodehub/msquic/_packaging/msquic_PublicPackages/nuget/v3/index.json" />
+  </packageSources>
+</configuration>
diff --git a/.azure/obtemplates/build-winkernel.yml b/.azure/obtemplates/build-winkernel.yml
@@ -13,6 +13,14 @@ jobs:
     ob_sdl_codeSignValidation_excludes: -|**\*.sys # Disable signing requirements for KM builds
     ob_spgo_enabled: true # Enable SPGO
   steps:
+  - task: NuGetCommand@2
+    displayName: Nuget Restore
+    target: windows_build_container2
+    inputs:
+      command: 'restore'
+      restoreSolution: msquic.kernel.sln
+      feedsToUse: 'config'
+      nugetConfigPath: .\.azure\nuget.config
   - script: scripts\onebranch-build-kernel.cmd ${{ parameters.config }} x64
     displayName: x64
     target: windows_build_container2

diff --git a/scripts/onebranch-build-kernel.cmd b/scripts/onebranch-build-kernel.cmd
@@ -1,3 +1,2 @@
 call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat
-msbuild msquic.kernel.sln -t:restore -p:RestorePackagesConfig=true /p:Configuration=%1 /p:Platform=%2
 msbuild msquic.kernel.sln -p:ONEBRANCH_BUILD=true /p:Configuration=%1 /p:Platform=%2 /p:QUIC_VER_SUFFIX=-official /p:QUIC_VER_BUILD_ID=%BUILD_BUILDID% /p:QUIC_VER_GIT_HASH=%BUILD_SOURCEVERSION%