Skip to content

Fixup automatically created feed permissions #8037

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

Merged
mmitche merged 6 commits into from
Oct 20, 2021
Merged

Fixup automatically created feed permissions #8037

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f730ca6
Fixup automatically create feed permissions
mmitche Oct 13, 2021
6f474ea
Respond to feedback
mmitche Oct 13, 2021
5028cce
Respond to feedback
mmitche Oct 13, 2021
85411fa
Switch back to setting org feed permissions explicitly instead of thr…
mmitche Oct 18, 2021
f4da5c3
Fix isolated feed issue
mmitche Oct 19, 2021
796746e
Merge branch 'main' into fix-feed-perms
mmitche Oct 20, 2021
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
9 changes: 2 additions & 7 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,11 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>

<!-- Default publishing infra target is 2. -->
<PublishingInfraVersion Condition="'$(PublishingInfraVersion)' == ''">2</PublishingInfraVersion>
<!-- Default publishing infra target is 3. -->
<PublishingInfraVersion Condition="'$(PublishingInfraVersion)' == ''">3</PublishingInfraVersion>
</PropertyGroup>

<Import Project="SetupTargetFeeds.proj" Condition="'$(PublishingInfraVersion)' == '2'" />

<Target Name="Execute">
<CallTarget Targets="SetupTargetFeeds" Condition="'$(PublishingInfraVersion)' == '2'">
<Output TaskParameter="TargetOutputs" ItemName="TargetFeedConfig"/>
</CallTarget>

<Error Condition="'$(ManifestsBasePath)' == ''" Text="ManifestsBasePath is empty. Please provide the full path to asset manifest(s) directory." />
<Error Condition="'$(BlobBasePath)' == '' OR '$(PackageBasePath)' == ''" Text="A valid full path to BlobBasePath and PackageBasePath is required." />
Expand Down
22 changes: 12 additions & 10 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
- AzdoTargetFeedPAT : Required token to publish assets to feeds
-->

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
Comment thread
michellemcdaniel marked this conversation as resolved.
<AzureDevOpsOrg Condition="'$(AzureDevOpsOrg)' == ''">dnceng</AzureDevOpsOrg>
</PropertyGroup>

<Target Name="Execute">
<Error
Condition="'$(IsInternalBuild)' == ''"
Expand All @@ -34,21 +28,29 @@
Condition="'$(AzdoTargetFeedPAT)' == ''"
Text="Parameters 'AzdoTargetFeedPAT' is empty." />

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
<AzureDevOpsOrg Condition="'$(AzureDevOpsOrg)' == ''">dnceng</AzureDevOpsOrg>
<AzureDevOpsProject>internal</AzureDevOpsProject>
Comment thread
mmitche marked this conversation as resolved.
Outdated
<AzureDevOpsProject Condition="'$(IsInternalBuild)' == 'false'">public</AzureDevOpsProject>
</PropertyGroup>

<!--Create the shipping feed-->
<CreateAzureDevOpsFeed
IsInternal="$(IsInternalBuild)"
AzureDevOpsPersonalAccessToken="$(AzdoTargetFeedPAT)"
FeedName="$(FeedName)-shipping"
AzureDevOpsOrg="$(AzureDevOpsOrg)">
AzureDevOpsOrg="$(AzureDevOpsOrg)"
AzureDevOpsProject="$(AzureDevOpsProject)">
<Output TaskParameter="TargetFeedURL" PropertyName="ShippingAzdoPackageFeedURL"/>
</CreateAzureDevOpsFeed>

<!--Create the nonshipping feed-->
<CreateAzureDevOpsFeed
IsInternal="$(IsInternalBuild)"
AzureDevOpsPersonalAccessToken="$(AzdoTargetFeedPAT)"
FeedName="$(FeedName)-nonshipping"
AzureDevOpsOrg="$(AzureDevOpsOrg)">
AzureDevOpsOrg="$(AzureDevOpsOrg)"
AzureDevOpsProject="$(AzureDevOpsProject)">
<Output TaskParameter="TargetFeedURL" PropertyName="NonShippingAzdoPackageFeedURL"/>
</CreateAzureDevOpsFeed>

Expand Down
Loading