Skip to content

Commit

Permalink
Use nuget config file
Browse files Browse the repository at this point in the history
  • Loading branch information
SaurabhMSFT committed Oct 11, 2024
1 parent a63e6fd commit a0ff3b1
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
2 changes: 1 addition & 1 deletion NuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<configuration>
<packageSources>
<clear />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<add key="VSTSNuGet" value="https://identitydivision.pkgs.visualstudio.com/_packaging/IDDP/nuget/v3/index.json" />
</packageSources>
</configuration>
5 changes: 5 additions & 0 deletions build/template-install-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ steps:
azureSubscription: 'AuthSdkResourceManager'
KeyVaultName: 'msidlabs'
SecretsFilter: 'LabAuth'

- task: NuGetAuthenticate@1
displayName: NuGet Authenticate
inputs:
nuGetServiceConnections: 'Internal Analyzers'

- powershell: |
$kvSecretBytes = [System.Convert]::FromBase64String('$(LabAuth)')
Expand Down
2 changes: 2 additions & 0 deletions build/template-pack-nuget.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ steps:
nobuild: '${{parameters.NoBuild}}'
packagesToPack: '${{ parameters.ProjectRootPath }}\${{ parameters.AssemblyName }}.csproj'
IncludeSymbols: true
feedsToUse: 'config'
nugetConfigPath: NuGet.config
verbosityPack: normal
packDirectory:
arguments: '--configuration ${{ parameters.BuildConfiguration }}'
6 changes: 6 additions & 0 deletions build/template-restore-build-MSIdentityWeb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ steps:
command: 'custom'
custom: 'build'
projects: '$(IdWebSourceDir)Microsoft.Identity.Web.sln'
feedsToUse: 'config'
nugetConfigPath: NuGet.config
arguments: '-p:configuration=${{ parameters.BuildConfiguration }} -p:RunCodeAnalysis=true -p:MicrosoftIdentityWebVersion=${{ parameters.MicrosoftIdentityWebVersion }} -p:SourceLinkCreate=true'

# This task is needed so that the 1CS Rolsyn analyzers task works.
Expand All @@ -27,6 +29,8 @@ steps:
inputs:
command: custom
custom: msbuild
feedsToUse: 'config'
nugetConfigPath: NuGet.config
project: '$(IdWebSourceDir)Microsoft.Identity.Web.sln'
arguments: '-p:configuration=${{ parameters.BuildConfiguration }} -p:RunCodeAnalysis=false -p:MicrosoftIdentityWebVersion=${{ parameters.MicrosoftIdentityWebVersion }} -p:SourceLinkCreate=true'

Expand All @@ -37,6 +41,8 @@ steps:
condition: and(succeeded(), eq(variables['PipelineType'], 'Legacy'))
inputs:
command: run
feedsToUse: 'config'
nugetConfigPath: NuGet.config
projects: '$(IdWebSourceDir)tests\DevApps\daemon-app\Daemon-app\Daemon-app.csproj'
arguments: '-f net7.0'

Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.Identity.Web.DownstreamApi/DownstreamApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,6 @@ internal async Task<HttpResponseMessage> CallApiInternalAsync(
return await client.SendAsync(retryHttpRequestMessage, cancellationToken).ConfigureAwait(false);
}
}

return downstreamApiResult;
}

Expand Down

0 comments on commit a0ff3b1

Please sign in to comment.