Skip to content

Commit fa14bc9

Browse files
[main] Update dependencies from dotnet/arcade (#606)
* Update dependencies from https://github.com/dotnet/arcade build 20250513.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.25263.1 -> To Version 8.0.0-beta.25263.4 * Update dependencies from https://github.com/dotnet/arcade build 20250514.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.25263.1 -> To Version 8.0.0-beta.25264.2 * Update dependencies from https://github.com/dotnet/arcade build 20250610.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.25263.1 -> To Version 8.0.0-beta.25310.3 * Update dependencies from https://github.com/dotnet/arcade build 20250626.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.25263.1 -> To Version 8.0.0-beta.25326.1 * Update dependencies from https://github.com/dotnet/arcade build 20250716.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.25263.1 -> To Version 8.0.0-beta.25366.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 8b5963d commit fa14bc9

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 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="8.0.0-beta.25263.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25366.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>abb15166a8da9284d6ed177924cfd9b6f74c9f08</Sha>
8+
<Sha>a73c08ec0de5a6e5e2a8668837df67edecb3a3da</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25263.1">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25366.2">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>abb15166a8da9284d6ed177924cfd9b6f74c9f08</Sha>
12+
<Sha>a73c08ec0de5a6e5e2a8668837df67edecb3a3da</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

eng/common/templates-official/job/job.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ jobs:
135135
signType: $(_SignType)
136136
zipSources: false
137137
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
138+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
139+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
140+
${{ else }}:
141+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
138142
env:
139143
TeamName: $(_TeamName)
140144
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'

eng/common/templates/job/job.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ jobs:
134134
signType: $(_SignType)
135135
zipSources: false
136136
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
138+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
139+
${{ else }}:
140+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
137141
env:
138142
TeamName: $(_TeamName)
139143
continueOnError: ${{ parameters.continueOnError }}

eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
417417

418418
# Locate Visual Studio installation or download x-copy msbuild.
419419
$vsInfo = LocateVisualStudio $vsRequirements
420-
if ($vsInfo -ne $null) {
420+
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
421421
# Ensure vsInstallDir has a trailing slash
422422
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
423423
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.115"
3+
"dotnet": "8.0.117"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25263.1",
7-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25263.1"
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2",
7+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25366.2"
88
}
99
}

0 commit comments

Comments
 (0)