Skip to content

Commit 7bf30a3

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0.1xx] Source code updates from dotnet/arcade (#4012)
[release/10.0.1xx] Source code updates from dotnet/arcade
1 parent 740da83 commit 7bf30a3

5 files changed

Lines changed: 23 additions & 16 deletions

File tree

‎src/arcade/eng/Version.Details.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ This file should be imported by eng/Versions.props
1414
<!-- dotnet/templating dependencies -->
1515
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-preview.4.25220.1</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
1616
<!-- dotnet/arcade dependencies -->
17-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25608.3</MicrosoftDotNetArcadeSdkPackageVersion>
18-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25608.3</MicrosoftDotNetHelixSdkPackageVersion>
17+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25612.5</MicrosoftDotNetArcadeSdkPackageVersion>
18+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25612.5</MicrosoftDotNetHelixSdkPackageVersion>
1919
<!-- dotnet/arcade-services dependencies -->
2020
<MicrosoftDotNetDarcLibPackageVersion>1.1.0-beta.25424.1</MicrosoftDotNetDarcLibPackageVersion>
2121
<MicrosoftDotNetProductConstructionServiceClientPackageVersion>1.1.0-beta.25424.1</MicrosoftDotNetProductConstructionServiceClientPackageVersion>

‎src/arcade/eng/Version.Details.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="20abd87658f89b288b8beeb3a0fcb2c89b0af69a" BarId="292473" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="b6995982889aca81f3e8a3e1406629e1f379b31f" BarId="295588" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
@@ -20,13 +20,13 @@
2020
<Uri>https://github.com/dotnet/templating</Uri>
2121
<Sha>43b5827697e501c442eb75ffff832cd4df2514fe</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25608.3">
23+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25612.5">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>6605fb5db42d56000a040ed7a0736bc505be9743</Sha>
25+
<Sha>55631983c8583162122687fddeac13424c1e40a8</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25608.3">
27+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25612.5">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
29-
<Sha>6605fb5db42d56000a040ed7a0736bc505be9743</Sha>
29+
<Sha>55631983c8583162122687fddeac13424c1e40a8</Sha>
3030
</Dependency>
3131
<Dependency Name="Microsoft.DotNet.ProductConstructionService.Client" Version="1.1.0-beta.25424.1">
3232
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎src/arcade/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

‎src/arcade/global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100",
3+
"version": "10.0.101",
44
"rollForward": "latestFeature",
55
"paths": [
66
".dotnet",
@@ -9,11 +9,11 @@
99
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1010
},
1111
"tools": {
12-
"dotnet": "10.0.100"
12+
"dotnet": "10.0.101"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25608.3",
16-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25608.3",
15+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25612.5",
16+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25612.5",
1717
"Microsoft.Build.NoTargets": "3.7.0"
1818
}
1919
}

‎src/source-manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"repositories": [
33
{
4-
"barId": 294297,
4+
"barId": 295620,
55
"path": "arcade",
66
"remoteUri": "https://github.com/dotnet/arcade",
7-
"commitSha": "9f286ddee40065ea225611cb43ab0415e48994c2"
7+
"commitSha": "d8dca0b41b903e7182e64543773390b969dab96b"
88
},
99
{
1010
"barId": 294740,

0 commit comments

Comments
 (0)