Skip to content

Commit e47c15a

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#55550)
[main] Update dependencies from dotnet/arcade
1 parent e95ce8a commit e47c15a

File tree

10 files changed

+181
-81
lines changed

10 files changed

+181
-81
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -384,31 +384,31 @@
384384
<Uri>https://github.com/dotnet/winforms</Uri>
385385
<Sha>c5967ff09814601cc8828668589ab66b946a4b16</Sha>
386386
</Dependency>
387-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24229.1">
387+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24260.2">
388388
<Uri>https://github.com/dotnet/arcade</Uri>
389-
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
389+
<Sha>480401b003bfd2eb989c315da5d6b99ad13a968c</Sha>
390390
</Dependency>
391391
<!-- Intermediate is necessary for source build. -->
392-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24229.1">
392+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24260.2">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
394+
<Sha>480401b003bfd2eb989c315da5d6b99ad13a968c</Sha>
395395
<SourceBuild RepoName="arcade" ManagedOnly="true" />
396396
</Dependency>
397-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24229.1">
397+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24260.2">
398398
<Uri>https://github.com/dotnet/arcade</Uri>
399-
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
399+
<Sha>480401b003bfd2eb989c315da5d6b99ad13a968c</Sha>
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24229.1">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24260.2">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
403+
<Sha>480401b003bfd2eb989c315da5d6b99ad13a968c</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24229.1">
405+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24260.2">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
407+
<Sha>480401b003bfd2eb989c315da5d6b99ad13a968c</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24229.1">
409+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24260.2">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
411+
<Sha>480401b003bfd2eb989c315da5d6b99ad13a968c</Sha>
412412
</Dependency>
413413
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.4.24261.1">
414414
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@
160160
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
161161
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
162162
<!-- Packages from dotnet/arcade -->
163-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksInstallersVersion>
164-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksTemplatingVersion>
165-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24229.1</MicrosoftDotNetRemoteExecutorVersion>
166-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24229.1</MicrosoftSourceBuildIntermediatearcadeVersion>
163+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24260.2</MicrosoftDotNetBuildTasksInstallersVersion>
164+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24260.2</MicrosoftDotNetBuildTasksTemplatingVersion>
165+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24260.2</MicrosoftDotNetRemoteExecutorVersion>
166+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24260.2</MicrosoftSourceBuildIntermediatearcadeVersion>
167167
<!-- Packages from dotnet/source-build-externals -->
168168
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24258.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
169169
<!-- Packages from dotnet/source-build-reference-packages -->

‎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:

0 commit comments

Comments
 (0)