Update NuGet to point to Azure Artifacts. (#658) (#683)

* Update NuGet to point to Azure Artifacts. (#658) * Update NuGet to point to Azure Artifacts. * Update docker reference. * Reroute dotnet tool to public NuGet. * Update nbgv-set-version-steps.yml * Change the other nbgv to update too. Co-authored-by: David Alcantar <[email protected]> * Fix Test job Co-authored-by: Michael Scovetta <[email protected]> Co-authored-by: David Alcantar <[email protected]>
microsoft · Jan 6, 2023 · f1fa334 · f1fa334
1 parent f08478a
commit f1fa334
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 6 deletions.
diff --git a/NuGet.Config.AzureArtifacts b/NuGet.Config.AzureArtifacts
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="PublicRegistriesFeed" value="https://twcsecurityassurance.pkgs.visualstudio.com/SecurityEngineering/_packaging/PublicRegistriesFeed/nuget/v3/index.json" />
+  </packageSources>
+</configuration>
diff --git a/NuGet.Config → NuGet.Config.Public b/NuGet.Config → NuGet.Config.Public
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <clear/>
+    <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>
diff --git a/Pipelines/core-pipeline.yml b/Pipelines/core-pipeline.yml
@@ -105,8 +105,8 @@ stages:
       inputs:
         packageType: 'sdk'
         version: '${{ variables.CurrentSDK }}'
-    - script: 'dotnet tool update -g nbgv'
-      displayName: 'Install GitVersioning'
+    - script: 'dotnet tool update -g nbgv --configfile NuGet.Config.Public'
+      displayName: 'Update GitVersioning'
     - task: PowerShell@2
       displayName: Set Release Version
       inputs:

diff --git a/Pipelines/templates/dotnet-publish-linux-mac-job.yml b/Pipelines/templates/dotnet-publish-linux-mac-job.yml
@@ -46,6 +46,7 @@ jobs:
   pool:
     vmImage: 'ubuntu-latest'
   steps:
+  - task: NuGetAuthenticate@1  
   - task: UseDotNet@2
     displayName: Install Dotnet SDK
     inputs:
@@ -60,6 +61,8 @@ jobs:
     displayName: Restore
     inputs:
       command: 'restore'
+      feedsToUse: config
+      nugetConfigPath: NuGet.Config.AzureArtifacts
       projects: ${{ parameters.projectPath }}
       verbosityRestore: 'Normal'
   - task: DotNetCoreCLI@2

diff --git a/Pipelines/templates/dotnet-publish-win-netcore-job.yml b/Pipelines/templates/dotnet-publish-win-netcore-job.yml
@@ -46,6 +46,7 @@ jobs:
   pool:
     vmImage: 'windows-latest'
   steps:
+  - task: NuGetAuthenticate@1  
   - task: UseDotNet@2
     displayName: Install Dotnet SDK
     inputs:
@@ -60,6 +61,8 @@ jobs:
     displayName: Restore
     inputs:
       command: 'restore'
+      feedsToUse: config
+      nugetConfigPath: NuGet.Config.AzureArtifacts
       projects: ${{ parameters.projectPath }}
       verbosityRestore: 'Normal'
   - task: DotNetCoreCLI@2

diff --git a/Pipelines/templates/dotnet-test-job.yml b/Pipelines/templates/dotnet-test-job.yml
@@ -26,6 +26,7 @@ jobs:
   pool:
     vmImage: 'windows-latest'
   steps:
+  - task: NuGetAuthenticate@1
   - task: UseDotNet@2
     displayName: Install Dotnet SDK
     inputs:
@@ -36,8 +37,16 @@ jobs:
     inputs:
       packageType: 'sdk'
       version: ${{ parameters.dotnetVersionLTS }}
+  - task: DotNetCoreCLI@2
+    displayName: Dotnet Restore
+    inputs:
+      command: 'restore'
+      feedsToUse: config
+      nugetConfigPath: NuGet.Config.AzureArtifacts
+      projects: ${{ parameters.projectPath }}
+      verbosityRestore: 'Normal'
   - task: DotNetCoreCLI@2
     displayName: Dotnet Test
     inputs:
       command: 'test'
-      projects: ${{ parameters.projectPath }}
+      projects: ${{ parameters.projectPath }}
diff --git a/Pipelines/templates/nbgv-set-version-steps.yml b/Pipelines/templates/nbgv-set-version-steps.yml
@@ -1,6 +1,6 @@
 steps:
-- script: 'dotnet tool update -g nbgv'
-  displayName: 'Install GitVersioning'
+- script: 'dotnet tool update -g nbgv --configfile NuGet.Config.Public'
+  displayName: 'Update GitVersioning'
 - task: PowerShell@2
   displayName: Set Release Version
   inputs:

diff --git a/Pipelines/templates/nuget-build-job.yml b/Pipelines/templates/nuget-build-job.yml
@@ -42,6 +42,7 @@ jobs:
     vmImage: 'windows-latest'
   steps:
   - task: CodeQL3000Init@0
+  - task: NuGetAuthenticate@1
   - task: UseDotNet@2
     displayName: Install Dotnet SDK
     inputs:
@@ -55,6 +56,8 @@ jobs:
     displayName: Dotnet Restore
     inputs:
       command: 'restore'
+      feedsToUse: config
+      nugetConfigPath: NuGet.Config.AzureArtifacts
       projects: ${{ parameters.projectPath }}
       verbosityRestore: 'Normal'
   - task: DotNetCoreCLI@2