uo9xpb74
/
tye
forked from tsai/tye
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20230420.2 (#1575) 

[main] Update dependencies from dotnet/arcade
main
dotnet-maestro[bot] 4 years ago
committed by GitHub
parent
d9f788be78
commit
61224488ae
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      eng/Version.Details.xml
  2. 15
      eng/common/templates/job/job.yml
  3. 13
      eng/common/templates/steps/component-governance.yml
  4. 2
      global.json

20
eng/Version.Details.xml
View File

@ -3,25 +3,25 @@
<ProductDependencies> <ProductDependencies>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23219.2"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23220.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7</Sha> <Sha>d75baf71a09ed067b48f484f29efc4e7f3e3df13</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23219.2"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23220.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7</Sha> <Sha>d75baf71a09ed067b48f484f29efc4e7f3e3df13</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23219.2"> <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23220.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7</Sha> <Sha>d75baf71a09ed067b48f484f29efc4e7f3e3df13</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23219.2"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23220.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7</Sha> <Sha>d75baf71a09ed067b48f484f29efc4e7f3e3df13</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23219.2"> <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23220.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7</Sha> <Sha>d75baf71a09ed067b48f484f29efc4e7f3e3df13</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4"> <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>

15
eng/common/templates/job/job.yml
View File

@ -25,7 +25,7 @@ parameters:
enablePublishTestResults: false enablePublishTestResults: false
enablePublishUsingPipelines: false enablePublishUsingPipelines: false
enableBuildRetry: false enableBuildRetry: false
disableComponentGovernance: false disableComponentGovernance: ''
componentGovernanceIgnoreDirectories: '' componentGovernanceIgnoreDirectories: ''
mergeTestResults: false mergeTestResults: false
testRunTitle: '' testRunTitle: ''
@ -155,11 +155,14 @@ jobs:
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
continueOnError: true continueOnError: true
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - template: /eng/common/templates/steps/component-governance.yml
- task: ComponentGovernanceComponentDetection@0 parameters:
continueOnError: true ${{ if eq(parameters.disableComponentGovernance, '') }}:
inputs: ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} disableComponentGovernance: false
${{ else }}:
disableComponentGovernance: true
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
- ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

13
eng/common/templates/steps/component-governance.yml
View File

@ -0,0 +1,13 @@
parameters:
disableComponentGovernance: false
componentGovernanceIgnoreDirectories: ''
steps:
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
displayName: Set skipComponentGovernanceDetection variable
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
- task: ComponentGovernanceComponentDetection@0
continueOnError: true
inputs:
ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

2
global.json
View File

@ -14,6 +14,6 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23219.2" "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23220.2"
} }
} }

Write Preview
Loading…
Cancel
Save