Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
- AzureStorageAccountKey
- AzureDevOpsFeedsBaseUrl
- ArtifactsCategory
- AzureStorageTargetFeedPAT : PAT for accessing dotnetfeed Azure Storage

Optional parameters for SetupTargetFeeds.proj
- PublishInstallersAndChecksums : This control whether installers & checksums should be published to public feeds on public builds
Expand Down Expand Up @@ -128,7 +127,6 @@
InternalChecksumsFeedKey="$(InternalChecksumsFeedKey)"
InternalInstallersFeedKey="$(InternalInstallersFeedKey)"
AzureDevOpsFeedsKey="$(AzureDevOpsFeedsKey)"
AzureStorageTargetFeedKey="$(AzureStorageTargetFeedPAT)"
AssetManifestPaths="@(ManifestFiles)"
BlobAssetsBasePath="$(BlobBasePath)"
PackageAssetsBasePath="$(PackageBasePath)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ namespace Microsoft.DotNet.Build.Tasks.Feed.Tests
{
public class SetupTargetFeedConfigV3Tests
{
private const string AzureStorageTargetFeedPAT = "AzureStorageTargetFeedPAT";
private const string LatestLinkShortUrlPrefix = "LatestLinkShortUrlPrefix";
private const string BuildQuality = "quality";
private const string AzureDevOpsFeedsKey = "AzureDevOpsFeedsKey";
Expand Down Expand Up @@ -149,7 +148,6 @@ public void StableFeeds(bool publishInstallersAndChecksums, bool isInternalBuild
isStableBuild: true,
repositoryName: "test-repo",
commitSha: "c0c0c0c0",
AzureStorageTargetFeedPAT,
publishInstallersAndChecksums,
InstallersTargetStaticFeed,
InstallersTargetStaticFeedKey,
Expand Down Expand Up @@ -262,7 +260,6 @@ public void NonStableAndInternal(bool publishInstallersAndChecksums)
isStableBuild: false,
repositoryName: "test-repo",
commitSha: "c0c0c0c0",
AzureStorageTargetFeedPAT,
publishInstallersAndChecksums,
InstallersTargetStaticFeed,
InstallersTargetStaticFeedKey,
Expand Down Expand Up @@ -329,7 +326,7 @@ public void NonStableAndPublic(bool publishInstallersAndChecksums)
TargetFeedContentType.Symbols,
PublishingConstants.LegacyDotNetBlobFeedURL,
FeedType.AzureStorageFeed,
AzureStorageTargetFeedPAT,
InstallersTargetStaticFeedKey,
latestLinkShortUrlPrefix: string.Empty,
assetSelection: AssetSelection.All,
isolated: false,
Expand Down Expand Up @@ -372,7 +369,6 @@ public void NonStableAndPublic(bool publishInstallersAndChecksums)
isStableBuild: false,
repositoryName: "test-repo",
commitSha: "c0c0c0c0",
AzureStorageTargetFeedPAT,
publishInstallersAndChecksums,
InstallersTargetStaticFeed,
InstallersTargetStaticFeedKey,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@ public class PublishArtifactsInManifest : MSBuildTaskBase

public bool PublishInstallersAndChecksums { get; set; } = false;

public string AzureStorageTargetFeedKey { get; set; }

public bool AllowFeedOverrides { get; set; }

public string ChecksumsFeedOverride { get; set; }
Expand Down Expand Up @@ -374,7 +372,6 @@ internal PublishArtifactsInManifestBase ConstructPublishingV3Task(BuildModel bui
CheckSumsFeedKey = this.ChecksumsFeedKey,
InternalCheckSumsFeedKey = this.InternalCheckSumsFeedKey,
InternalInstallersFeedKey = this.InternalInstallersFeedKey,
AzureStorageTargetFeedKey = this.AzureStorageTargetFeedKey,
PdbArtifactsBasePath = this.PdbArtifactsBasePath,
SymWebToken = this.SymWebToken,
MsdlToken = this.MsdlToken,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ public class PublishArtifactsInManifestV3 : PublishArtifactsInManifestBase
[Required]
public string AzureDevOpsFeedsKey { get; set; }

[Required]
public string AzureStorageTargetFeedKey { get; set; }

[Required]
public string InstallersFeedKey { get; set; }

Expand Down Expand Up @@ -149,7 +146,6 @@ public override async Task<bool> ExecuteAsync()
BuildModel.Identity.IsStable,
BuildModel.Identity.Name,
BuildModel.Identity.Commit,
AzureStorageTargetFeedKey,
PublishInstallersAndChecksums,
GetFeed(targetChannelConfig.InstallersFeed, InstallersFeedOverride),
targetChannelConfig.IsInternal ? InternalInstallersFeedKey : InstallersFeedKey,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ protected SetupTargetFeedConfigBase(bool isInternalBuild,
bool isStableBuild,
string repositoryName,
string commitSha,
string azureStorageTargetFeedPAT,
bool publishInstallersAndChecksums,
string installersTargetStaticFeed,
string installersAzureAccountKey,
Expand All @@ -44,7 +43,6 @@ protected SetupTargetFeedConfigBase(bool isInternalBuild,
IsStableBuild = isStableBuild;
RepositoryName = repositoryName;
CommitSha = commitSha;
AzureStorageTargetFeedPAT = azureStorageTargetFeedPAT;
PublishInstallersAndChecksums = publishInstallersAndChecksums;
InstallersTargetStaticFeed = installersTargetStaticFeed;
InstallersAzureAccountKey = installersAzureAccountKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public SetupTargetFeedConfigV3(bool isInternalBuild,
bool isStableBuild,
string repositoryName,
string commitSha,
string azureStorageTargetFeedPAT,
bool publishInstallersAndChecksums,
string installersTargetStaticFeed,
string installersAzureAccountKey,
Expand All @@ -59,7 +58,7 @@ public SetupTargetFeedConfigV3(bool isInternalBuild,
string azureDevOpsPublicStaticSymbolsFeed = null,
List<string> filesToExclude = null,
bool flatten = true)
: base(isInternalBuild, isStableBuild, repositoryName, commitSha, azureStorageTargetFeedPAT, publishInstallersAndChecksums, installersTargetStaticFeed, installersAzureAccountKey, checksumsTargetStaticFeed, checksumsAzureAccountKey, azureDevOpsStaticShippingFeed, azureDevOpsStaticTransportFeed, azureDevOpsStaticSymbolsFeed, latestLinkShortUrlPrefix, azureDevOpsFeedsKey)
: base(isInternalBuild, isStableBuild, repositoryName, commitSha, publishInstallersAndChecksums, installersTargetStaticFeed, installersAzureAccountKey, checksumsTargetStaticFeed, checksumsAzureAccountKey, azureDevOpsStaticShippingFeed, azureDevOpsStaticTransportFeed, azureDevOpsStaticSymbolsFeed, latestLinkShortUrlPrefix, azureDevOpsFeedsKey)
{
BuildEngine = buildEngine;
StableSymbolsFeed = stableSymbolsFeed;
Expand Down Expand Up @@ -155,7 +154,7 @@ private List<TargetFeedConfig> NonStableFeeds()
// This is pretty uncommon though, as non-stable internal builds are quite rare.
string symbolsFeed;
FeedType symbolsFeedType;
string symbolsFeedSecret;
string symbolsFeedSecret = string.Empty;

if (IsInternalBuild)
{
Expand All @@ -173,7 +172,6 @@ private List<TargetFeedConfig> NonStableFeeds()
{
symbolsFeed = PublishingConstants.LegacyDotNetBlobFeedURL;
symbolsFeedType = FeedType.AzureStorageFeed;
symbolsFeedSecret = AzureStorageTargetFeedPAT;
}

targetFeedConfigs.Add(
Expand Down