Skip to content

Commit 54a1d4f

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240913.4 (dotnet#2606)
[main] Update dependencies from dotnet/arcade
1 parent cd85cb3 commit 54a1d4f

File tree

7 files changed

+65
-53
lines changed

7 files changed

+65
-53
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24459.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24463.4">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>8260f289b9d748432a34680a1afeac677cda6049</Sha>
8+
<Sha>9ba9980c4996a540387b9a0ef0d68accf00689c0</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24459.1">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24463.4">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>8260f289b9d748432a34680a1afeac677cda6049</Sha>
12+
<Sha>9ba9980c4996a540387b9a0ef0d68accf00689c0</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24459.1">
14+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24463.4">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>8260f289b9d748432a34680a1afeac677cda6049</Sha>
16+
<Sha>9ba9980c4996a540387b9a0ef0d68accf00689c0</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
1616
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
1717
<MicrosoftBclTimeProviderVersion>8.0.0</MicrosoftBclTimeProviderVersion>
18-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24459.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
18+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24463.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
1919
</PropertyGroup>
2020
</Project>

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

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
4-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
5-
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
63
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
74
preSteps: []
85
binlogPath: artifacts/log/Debug/Build.binlog
@@ -16,12 +13,6 @@ jobs:
1613
dependsOn: ${{ parameters.dependsOn }}
1714
condition: ${{ parameters.condition }}
1815
variables:
19-
- name: SourceIndexUploadPackageVersion
20-
value: ${{ parameters.sourceIndexUploadPackageVersion }}
21-
- name: SourceIndexProcessBinlogPackageVersion
22-
value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
23-
- name: SourceIndexPackageSource
24-
value: ${{ parameters.sourceIndexPackageSource }}
2516
- name: BinlogPath
2617
value: ${{ parameters.binlogPath }}
2718
- template: /eng/common/core-templates/variables/pool-providers.yml
@@ -34,48 +25,20 @@ jobs:
3425
pool:
3526
${{ if eq(variables['System.TeamProject'], 'public') }}:
3627
name: $(DncEngPublicBuildPool)
37-
image: 1es-windows-2022-open
38-
os: windows
28+
image: windows.vs2022.amd64.open
3929
${{ if eq(variables['System.TeamProject'], 'internal') }}:
4030
name: $(DncEngInternalBuildPool)
41-
image: 1es-windows-2022
42-
os: windows
31+
image: windows.vs2022.amd64
4332

4433
steps:
4534
- ${{ if eq(parameters.is1ESPipeline, '') }}:
4635
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
4736

4837
- ${{ each preStep in parameters.preSteps }}:
4938
- ${{ preStep }}
50-
51-
- task: UseDotNet@2
52-
displayName: Use .NET 8 SDK
53-
inputs:
54-
packageType: sdk
55-
version: 8.0.x
56-
installationPath: $(Agent.TempDirectory)/dotnet
57-
workingDirectory: $(Agent.TempDirectory)
58-
59-
- script: |
60-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
61-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
62-
displayName: Download Tools
63-
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
64-
workingDirectory: $(Agent.TempDirectory)
65-
6639
- script: ${{ parameters.sourceIndexBuildCommand }}
6740
displayName: Build Repository
6841

69-
- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
70-
displayName: Process Binlog into indexable sln
71-
72-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
73-
- task: AzureCLI@2
74-
displayName: Log in to Azure and upload stage1 artifacts to source index
75-
inputs:
76-
azureSubscription: 'SourceDotNet Stage1 Publish'
77-
addSpnToEnvironment: true
78-
scriptType: 'ps'
79-
scriptLocation: 'inlineScript'
80-
inlineScript: |
81-
$(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
42+
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
43+
parameters:
44+
binLogPath: ${{ parameters.binLogPath }}

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
parameters:
2+
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
3+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
4+
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
5+
binlogPath: artifacts/log/Debug/Build.binlog
6+
7+
steps:
8+
- task: UseDotNet@2
9+
displayName: "Source Index: Use .NET 8 SDK"
10+
inputs:
11+
packageType: sdk
12+
version: 8.0.x
13+
installationPath: $(Agent.TempDirectory)/dotnet
14+
workingDirectory: $(Agent.TempDirectory)
15+
16+
- script: |
17+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
18+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
19+
displayName: "Source Index: Download netsourceindex Tools"
20+
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
21+
workingDirectory: $(Agent.TempDirectory)
22+
23+
- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
24+
displayName: "Source Index: Process Binlog into indexable sln"
25+
26+
- ${{ if and(ne(parameters.runAsPublic, 'true'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
27+
- task: AzureCLI@2
28+
displayName: "Source Index: Upload Source Index stage1 artifacts to Azure"
29+
inputs:
30+
azureSubscription: 'SourceDotNet Stage1 Publish'
31+
addSpnToEnvironment: true
32+
scriptType: 'ps'
33+
scriptLocation: 'inlineScript'
34+
inlineScript: |
35+
$(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1

‎eng/common/templates-official/steps/source-index-stage1-publish.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
steps:
2+
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
3+
parameters:
4+
is1ESPipeline: true
5+
6+
${{ each parameter in parameters }}:
7+
${{ parameter.key }}: ${{ parameter.value }}

‎eng/common/templates/steps/source-index-stage1-publish.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
steps:
2+
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
3+
parameters:
4+
is1ESPipeline: false
5+
6+
${{ each parameter in parameters }}:
7+
${{ parameter.key }}: ${{ parameter.value }}

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-preview.7.24407.12"
3+
"version": "9.0.100-rc.1.24452.12"
44
},
55
"tools": {
6-
"dotnet": "9.0.100-preview.7.24407.12",
6+
"dotnet": "9.0.100-rc.1.24452.12",
77
"runtimes": {
88
"dotnet": [
99
"6.0.33",
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24459.1",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24459.1"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24463.4",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24463.4"
2323
}
2424
}

0 commit comments

Comments
 (0)