Skip to content

Commit 5065603

Browse files
Update dependencies from https://github.com/dotnet/dotnet build 295792
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25628.102 -> 10.0.0-beta.25630.104) System.CommandLine (Version 2.0.3 -> 2.0.3)
1 parent 90497ac commit 5065603

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-34ad7c3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-34ad7c3e/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-7bf30a3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-7bf30a3f/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!-- Begin: Package sources from dotnet-runtime -->
1010
<!-- End: Package sources from dotnet-runtime -->

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25628.102</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25630.104</MicrosoftDotNetArcadeSdkPackageVersion>
1010
<SystemCommandLinePackageVersion>2.0.3</SystemCommandLinePackageVersion>
1111
<!-- _git/dotnet-runtime dependencies -->
1212
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.1</MicrosoftBclAsyncInterfacesPackageVersion>

eng/Version.Details.xml

Lines changed: 4 additions & 4 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="34ad7c3e9a107797d5005c2f12f43107a25a01a5" BarId="295683" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="7bf30a3f522e388733a32206091af603b7272557" BarId="295792" />
44
<ProductDependencies>
55
<Dependency Name="System.CommandLine" Version="2.0.3">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>34ad7c3e9a107797d5005c2f12f43107a25a01a5</Sha>
7+
<Sha>7bf30a3f522e388733a32206091af603b7272557</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25628.102">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25630.104">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>34ad7c3e9a107797d5005c2f12f43107a25a01a5</Sha>
13+
<Sha>7bf30a3f522e388733a32206091af603b7272557</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build. We'll still update manually -->
1616
<Dependency Name="System.Formats.Asn1" Version="10.0.1">

eng/common/tools.ps1

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,19 +560,26 @@ function LocateVisualStudio([object]$vsRequirements = $null){
560560
})
561561
}
562562

563-
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
563+
if (!$vsRequirements) {
564+
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
565+
$vsRequirements = $GlobalJson.tools.vs
566+
} else {
567+
$vsRequirements = $null
568+
}
569+
}
570+
564571
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
565572

566573
if (!$excludePrereleaseVS) {
567574
$args += '-prerelease'
568575
}
569576

570-
if (Get-Member -InputObject $vsRequirements -Name 'version') {
577+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
571578
$args += '-version'
572579
$args += $vsRequirements.version
573580
}
574581

575-
if (Get-Member -InputObject $vsRequirements -Name 'components') {
582+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
576583
foreach ($component in $vsRequirements.components) {
577584
$args += '-requires'
578585
$args += $component

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"dotnet": "10.0.101"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25628.102"
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25630.104"
1717
}
1818
}

0 commit comments

Comments
 (0)