Skip to content

Commit 0b92e4c

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/6.0] Update dependencies from dotnet/arcade (#40624)
* Update dependencies from https://github.com/dotnet/arcade build 20220308.4 Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22158.4 * Update dependencies from https://github.com/dotnet/arcade build 20220309.8 Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent f5d3816 commit 0b92e4c

File tree

8 files changed

+97
-75
lines changed

8 files changed

+97
-75
lines changed

‎NuGet.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-c24d9a9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c24d9a9c/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-runtime -->
98
<!-- Begin: Package sources from dotnet-efcore -->
109
<add key="darc-int-dotnet-efcore-0257e5c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-0257e5c1/nuget/v3/index.json" />
@@ -30,7 +29,6 @@
3029
<add key="darc-int-dotnet-efcore-0257e5c" value="true" />
3130
<!-- End: Package sources from dotnet-efcore -->
3231
<!-- Begin: Package sources from dotnet-runtime -->
33-
<add key="darc-int-dotnet-runtime-c24d9a9" value="true" />
3432
<!-- End: Package sources from dotnet-runtime -->
3533
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3634
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22122.7">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22159.8">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
285+
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22122.7">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22159.8">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
290+
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22122.7">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22159.8">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
294+
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22122.7">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22159.8">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
298+
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.3</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.3</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22122.7</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22122.7</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22159.8</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22159.8</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

‎eng/common/templates/job/execute-sdl.yml

Lines changed: 9 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,9 @@ jobs:
4343
value: ${{ parameters.AzDOPipelineId }}
4444
- name: AzDOBuildId
4545
value: ${{ parameters.AzDOBuildId }}
46-
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
47-
# sync with the packages.config file.
48-
- name: DefaultGuardianVersion
49-
value: 0.110.1
46+
- template: /eng/common/templates/variables/sdl-variables.yml
5047
- name: GuardianVersion
5148
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
52-
- name: GuardianPackagesConfigFile
53-
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
5449
pool:
5550
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
5651
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
@@ -126,57 +121,11 @@ jobs:
126121
displayName: Extract Archive Artifacts
127122
continueOnError: ${{ parameters.sdlContinueOnError }}
128123

129-
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
130-
- powershell: |
131-
$content = Get-Content $(GuardianPackagesConfigFile)
132-
133-
Write-Host "packages.config content was:`n$content"
134-
135-
$content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
136-
$content | Set-Content $(GuardianPackagesConfigFile)
137-
138-
Write-Host "packages.config content updated to:`n$content"
139-
displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
140-
141-
- task: NuGetToolInstaller@1
142-
displayName: 'Install NuGet.exe'
143-
- task: NuGetCommand@2
144-
displayName: 'Install Guardian'
145-
inputs:
146-
restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
147-
feedsToUse: config
148-
nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
149-
externalFeedCredentials: GuardianConnect
150-
restoreDirectory: $(Build.SourcesDirectory)\.packages
151-
152-
- ${{ if ne(parameters.overrideParameters, '') }}:
153-
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
154-
displayName: Execute SDL
155-
continueOnError: ${{ parameters.sdlContinueOnError }}
156-
- ${{ if eq(parameters.overrideParameters, '') }}:
157-
- powershell: ${{ parameters.executeAllSdlToolsScript }}
158-
-GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
159-
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
160-
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
161-
${{ parameters.additionalParameters }}
162-
displayName: Execute SDL
163-
continueOnError: ${{ parameters.sdlContinueOnError }}
164-
165-
- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
166-
# We want to publish the Guardian results and configuration for easy diagnosis. However, the
167-
# '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
168-
# tooling files. Some of these files are large and aren't useful during an investigation, so
169-
# exclude them by simply deleting them before publishing. (As of writing, there is no documented
170-
# way to selectively exclude a dir from the pipeline artifact publish task.)
171-
- task: DeleteFiles@1
172-
displayName: Delete Guardian dependencies to avoid uploading
173-
inputs:
174-
SourceFolder: $(Agent.BuildDirectory)/.gdn
175-
Contents: |
176-
c
177-
i
178-
condition: succeededOrFailed()
179-
- publish: $(Agent.BuildDirectory)/.gdn
180-
artifact: GuardianConfiguration
181-
displayName: Publish GuardianConfiguration
182-
condition: succeededOrFailed()
124+
- template: /eng/common/templates/steps/execute-sdl.yml
125+
parameters:
126+
overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
127+
executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
128+
overrideParameters: ${{ parameters.overrideParameters }}
129+
additionalParameters: ${{ parameters.additionalParameters }}
130+
publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
131+
sdlContinueOnError: ${{ parameters.sdlContinueOnError }}

‎eng/common/templates/jobs/codeql-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
2222
# sync with the packages.config file.
2323
- name: DefaultGuardianVersion
24-
value: 0.109.0
24+
value: 0.110.1
2525
- name: GuardianPackagesConfigFile
2626
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
2727
- name: GuardianVersion

‎eng/common/templates/steps/execute-sdl.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
parameters:
2+
overrideGuardianVersion: ''
3+
executeAllSdlToolsScript: ''
4+
overrideParameters: ''
5+
additionalParameters: ''
6+
publishGuardianDirectoryToPipeline: false
7+
sdlContinueOnError: false
8+
condition: ''
9+
10+
steps:
11+
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
12+
- powershell: |
13+
$content = Get-Content $(GuardianPackagesConfigFile)
14+
15+
Write-Host "packages.config content was:`n$content"
16+
17+
$content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
18+
$content | Set-Content $(GuardianPackagesConfigFile)
19+
20+
Write-Host "packages.config content updated to:`n$content"
21+
displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
22+
23+
- task: NuGetToolInstaller@1
24+
displayName: 'Install NuGet.exe'
25+
26+
- task: NuGetCommand@2
27+
displayName: 'Install Guardian'
28+
inputs:
29+
restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
30+
feedsToUse: config
31+
nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
32+
externalFeedCredentials: GuardianConnect
33+
restoreDirectory: $(Build.SourcesDirectory)\.packages
34+
35+
- ${{ if ne(parameters.overrideParameters, '') }}:
36+
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
37+
displayName: Execute SDL
38+
continueOnError: ${{ parameters.sdlContinueOnError }}
39+
condition: ${{ parameters.condition }}
40+
41+
- ${{ if eq(parameters.overrideParameters, '') }}:
42+
- powershell: ${{ parameters.executeAllSdlToolsScript }}
43+
-GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
44+
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
45+
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
46+
${{ parameters.additionalParameters }}
47+
displayName: Execute SDL
48+
continueOnError: ${{ parameters.sdlContinueOnError }}
49+
condition: ${{ parameters.condition }}
50+
51+
- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
52+
# We want to publish the Guardian results and configuration for easy diagnosis. However, the
53+
# '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
54+
# tooling files. Some of these files are large and aren't useful during an investigation, so
55+
# exclude them by simply deleting them before publishing. (As of writing, there is no documented
56+
# way to selectively exclude a dir from the pipeline artifact publish task.)
57+
- task: DeleteFiles@1
58+
displayName: Delete Guardian dependencies to avoid uploading
59+
inputs:
60+
SourceFolder: $(Agent.BuildDirectory)/.gdn
61+
Contents: |
62+
c
63+
i
64+
condition: succeededOrFailed()
65+
- publish: $(Agent.BuildDirectory)/.gdn
66+
artifact: GuardianConfiguration
67+
displayName: Publish GuardianConfiguration
68+
condition: succeededOrFailed()

‎eng/common/templates/variables/sdl-variables.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
variables:
2+
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
3+
# sync with the packages.config file.
4+
- name: DefaultGuardianVersion
5+
value: 0.110.1
6+
- name: GuardianPackagesConfigFile
7+
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.10",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22122.7"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22159.8",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22159.8"
3434
}
3535
}

0 commit comments

Comments
 (0)