Skip to content

Commit b9270af

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240531.1 (#9189)
[main] Update dependencies from dotnet/arcade
1 parent 5d642be commit b9270af

File tree

12 files changed

+95
-12
lines changed

12 files changed

+95
-12
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,25 +157,25 @@
157157
</Dependency>
158158
</ProductDependencies>
159159
<ToolsetDependencies>
160-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24280.3">
160+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24281.1">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>9b8585c16d6775bfc669fcabb55958848e36237c</Sha>
162+
<Sha>e6b3f32f9855dccbe2447471c8f729b66f17d242</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24280.3">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24281.1">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>9b8585c16d6775bfc669fcabb55958848e36237c</Sha>
166+
<Sha>e6b3f32f9855dccbe2447471c8f729b66f17d242</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24280.3">
168+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24281.1">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>9b8585c16d6775bfc669fcabb55958848e36237c</Sha>
170+
<Sha>e6b3f32f9855dccbe2447471c8f729b66f17d242</Sha>
171171
</Dependency>
172172
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174174
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24280.3">
176+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24281.1">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>9b8585c16d6775bfc669fcabb55958848e36237c</Sha>
178+
<Sha>e6b3f32f9855dccbe2447471c8f729b66f17d242</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
181181
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<!-- Packages that come from https://github.com/dotnet/arcade -->
5050
<PropertyGroup>
5151
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24280.3</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24281.1</MicrosoftDotNetCodeAnalysisPackageVersion>
5353
</PropertyGroup>
5454
<!-- Sourcelink -->
5555
<PropertyGroup>

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ parameters:
3333

3434
is1ESPipeline: ''
3535

36+
# If set to true and running on a non-public project,
37+
# Internal nuget and blob storage locations will be enabled.
38+
# This is not enabled by default because many repositories do not need internal sources
39+
# and do not need to have the required service connections approved in the pipeline.
40+
enableInternalSources: false
41+
3642
jobs:
3743
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
3844
displayName: Source-Build (${{ parameters.platform.name }})
@@ -74,6 +80,13 @@ jobs:
7480
- ${{ if eq(parameters.is1ESPipeline, '') }}:
7581
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
7682

83+
- ${{ if eq(parameters.enableInternalSources, true) }}:
84+
- template: /eng/common/core-templates/steps/enable-internal-sources.yml
85+
parameters:
86+
is1ESPipeline: ${{ parameters.is1ESPipeline }}
87+
- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml
88+
parameters:
89+
is1ESPipeline: ${{ parameters.is1ESPipeline }}
7790
- template: /eng/common/core-templates/steps/source-build.yml
7891
parameters:
7992
is1ESPipeline: ${{ parameters.is1ESPipeline }}

‎eng/common/core-templates/jobs/source-build.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ parameters:
2323

2424
is1ESPipeline: ''
2525

26+
# If set to true and running on a non-public project,
27+
# Internal nuget and blob storage locations will be enabled.
28+
# This is not enabled by default because many repositories do not need internal sources
29+
# and do not need to have the required service connections approved in the pipeline.
30+
enableInternalSources: false
31+
2632
jobs:
2733

2834
- ${{ if ne(parameters.allCompletedJobId, '') }}:
@@ -41,10 +47,12 @@ jobs:
4147
is1ESPipeline: ${{ parameters.is1ESPipeline }}
4248
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4349
platform: ${{ platform }}
50+
enableInternalSources: ${{ parameters.enableInternalSources }}
4451

4552
- ${{ if eq(length(parameters.platforms), 0) }}:
4653
- template: /eng/common/core-templates/job/source-build.yml
4754
parameters:
4855
is1ESPipeline: ${{ parameters.is1ESPipeline }}
4956
jobNamePrefix: ${{ parameters.jobNamePrefix }}
5057
platform: ${{ parameters.defaultManagedPlatform }}
58+
enableInternalSources: ${{ parameters.enableInternalSources }}

‎eng/common/core-templates/steps/enable-internal-runtimes.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64'
2+
# variable with the base64-encoded SAS token, by default
3+
4+
parameters:
5+
- name: federatedServiceConnection
6+
type: string
7+
default: 'dotnetbuilds-internal-read'
8+
- name: outputVariableName
9+
type: string
10+
default: 'dotnetbuilds-internal-container-read-token-base64'
11+
- name: expiryInHours
12+
type: number
13+
default: 1
14+
- name: base64Encode
15+
type: boolean
16+
default: true
17+
- name: is1ESPipeline
18+
type: boolean
19+
default: false
20+
21+
steps:
22+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
23+
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
24+
parameters:
25+
federatedServiceConnection: ${{ parameters.federatedServiceConnection }}
26+
outputVariableName: ${{ parameters.outputVariableName }}
27+
expiryInHours: ${{ parameters.expiryInHours }}
28+
base64Encode: ${{ parameters.base64Encode }}
29+
storageAccount: dotnetbuilds
30+
container: internal
31+
permissions: rl
32+
is1ESPipeline: ${{ parameters.is1ESPipeline }}

‎eng/common/core-templates/steps/enable-internal-sources.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ parameters:
33
- name: nugetFederatedServiceConnection
44
type: string
55
default: 'dnceng-artifacts-feeds-read'
6+
- name: is1ESPipeline
7+
type: boolean
8+
default: false
69

710
steps:
811
- ${{ if ne(variables['System.TeamProject'], 'public') }}:

‎eng/common/core-templates/steps/source-build.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ parameters:
1414
is1ESPipeline: false
1515

1616
steps:
17-
- template: /eng/common/core-templates/steps/enable-internal-sources.yml
1817
# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.)
1918
- script: |
2019
set -x

‎eng/common/cross/armv6/sources.list.bookworm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
deb http://raspbian.raspberrypi.org/raspbian/ bookworm main contrib non-free rpi
2+
deb-src http://raspbian.raspberrypi.org/raspbian/ bookworm main contrib non-free rpi

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,13 @@ while :; do
314314
bullseye) # Debian 11
315315
__CodeName=bullseye
316316

317+
if [[ -z "$__UbuntuRepo" ]]; then
318+
__UbuntuRepo="http://ftp.debian.org/debian/"
319+
fi
320+
;;
321+
bookworm) # Debian 12
322+
__CodeName=bookworm
323+
317324
if [[ -z "$__UbuntuRepo" ]]; then
318325
__UbuntuRepo="http://ftp.debian.org/debian/"
319326
fi

‎eng/common/templates-official/steps/enable-internal-runtimes.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64'
2+
# variable with the base64-encoded SAS token, by default
3+
steps:
4+
- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml
5+
parameters:
6+
is1ESPipeline: true
7+
8+
${{ each parameter in parameters }}:
9+
${{ parameter.key }}: ${{ parameter.value }}

0 commit comments

Comments
 (0)