Skip to content

Commit e5c61f0

Browse files
[main] Source code updates from dotnet/dotnet (#9392)
[main] Source code updates from dotnet/dotnet
1 parent 95c013d commit e5c61f0

File tree

11 files changed

+17
-17
lines changed

11 files changed

+17
-17
lines changed

eng/Version.Details.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25479.108</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<SystemCommandLinePackageVersion>2.0.0-rc.1.25479.108</SystemCommandLinePackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25502.108</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>2.0.0-rc.1.25502.108</SystemCommandLinePackageVersion>
1111
<!-- _git/dotnet-runtime dependencies -->
1212
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.3</MicrosoftBclAsyncInterfacesPackageVersion>
1313
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>

eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="6befeceeaece5c9cb9730878aeaf4667f7c29b70" BarId="285151" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="fe6b307fbb764027be9a10b978063bd742763982" BarId="285582" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25479.108">
5+
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25502.108">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>6befeceeaece5c9cb9730878aeaf4667f7c29b70</Sha>
7+
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25479.108">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25502.108">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>6befeceeaece5c9cb9730878aeaf4667f7c29b70</Sha>
13+
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build. We'll still update manually -->
1616
<Dependency Name="System.Formats.Asn1" Version="9.0.3">

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)