Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
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
5 changes: 5 additions & 0 deletions 5 src/arcade/.azuredevops/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version: 2

# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
enable-campaigned-updates: false
enable-security-updates: false
2 changes: 1 addition & 1 deletion 2 src/arcade/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.dnceng.secretmanager": {
"version": "1.1.0-beta.25555.6",
"version": "1.1.0-beta.25564.1",
"commands": [
"secret-manager"
]
Expand Down
10 changes: 5 additions & 5 deletions 10 src/arcade/eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ This file should be imported by eng/Versions.props
<!-- dotnet/templating dependencies -->
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-preview.4.25220.1</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25560.1</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25560.1</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25562.6</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25562.6</MicrosoftDotNetHelixSdkPackageVersion>
<!-- dotnet/arcade-services dependencies -->
<MicrosoftDotNetDarcLibPackageVersion>1.1.0-beta.25557.3</MicrosoftDotNetDarcLibPackageVersion>
<MicrosoftDotNetProductConstructionServiceClientPackageVersion>1.1.0-beta.25557.3</MicrosoftDotNetProductConstructionServiceClientPackageVersion>
<MicrosoftDotNetDarcLibPackageVersion>1.1.0-beta.25564.1</MicrosoftDotNetDarcLibPackageVersion>
<MicrosoftDotNetProductConstructionServiceClientPackageVersion>1.1.0-beta.25564.1</MicrosoftDotNetProductConstructionServiceClientPackageVersion>
<!-- dotnet/xharness dependencies -->
<MicrosoftDotNetXHarnessCLIPackageVersion>10.0.0-prerelease.25513.3</MicrosoftDotNetXHarnessCLIPackageVersion>
<!-- dotnet/symreader-converter dependencies -->
Expand Down Expand Up @@ -50,7 +50,7 @@ This file should be imported by eng/Versions.props
<!-- dotnet/command-line-api dependencies -->
<SystemCommandLinePackageVersion>2.0.0-beta5.25210.1</SystemCommandLinePackageVersion>
<!-- dotnet/dnceng dependencies -->
<MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.25555.6</MicrosoftDncEngSecretManagerPackageVersion>
<MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.25564.1</MicrosoftDncEngSecretManagerPackageVersion>
<!-- dotnet/msbuild dependencies -->
<MicrosoftBuildPackageVersion>17.12.50</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>17.12.50</MicrosoftBuildFrameworkPackageVersion>
Expand Down
20 changes: 10 additions & 10 deletions 20 src/arcade/eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>43b5827697e501c442eb75ffff832cd4df2514fe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25560.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25562.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3a7f017be1c42a4ecc516446977cf55d429cf390</Sha>
<Sha>4bb60deca10193c27f5bdf0a6afc5878ef558455</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25560.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25562.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3a7f017be1c42a4ecc516446977cf55d429cf390</Sha>
<Sha>4bb60deca10193c27f5bdf0a6afc5878ef558455</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ProductConstructionService.Client" Version="1.1.0-beta.25557.3">
<Dependency Name="Microsoft.DotNet.ProductConstructionService.Client" Version="1.1.0-beta.25564.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>8f84b3f03acec6ddc12e110c71133dfebda5f0f2</Sha>
<Sha>526aa00e2a2533e0263e50f299d5525572c48c18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25557.3">
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25564.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>8f84b3f03acec6ddc12e110c71133dfebda5f0f2</Sha>
<Sha>526aa00e2a2533e0263e50f299d5525572c48c18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="10.0.0-prerelease.25513.3">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand Down Expand Up @@ -144,9 +144,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25555.6">
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25564.1">
<Uri>https://github.com/dotnet/dnceng</Uri>
<Sha>355356d2cce11feb84134ac05083770d911d5f21</Sha>
<Sha>79d5ba9594a98c05483843e8bc018e312bc5817b</Sha>
</Dependency>
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
<Dependency Name="Microsoft.Build" Version="17.12.50">
Expand Down
4 changes: 0 additions & 4 deletions 4 src/arcade/eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ parameters:
testRunTitle: ''
testResultsFormat: ''
name: ''
componentGovernanceSteps: []
preSteps: []
artifactPublishSteps: []
runAsPublic: false
Expand Down Expand Up @@ -150,9 +149,6 @@ jobs:
- ${{ each step in parameters.steps }}:
- ${{ step }}

- ${{ each step in parameters.componentGovernanceSteps }}:
- ${{ step }}

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ jobs:
artifactName: AssetManifests
displayName: 'Publish Merged Manifest'
retryCountOnTaskFailure: 10 # for any logs being locked
sbomEnabled: false # we don't need SBOM for logs
isProduction: false

- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
parameters:
Expand Down

This file was deleted.

60 changes: 10 additions & 50 deletions 60 src/arcade/eng/common/core-templates/steps/generate-sbom.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,14 @@
# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated.
# PackageName - The name of the package this SBOM represents.
# PackageVersion - The version of the package this SBOM represents.
# ManifestDirPath - The path of the directory where the generated manifest files will be placed
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.

parameters:
PackageVersion: 11.0.0
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
PackageName: '.NET'
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
IgnoreDirectories: ''
sbomContinueOnError: true
is1ESPipeline: false
# disable publishArtifacts if some other step is publishing the artifacts (like job.yml).
publishArtifacts: true
PackageVersion: unused
BuildDropPath: unused
PackageName: unused
ManifestDirPath: unused
IgnoreDirectories: unused
sbomContinueOnError: unused
is1ESPipeline: unused
publishArtifacts: unused

steps:
- task: PowerShell@2
displayName: Prep for SBOM generation in (Non-linux)
condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin'))
inputs:
filePath: ./eng/common/generate-sbom-prep.ps1
arguments: ${{parameters.manifestDirPath}}

# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461
- script: |
chmod +x ./eng/common/generate-sbom-prep.sh
./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}}
displayName: Prep for SBOM generation in (Linux)
condition: eq(variables['Agent.Os'], 'Linux')
continueOnError: ${{ parameters.sbomContinueOnError }}

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'Generate SBOM manifest'
continueOnError: ${{ parameters.sbomContinueOnError }}
inputs:
PackageName: ${{ parameters.packageName }}
BuildDropPath: ${{ parameters.buildDropPath }}
PackageVersion: ${{ parameters.packageVersion }}
ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
${{ if ne(parameters.IgnoreDirectories, '') }}:
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'

- ${{ if eq(parameters.publishArtifacts, 'true')}}:
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
args:
displayName: Publish SBOM manifest
continueOnError: ${{parameters.sbomContinueOnError}}
targetPath: '${{ parameters.manifestDirPath }}'
artifactName: $(ARTIFACT_NAME)

echo "##vso[task.logissue type=warning]Including generate-sbom.yml is deprecated, SBOM generation is handled 1ES PT now. Remove this include."
displayName: Issue generate-sbom.yml deprecation warning
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ steps:
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
continueOnError: true
condition: succeededOrFailed()
sbomEnabled: false # we don't need SBOM for logs
isProduction: false
29 changes: 0 additions & 29 deletions 29 src/arcade/eng/common/generate-sbom-prep.ps1

This file was deleted.

39 changes: 0 additions & 39 deletions 39 src/arcade/eng/common/generate-sbom-prep.sh

This file was deleted.

2 changes: 0 additions & 2 deletions 2 src/arcade/eng/common/template-guidance.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ eng\common\
publish-build-artifacts.yml (logic)
publish-pipeline-artifacts.yml (logic)
component-governance.yml (shim)
generate-sbom.yml (shim)
publish-logs.yml (shim)
retain-build.yml (shim)
send-to-helix.yml (shim)
Expand All @@ -107,7 +106,6 @@ eng\common\
setup-maestro-vars.yml (logic)
steps\
component-governance.yml (logic)
generate-sbom.yml (logic)
publish-build-artifacts.yml (redirect)
publish-logs.yml (logic)
publish-pipeline-artifacts.yml (redirect)
Expand Down
30 changes: 7 additions & 23 deletions 30 src/arcade/eng/common/templates-official/job/job.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
parameters:
# Sbom related params
enableSbom: true
runAsPublic: false
PackageVersion: 9.0.0
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
# Sbom related params, unused now and can eventually be removed
enableSbom: unused
PackageVersion: unused
BuildDropPath: unused

jobs:
- template: /eng/common/core-templates/job/job.yml
parameters:
is1ESPipeline: true

componentGovernanceSteps:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
- template: /eng/common/templates/steps/generate-sbom.yml
parameters:
PackageVersion: ${{ parameters.packageVersion }}
BuildDropPath: ${{ parameters.buildDropPath }}
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
publishArtifacts: false

# publish artifacts
# for 1ES managed templates, use the templateContext.output to handle multiple outputs.
templateContext:
Expand All @@ -41,7 +32,7 @@ jobs:
continueOnError: true
condition: always()
retryCountOnTaskFailure: 10 # for any logs being locked
sbomEnabled: false # we don't need SBOM for logs
isProduction: false

- ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
- output: buildArtifacts
Expand All @@ -51,22 +42,15 @@ jobs:
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
continueOnError: true
condition: always()
sbomEnabled: false # we don't need SBOM for logs
#isProduction: false

- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
- output: pipelineArtifact
targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration'
artifactName: 'BuildConfiguration'
displayName: 'Publish build retry configuration'
continueOnError: true
sbomEnabled: false # we don't need SBOM for BuildConfiguration

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
- output: pipelineArtifact
displayName: Publish SBOM manifest
continueOnError: true
targetPath: $(Build.ArtifactStagingDirectory)/sbom
artifactName: $(ARTIFACT_NAME)
isProduction: false

# add any outputs provided via root yaml
- ${{ if ne(parameters.templateContext.outputs, '') }}:
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ steps:
properties: ${{ parameters.args.properties }}
${{ if parameters.args.sbomEnabled }}:
sbomEnabled: ${{ parameters.args.sbomEnabled }}
${{ if parameters.args.isProduction }}:
isProduction: ${{ parameters.args.isProduction }}
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.