Skip to content

Commit ce44e1b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#5516)
[main] Update dependencies from dotnet/arcade
1 parent a653daa commit ce44e1b

File tree

6 files changed

+30
-27
lines changed

6 files changed

+30
-27
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24223.8">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24229.1">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>e543752a4d92d8df16a9f95b89fcfdc50aeabf74</Sha>
9+
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24223.8">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24229.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>e543752a4d92d8df16a9f95b89fcfdc50aeabf74</Sha>
13+
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24223.8">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24229.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>e543752a4d92d8df16a9f95b89fcfdc50aeabf74</Sha>
17+
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24223.8</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24223.8</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24229.1</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24229.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

‎eng/common/template-guidance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ In the table above, a file is designated as "shim", "logic", or "redirect".
130130

131131
- redirect- represents a file in `core-templates` which redirects to the "logic" file in either `templates` or `templates-official`.
132132

133-
Logic for Arcade's templates live **primarily** in the `core-templates` folder. The exceptions to the location of the logic files are around artifact publishing, which is handled differently between 1es pipeline templates and standard templates. `templates` and `templates-official` provide shim entry points which redirect to `core-templates` while also defining the `is1ESPipeline` parameter. If a shim is referenced in `templates`, then `is1ESPipeline` is set to `false`. If a shim is referenced in `templates-official`, then `is1ESPipeline` is set to `true`.
133+
Logic for Arcade's templates live **primarily** in the `core-templates` folder. The exceptions to the location of the logic files are around artifact publishing, which is handled differently between 1es pipeline templates and standard templates. `templates` and `templates-official` provide shim entry points which redirect to `core-templates` while also defining the `is1ESPipeline` parameter. If a shim is referenced in `templates`, then `is1ESPipeline` is set to `false`. If a shim is referenced in `templates-official`, then `is1ESPipeline` is set to `true`.
134134

135135
Within `templates` and `templates-official`, the templates at the "stages", and "jobs" / "job" level have been replaced with shims. Templates at the "steps" and "variables" level are typically too granular to be replaced with shims and instead persist logic which is directly applicable to either scenario.
136136

137-
Within `core-templates`, there are a handful of places where logic is dependent on which shim entry point was used. In those places, we redirect back to the respective logic file in `templates` or `templates-official`.
137+
Within `core-templates`, there are a handful of places where logic is dependent on which shim entry point was used. In those places, we redirect back to the respective logic file in `templates` or `templates-official`.

‎eng/common/templates/job/job.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
parameters:
2+
enablePublishBuildArtifacts: false
3+
14
jobs:
25
- template: /eng/common/core-templates/job/job.yml
36
parameters:
@@ -16,7 +19,7 @@ jobs:
1619
- ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
1720
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
1821
parameters:
19-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
22+
is1ESPipeline: false
2023
args:
2124
displayName: Publish pipeline artifacts
2225
pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
@@ -27,7 +30,7 @@ jobs:
2730
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
2831
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
2932
parameters:
30-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
33+
is1ESPipeline: false
3134
args:
3235
targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log'
3336
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
@@ -38,7 +41,7 @@ jobs:
3841
- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
3942
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
4043
parameters:
41-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
44+
is1ESPipeline: false
4245
args:
4346
displayName: Publish Logs
4447
pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
@@ -50,7 +53,7 @@ jobs:
5053
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
5154
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
5255
parameters:
53-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
56+
is1ESPipeline: false
5457
args:
5558
targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
5659
artifactName: 'BuildConfiguration'

‎eng/common/templates/steps/publish-pipeline-artifacts.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ steps:
1919
${{ if parameters.args.continueOnError }}:
2020
continueOnError: ${{ parameters.args.continueOnError }}
2121
inputs:
22-
TargetPath: ${{ parameters.args.TargetPath }}
23-
${{ if parameters.args.ArtifactName }}:
24-
ArtifactName: ${{ parameters.args.ArtifactName }}
25-
${{ if parameters.args.PublishLocation }}:
26-
PublishLocation: ${{ parameters.args.PublishLocation }}
27-
${{ if parameters.args.FileSharePath }}:
28-
FileSharePath: ${{ parameters.args.FileSharePath }}
22+
targetPath: ${{ parameters.args.targetPath }}
23+
${{ if parameters.args.artifactName }}:
24+
artifactName: ${{ parameters.args.artifactName }}
25+
${{ if parameters.args.publishLocation }}:
26+
publishLocation: ${{ parameters.args.publishLocation }}
27+
${{ if parameters.args.fileSharePath }}:
28+
fileSharePath: ${{ parameters.args.fileSharePath }}
2929
${{ if parameters.args.Parallel }}:
30-
Parallel: ${{ parameters.args.Parallel }}
31-
${{ if parameters.args.ParallelCount }}:
32-
ParallelCount: ${{ parameters.args.ParallelCount }}
33-
${{ if parameters.args.Properties }}:
34-
Properties: ${{ properties.args.Properties }}
30+
parallel: ${{ parameters.args.Parallel }}
31+
${{ if parameters.args.parallelCount }}:
32+
parallelCount: ${{ parameters.args.parallelCount }}
33+
${{ if parameters.args.properties }}:
34+
properties: ${{ properties.args.properties }}

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": "9.0.100-preview.3.24204.13"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24223.8",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24229.1",
1818
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
1919
}
2020
}

0 commit comments

Comments
 (0)