Skip to content

Commit 70ea3e3

Browse files
committed
ci: reverts to generated nuget.config to avoid impacting external contributors
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
1 parent 6f295b8 commit 70ea3e3

3 files changed

Lines changed: 23 additions & 12 deletions

File tree

.azure-pipelines/ci-build.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,18 @@ extends:
7575
- task: NuGetAuthenticate@1
7676
displayName: 'Authenticate to Azure Artifacts'
7777

78+
- pwsh: |
79+
@"
80+
<?xml version="1.0" encoding="utf-8"?>
81+
<configuration>
82+
<packageSources>
83+
<clear />
84+
<add key="GraphDeveloperExperiences_Public" value="https://microsoftgraph.pkgs.visualstudio.com/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/GraphDeveloperExperiences_Public/nuget/v3/index.json" />
85+
</packageSources>
86+
</configuration>
87+
"@ | Set-Content -Path "$(Build.SourcesDirectory)/nuget.config" -Encoding UTF8
88+
displayName: 'Create nuget.config (central feed)'
89+
7890
- task: DotNetCoreCLI@2
7991
displayName: 'restore'
8092
inputs:
@@ -487,6 +499,7 @@ extends:
487499
--build-arg VSS_NUGET_EXTERNAL_FEED_ENDPOINTS \
488500
--build-arg VSS_NUGET_URI_PREFIXES \
489501
--secret id=vss_nuget_accesstoken,env=VSS_NUGET_ACCESSTOKEN \
502+
--secret id=nuget_config,src="$(Pipeline.Workspace)/nuget.config" \
490503
-t "$(REGISTRY)/$(IMAGE_NAME):nightly" \
491504
-t "$(REGISTRY)/$(IMAGE_NAME):${VERSION}.${BUILDDATE}${RUNNUMBER}" \
492505
"$(Pipeline.Workspace)"
@@ -510,6 +523,7 @@ extends:
510523
--build-arg VSS_NUGET_EXTERNAL_FEED_ENDPOINTS \
511524
--build-arg VSS_NUGET_URI_PREFIXES \
512525
--secret id=vss_nuget_accesstoken,env=VSS_NUGET_ACCESSTOKEN \
526+
--secret id=nuget_config,src="$(Pipeline.Workspace)/nuget.config" \
513527
-t "$(REGISTRY)/$(IMAGE_NAME):latest" \
514528
-t "$(REGISTRY)/$(IMAGE_NAME):${VERSION}" \
515529
"$(Pipeline.Workspace)"

Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@ ARG VSS_NUGET_EXTERNAL_FEED_ENDPOINTS
66

77
COPY ./src ./hidi/src
88
COPY ./Directory.Build.props ./hidi/Directory.Build.props
9-
COPY ./nuget.config ./hidi/nuget.config
109
COPY ./README.md ./hidi/README.md
1110
WORKDIR /app/hidi
12-
RUN wget -qO- https://aka.ms/install-artifacts-credprovider.sh | bash
13-
RUN --mount=type=secret,id=vss_nuget_accesstoken,target=/run/secrets/vss_nuget_accesstoken \
14-
VSS_NUGET_ACCESSTOKEN="$(cat /run/secrets/vss_nuget_accesstoken)" \
15-
dotnet publish ./src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj -c Release -p:RestoreConfigFile=/app/hidi/nuget.config
11+
RUN --mount=type=secret,id=vss_nuget_accesstoken,target=/run/secrets/vss_nuget_accesstoken,required=false \
12+
--mount=type=secret,id=nuget_config,target=/run/secrets/nuget_config,required=false \
13+
if [ -f /run/secrets/nuget_config ]; then \
14+
wget -qO- https://aka.ms/install-artifacts-credprovider.sh | bash && \
15+
VSS_NUGET_ACCESSTOKEN="$(cat /run/secrets/vss_nuget_accesstoken)" \
16+
dotnet publish ./src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj -c Release -p:RestoreConfigFile=/run/secrets/nuget_config; \
17+
else \
18+
dotnet publish ./src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj -c Release; \
19+
fi
1620

1721
FROM mcr.microsoft.com/dotnet/runtime:8.0-jammy-chiseled AS runtime
1822
WORKDIR /app

nuget.config

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)