Skip to content

Commit 44dfd80

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[dotnet/main] Update dependencies from dotnet/arcade
1 parent 8372b84 commit 44dfd80

11 files changed

Lines changed: 15 additions & 15 deletions

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25477.2">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25504.3">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>e19df003785d0b81e2e3e1bf6e588bf8d913e95e</Sha>
6+
<Sha>db534d10fc5ab858568b2f27d9b1383099a8019c</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="11.0.0-beta.25477.2">
8+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="11.0.0-beta.25504.3">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>e19df003785d0b81e2e3e1bf6e588bf8d913e95e</Sha>
10+
<Sha>db534d10fc5ab858568b2f27d9b1383099a8019c</Sha>
1111
</Dependency>
1212
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25466.1">
1313
<Uri>https://github.com/dotnet/llvm-project</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>11.0.0-beta.25477.2</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>11.0.0-beta.25504.3</MicrosoftDotNetBuildTasksPackagingVersion>
1010
<!-- Mono LLVM -->
1111
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.25466.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
1212
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.25466.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>

‎eng/common/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ runtime_source_feed=''
9292
runtime_source_feed_key=''
9393

9494
properties=()
95-
while [[ $# > 0 ]]; do
95+
while [[ $# -gt 0 ]]; do
9696
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
9797
case "$opt" in
9898
-help|-h)

‎eng/common/darc-init.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ darcVersion=''
55
versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20'
66
verbosity='minimal'
77

8-
while [[ $# > 0 ]]; do
8+
while [[ $# -gt 0 ]]; do
99
opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
1010
case "$opt" in
1111
--darcversion)

‎eng/common/dotnet-install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ architecture=''
1818
runtime='dotnet'
1919
runtimeSourceFeed=''
2020
runtimeSourceFeedKey=''
21-
while [[ $# > 0 ]]; do
21+
while [[ $# -gt 0 ]]; do
2222
opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
2323
case "$opt" in
2424
-version|-v)

‎eng/common/dotnet.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ source $scriptroot/tools.sh
1919
InitializeDotNetCli true # install
2020

2121
# Invoke acquired SDK with args if they are provided
22-
if [[ $# > 0 ]]; then
22+
if [[ $# -gt 0 ]]; then
2323
__dotnetDir=${_InitializeDotNetCli}
2424
dotnetPath=${__dotnetDir}/dotnet
2525
${dotnetPath} "$@"

‎eng/common/internal-feed-operations.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ operation=''
100100
authToken=''
101101
repoName=''
102102

103-
while [[ $# > 0 ]]; do
103+
while [[ $# -gt 0 ]]; do
104104
opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
105105
case "$opt" in
106106
--operation)

‎eng/common/post-build/nuget-verification.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
[CmdletBinding(PositionalBinding = $false)]
3131
param(
3232
[string]$NuGetExePath,
33-
[string]$PackageSource = "https://api.nuget.org/v3/index.json",
33+
[string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json",
3434
[string]$DownloadPath,
3535
[Parameter(ValueFromRemainingArguments = $true)]
3636
[string[]]$args

‎eng/common/sdk-task.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ try {
6868
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6969
}
7070
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
71-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
71+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty
7272
}
7373
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7474
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
394394

395395
# If the version of msbuild is going to be xcopied,
396396
# use this version. Version matches a package here:
397-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
398-
$defaultXCopyMSBuildVersion = '17.13.0'
397+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16
398+
$defaultXCopyMSBuildVersion = '17.14.16'
399399

400400
if (!$vsRequirements) {
401401
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

0 commit comments

Comments
 (0)