Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .pipelines/azure_pipeline_mergedbranches.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,8 @@ extends:
displayName: 'install prereqs'
- task: CodeQL3000Init@0
condition: eq(variables.IS_MAIN_BRANCH, true)
- task: NuGetAuthenticate@1
displayName: 'Authenticate to CFS NuGet feed'
- script: |
setlocal enabledelayedexpansion
powershell.exe -ExecutionPolicy Unrestricted -NoProfile -WindowStyle Hidden -File "build\windows\Makefile.ps1"
Expand Down Expand Up @@ -591,6 +593,8 @@ extends:
displayName: 'install prereqs'
- task: CodeQL3000Init@0
condition: eq(variables.IS_MAIN_BRANCH, true)
- task: NuGetAuthenticate@1
displayName: 'Authenticate to CFS NuGet feed'
- script: |
setlocal enabledelayedexpansion
powershell.exe -ExecutionPolicy Unrestricted -NoProfile -WindowStyle Hidden -File "build\windows\Makefile.ps1"
Expand Down
7 changes: 7 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="PublicPackages" value="https://pkgs.dev.azure.com/github-private/microsoft/_packaging/microsoft_PublicPackages/nuget/v3/index.json" />
</packageSources>
</configuration>
7 changes: 3 additions & 4 deletions build/windows/Makefile.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,9 @@ if ($false -eq (Test-Path -Path $certsrcdir)) {
Write-Host("set the cerificate generator source code directory : " + $certsrcdir + " ...")
Set-Location -Path $certsrcdir

Write-Host("Adding dotnet packages Newtonsoft.json and BouncyCastle ...")
dotnet add package Newtonsoft.json
dotnet add package BouncyCastle
Write-Host("Successfully added dotnet packages") -ForegroundColor Green
# Newtonsoft.Json and BouncyCastle are pinned as PackageReference in CertificateGenerator.csproj.
# 'dotnet add package' without a version resolves the latest from the configured source, which
# reaches api.nuget.org and un-pins the versions at build time. Restore below uses NuGet.config.
dotnet build -f $dotnetcoreframework
Write-Host("Building Certificate generator code and ...") -ForegroundColor Green

Expand Down
Loading