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.

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

Remove GenerateAzureDevOpsBuildManifest and associated code #6528

Merged
Merged
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
2 changes: 0 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ stages:
manifests: true
enableMicrobuild: true
enablePublishUsingPipelines: true
useBuildManifest: ${{ variables['_UseBuildManifest'] }}
workspace:
clean: all
jobs:
Expand Down Expand Up @@ -233,4 +232,3 @@ stages:
-TsaRepositoryName "Arcade"
-TsaCodebaseName "Arcade"
-TsaPublish $True'
useBuildManifest: ${{ variables['_UseBuildManifest'] }}
4 changes: 0 additions & 4 deletions eng/common-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ variables:
value: False
- name: _InternalBuildArgs
value: ''
- name: _UseBuildManifest
value: False

- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- name: _RunAsPublic
Expand All @@ -20,8 +18,6 @@ variables:
value: True
- name: _SignType
value: real
- name: _UseBuildManifest
value: False
# DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
# DotNet-HelixApi-Access provides: HelixApiAccessToken
Expand Down
10 changes: 0 additions & 10 deletions eng/common/templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ parameters:
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishUsingPipelines: false
useBuildManifest: false
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
Expand Down Expand Up @@ -243,12 +242,3 @@ jobs:
ArtifactName: AssetManifests
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))

- ${{ if eq(parameters.useBuildManifest, true) }}:
- task: PublishBuildArtifacts@1
displayName: Publish Build Manifest
inputs:
PathToPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/manifest.props'
PublishLocation: Container
ArtifactName: BuildManifests
continueOnError: ${{ parameters.continueOnError }}
11 changes: 0 additions & 11 deletions eng/common/templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ parameters:
symbolPublishingAdditionalParameters: ''
artifactsPublishingAdditionalParameters: ''
signingValidationAdditionalParameters: ''
useBuildManifest: false

# Which stages should finish execution before post-build stages start
validateDependsOn:
Expand Down Expand Up @@ -139,16 +138,6 @@ stages:
pool:
vmImage: 'windows-2019'
steps:
- ${{ if eq(parameters.useBuildManifest, true) }}:
- task: DownloadBuildArtifacts@0
displayName: Download build manifest
inputs:
buildType: specific
buildVersionToDownload: specific
project: $(AzDOProjectName)
pipeline: $(AzDOPipelineId)
buildId: $(AzDOBuildId)
artifactName: BuildManifests
- task: DownloadBuildArtifacts@0
displayName: Download Package Artifacts
inputs:
Expand Down
1 change: 0 additions & 1 deletion eng/publishing/v3/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ parameters:
enableSigningValidation: true
enableNugetValidation: true
publishInstallersAndChecksums: true
useBuildManifest: false

# These parameters let the user customize the call to sdk-task.ps1 for publishing
# symbols & general artifacts as well as for signing validation
Expand Down
11 changes: 0 additions & 11 deletions eng/publishing/v3/signing-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,6 @@ jobs:
pool:
vmImage: 'windows-2019'
steps:
- ${{ if eq(parameters.useBuildManifest, true) }}:
- task: DownloadBuildArtifacts@0
displayName: Download build manifest
inputs:
buildType: specific
buildVersionToDownload: specific
project: $(AzDOProjectName)
pipeline: $(AzDOPipelineId)
buildId: $(AzDOBuildId)
artifactName: BuildManifests

- task: DownloadBuildArtifacts@0
displayName: Download Package Artifacts
inputs:
Expand Down

This file was deleted.

16 changes: 1 addition & 15 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<PublishDependsOnTargets Condition="$(PublishToSourceBuildStorage)">$(PublishDependsOnTargets);PublishToSourceBuildStorage</PublishDependsOnTargets>
<PublishDependsOnTargets Condition="$(DotNetPublishUsingPipelines)">$(PublishDependsOnTargets);PublishToAzureDevOpsArtifacts</PublishDependsOnTargets>

<PublishDependsOnTargets>BeforePublish;GenerateBuildManifest;$(PublishDependsOnTargets)</PublishDependsOnTargets>
<PublishDependsOnTargets>BeforePublish;$(PublishDependsOnTargets)</PublishDependsOnTargets>
</PropertyGroup>

<Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets"/>
Expand Down Expand Up @@ -263,20 +263,6 @@

<Import Project="Sign.props" />

<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GenerateAzureDevOpsBuildManifest" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)"/>

<Target Name="GenerateBuildManifest">
<GenerateAzureDevOpsBuildManifest
AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
AzureDevOpsBuildId="$(BUILD_BUILDID)"
ItemsToSign="@(ItemsToSignPostBuild)"
StrongNameSignInfo="@(StrongNameSignInfo)"
FileSignInfo="@(FileSignInfo)"
FileExtensionSignInfo="@(FileExtensionSignInfo)"
ManifestPath="$(ArtifactsLogDir)/manifest.props" />
</Target>

<Import Project="SourceBuild/SourceBuildArcadePublish.targets" Condition="'$(ArcadeBuildFromSource)' == 'true'" />

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
- EnableStrongNameCheck : Whether strong name check should be performed.
-->

<PropertyGroup>
<BuildManifestFile Condition="Exists('$(BUILD_ARTIFACTSTAGINGDIRECTORY)/BuildManifests/manifest.props')">$(BUILD_ARTIFACTSTAGINGDIRECTORY)/BuildManifests/manifest.props</BuildManifestFile>
</PropertyGroup>

<Import Condition="'$(BuildManifestFile)' == '' and Exists('$(RepositoryEngineeringDir)Signing.props')" Project="$(RepositoryEngineeringDir)Signing.props" />
<Import Condition="Exists('$(BuildManifestFile)')" Project="$(BuildManifestFile)" />

Expand Down