Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow feeds to be created in staging AzDO org #15236

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow feeds to be created in staging AzDO org #15236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ public override async Task<bool> ExecuteAsync()
targetChannelConfig.SymbolTargetType,
filesToExclude: targetChannelConfig.FilenamesToExclude,
flatten: targetChannelConfig.Flatten,
log: Log);
log: Log,
azureDevOpsOrg: AzureDevOpsOrg);

var targetFeedConfigs = targetFeedsSetup.Setup();

Expand Down
8 changes: 6 additions & 2 deletions src/Microsoft.DotNet.Build.Tasks.Feed/src/model/SetupTargetFeedConfigV3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ public class SetupTargetFeedConfigV3 : SetupTargetFeedConfigBase

public TaskLoggingHelper Log { get; }

public string AzureDevOpsOrg => "dnceng";
private string _azureDevOpsOrg;

public string AzureDevOpsOrg => _azureDevOpsOrg ?? "dnceng";

public SetupTargetFeedConfigV3(
TargetChannelConfig targetChannelConfig,
Expand All @@ -49,7 +51,8 @@ public SetupTargetFeedConfigV3(
string stableSymbolsFeed = null,
ImmutableList<string> filesToExclude = null,
bool flatten = true,
TaskLoggingHelper log = null)
TaskLoggingHelper log = null,
string azureDevOpsOrg = null)
: base(isInternalBuild, isStableBuild, repositoryName, commitSha, publishInstallersAndChecksums, null, null, null, null, null, null, null, latestLinkShortUrlPrefixes, null)
{
_targetChannelConfig = targetChannelConfig;
Expand All @@ -64,6 +67,7 @@ public SetupTargetFeedConfigV3(
FeedOverrides = feedOverrides.ToImmutableDictionary(i => i.ItemSpec, i => i.GetMetadata("Replacement"));
AzureDevOpsFeedsKey = FeedKeys.TryGetValue("https://pkgs.dev.azure.com/dnceng", out string key) ? key : null;
Log = log;
_azureDevOpsOrg = azureDevOpsOrg;
}

private static string ConvertFromBase64(string value)
Expand Down
Loading