Skip to content

Commit b82b194

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Update dependencies from https://github.com/dotnet/arcade build 20260519.10
On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis From Version 10.0.0-beta.26257.101 -> To Version 10.0.0-beta.26269.10
1 parent 86762cb commit b82b194

7 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26257.101">
7-
<Uri>https://github.com/dotnet/dotnet</Uri>
8-
<Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26269.10">
7+
<Uri>https://github.com/dotnet/arcade</Uri>
8+
<Sha>ef50e01056369b217663cac33386645a296ef53d</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26257.101">
11-
<Uri>https://github.com/dotnet/dotnet</Uri>
12-
<Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
10+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26269.10">
11+
<Uri>https://github.com/dotnet/arcade</Uri>
12+
<Sha>ef50e01056369b217663cac33386645a296ef53d</Sha>
1313
</Dependency>
1414
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.26257.101">
1515
<Uri>https://github.com/dotnet/dotnet</Uri>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ steps:
1414
workingDirectory: $(Agent.TempDirectory)
1515

1616
- 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
17+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
18+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
1919
displayName: "Source Index: Download netsourceindex Tools"
2020
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
2121
workingDirectory: $(Agent.TempDirectory)

‎eng/common/darc-init.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ function InstallDarcCli ($darcVersion, $toolpath) {
2929
Write-Host "Installing Darc CLI version $darcVersion..."
3030
Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.'
3131
if (-not $toolpath) {
32-
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g"
33-
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g
32+
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --source '$arcadeServicesSource' -v $verbosity -g"
33+
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --source "$arcadeServicesSource" -v $verbosity -g
3434
}else {
35-
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity --tool-path '$toolpath'"
36-
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath"
35+
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --source '$arcadeServicesSource' -v $verbosity --tool-path '$toolpath'"
36+
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath"
3737
}
3838
}
3939

‎eng/common/darc-init.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ function InstallDarcCli {
7373
echo "Installing Darc CLI version $darcVersion..."
7474
echo "You may need to restart your command shell if this is the first dotnet tool you have installed."
7575
if [ -z "$toolpath" ]; then
76-
echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g)
76+
echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --source "$arcadeServicesSource" -v $verbosity -g)
7777
else
78-
echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath")
78+
echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath")
7979
fi
8080
}
8181

‎eng/common/post-build/redact-logs.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ try {
4848
Write-Host "Installing Binlog redactor CLI..."
4949
Write-Host "'$dotnet' new tool-manifest"
5050
& "$dotnet" new tool-manifest
51-
Write-Host "'$dotnet' tool install $packageName --local --add-source '$PackageFeed' -v $verbosity --version $BinlogToolVersion"
52-
& "$dotnet" tool install $packageName --local --add-source "$PackageFeed" -v $verbosity --version $BinlogToolVersion
51+
Write-Host "'$dotnet' tool install $packageName --local --source '$PackageFeed' -v $verbosity --version $BinlogToolVersion"
52+
& "$dotnet" tool install $packageName --local --source "$PackageFeed" -v $verbosity --version $BinlogToolVersion
5353

5454
if (Test-Path $TokensFilePath) {
5555
Write-Host "Adding additional sensitive data for redaction from file: " $TokensFilePath

‎eng/common/templates/steps/vmr-sync.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ steps:
4545
workingDirectory: ${{ parameters.vmrPath }}
4646

4747
- script: |
48-
./eng/common/vmr-sync.sh \
49-
--vmr ${{ parameters.vmrPath }} \
50-
--tmp $(Agent.TempDirectory) \
51-
--azdev-pat '$(dn-bot-all-orgs-code-r)' \
52-
--ci \
48+
./eng/common/vmr-sync.sh \
49+
--vmr ${{ parameters.vmrPath }} \
50+
--tmp $(Agent.TempDirectory) \
51+
--azdev-pat '$(AzdoToken)' \
52+
--ci \
5353
--debug
5454
5555
if [ "$?" -ne 0 ]; then
@@ -67,11 +67,11 @@ steps:
6767
condition: eq(variables['Agent.OS'], 'Windows_NT')
6868

6969
- powershell: |
70-
./eng/common/vmr-sync.ps1 `
71-
-vmr ${{ parameters.vmrPath }} `
72-
-tmp $(Agent.TempDirectory) `
73-
-azdevPat '$(dn-bot-all-orgs-code-r)' `
74-
-ci `
70+
./eng/common/vmr-sync.ps1 `
71+
-vmr ${{ parameters.vmrPath }} `
72+
-tmp $(Agent.TempDirectory) `
73+
-azdevPat '$(AzdoToken)' `
74+
-ci `
7575
-debugOutput
7676
7777
if ($LASTEXITCODE -ne 0) {

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"dotnet": "10.0.107"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26257.101"
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26269.10"
1212
}
1313
}

0 commit comments

Comments
 (0)