Skip to content

Commit 149d35a

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240506.2 (#5528)
[main] Update dependencies from dotnet/arcade
1 parent 1a3fdfe commit 149d35a

File tree

6 files changed

+67
-49
lines changed

6 files changed

+67
-49
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.24253.1">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24256.2">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
9+
<Sha>9fc042c22b0e538c7f1b412127b265ca2fc77334</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24253.1">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24256.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
13+
<Sha>9fc042c22b0e538c7f1b412127b265ca2fc77334</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24253.1">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24256.2">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
17+
<Sha>9fc042c22b0e538c7f1b412127b265ca2fc77334</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.24253.1</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24253.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24256.2</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24256.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

‎eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20240129.2
3+
sourceIndexUploadPackageVersion: 2.0.0-20240502.12
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
45
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
56
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
67
preSteps: []
@@ -15,14 +16,14 @@ jobs:
1516
dependsOn: ${{ parameters.dependsOn }}
1617
condition: ${{ parameters.condition }}
1718
variables:
18-
- name: SourceIndexPackageVersion
19-
value: ${{ parameters.sourceIndexPackageVersion }}
19+
- name: SourceIndexUploadPackageVersion
20+
value: ${{ parameters.sourceIndexUploadPackageVersion }}
21+
- name: SourceIndexProcessBinlogPackageVersion
22+
value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
2023
- name: SourceIndexPackageSource
2124
value: ${{ parameters.sourceIndexPackageSource }}
2225
- name: BinlogPath
2326
value: ${{ parameters.binlogPath }}
24-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
25-
- group: source-dot-net stage1 variables
2627
- template: /eng/common/core-templates/variables/pool-providers.yml
2728
parameters:
2829
is1ESPipeline: ${{ parameters.is1ESPipeline }}
@@ -54,8 +55,8 @@ jobs:
5455
workingDirectory: $(Agent.TempDirectory)
5556

5657
- script: |
57-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
58-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
58+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
59+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
5960
displayName: Download Tools
6061
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
6162
workingDirectory: $(Agent.TempDirectory)
@@ -67,7 +68,24 @@ jobs:
6768
displayName: Process Binlog into indexable sln
6869

6970
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
70-
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
71-
displayName: Upload stage1 artifacts to source index
72-
env:
73-
BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
71+
- task: AzureCLI@2
72+
displayName: Get stage 1 auth token
73+
inputs:
74+
azureSubscription: 'SourceDotNet Stage1 Publish'
75+
addSpnToEnvironment: true
76+
scriptType: 'ps'
77+
scriptLocation: 'inlineScript'
78+
inlineScript: |
79+
echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId"
80+
echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken"
81+
echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId"
82+
83+
- script: |
84+
echo "Client ID: $(ARM_CLIENT_ID)"
85+
echo "ID Token: $(ARM_ID_TOKEN)"
86+
echo "Tenant ID: $(ARM_TENANT_ID)"
87+
az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
88+
displayName: "Login to Azure"
89+
90+
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
91+
displayName: Upload stage1 artifacts to source index

‎eng/common/core-templates/post-build/post-build.yml

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,13 @@ stages:
115115
os: windows
116116
# If it's not devdiv, it's dnceng
117117
${{ else }}:
118-
name: $(DncEngInternalBuildPool)
119-
image: 1es-windows-2022
120-
os: windows
118+
${{ if eq(parameters.is1ESPipeline, true) }}:
119+
name: $(DncEngInternalBuildPool)
120+
image: windows.vs2022.amd64
121+
os: windows
122+
${{ else }}:
123+
name: $(DncEngInternalBuildPool)
124+
demands: ImageOverride -equals windows.vs2022.amd64
121125

122126
steps:
123127
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -156,9 +160,13 @@ stages:
156160
os: windows
157161
# If it's not devdiv, it's dnceng
158162
${{ else }}:
159-
name: $(DncEngInternalBuildPool)
160-
image: 1es-windows-2022
161-
os: windows
163+
${{ if eq(parameters.is1ESPipeline, true) }}:
164+
name: $(DncEngInternalBuildPool)
165+
image: 1es-windows-2022
166+
os: windows
167+
${{ else }}:
168+
name: $(DncEngInternalBuildPool)
169+
demands: ImageOverride -equals windows.vs2022.amd64
162170
steps:
163171
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
164172
parameters:
@@ -216,9 +224,13 @@ stages:
216224
os: windows
217225
# If it's not devdiv, it's dnceng
218226
${{ else }}:
219-
name: $(DncEngInternalBuildPool)
220-
image: 1es-windows-2022
221-
os: windows
227+
${{ if eq(parameters.is1ESPipeline, true) }}:
228+
name: $(DncEngInternalBuildPool)
229+
image: 1es-windows-2022
230+
os: windows
231+
${{ else }}:
232+
name: $(DncEngInternalBuildPool)
233+
demands: ImageOverride -equals windows.vs2022.amd64
222234
steps:
223235
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
224236
parameters:
@@ -273,9 +285,13 @@ stages:
273285
os: windows
274286
# If it's not devdiv, it's dnceng
275287
${{ else }}:
276-
name: NetCore1ESPool-Publishing-Internal
277-
image: windows.vs2019.amd64
278-
os: windows
288+
${{ if eq(parameters.is1ESPipeline, true) }}:
289+
name: NetCore1ESPool-Publishing-Internal
290+
image: windows.vs2019.amd64
291+
os: windows
292+
${{ else }}:
293+
name: NetCore1ESPool-Publishing-Internal
294+
demands: ImageOverride -equals windows.vs2019.amd64
279295
steps:
280296
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
281297
parameters:

‎eng/common/native/init-distro-rid.sh

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ getNonPortableDistroRid()
2020
# shellcheck disable=SC1091
2121
if [ -e "${rootfsDir}/etc/os-release" ]; then
2222
. "${rootfsDir}/etc/os-release"
23-
if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ] || [ "${ID}" = "ol" ]; then
24-
VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
25-
fi
26-
2723
if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
2824
nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
2925
else
@@ -48,19 +44,7 @@ getNonPortableDistroRid()
4844
nonPortableRid="android.$__android_sdk_version-${targetArch}"
4945
elif [ "$targetOs" = "illumos" ]; then
5046
__uname_version=$(uname -v)
51-
case "$__uname_version" in
52-
omnios-*)
53-
__omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
54-
nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
55-
;;
56-
joyent_*)
57-
__smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
58-
nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
59-
;;
60-
*)
61-
nonPortableRid="illumos-${targetArch}"
62-
;;
63-
esac
47+
nonPortableRid="illumos-${targetArch}"
6448
elif [ "$targetOs" = "solaris" ]; then
6549
__uname_version=$(uname -v)
6650
__solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)

‎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.24253.1",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24256.2",
1818
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
1919
}
2020
}

0 commit comments

Comments
 (0)