Skip to content

Commit adb9c1c

Browse files
[main] Update dependencies from dotnet/arcade (#6409)
[main] Update dependencies from dotnet/arcade
1 parent 6ae2683 commit adb9c1c

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23054.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23055.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>eae015fb1c92ceef69126164b3969447d0355c08</Sha>
8+
<Sha>7502a87ca569989008d3acef120b614604b6805f</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
1111
</ToolsetDependencies>

eng/common/templates/job/source-index-stage1.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20220804.1
3+
sourceIndexPackageVersion: 1.0.1-20221220.2
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
66
preSteps: []
@@ -40,10 +40,10 @@ jobs:
4040
- ${{ preStep }}
4141

4242
- task: UseDotNet@2
43-
displayName: Use .NET Core sdk 3.1
43+
displayName: Use .NET Core SDK 6
4444
inputs:
4545
packageType: sdk
46-
version: 3.1.x
46+
version: 6.0.x
4747
installationPath: $(Agent.TempDirectory)/dotnet
4848
workingDirectory: $(Agent.TempDirectory)
4949

eng/common/tools.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ function InitializeBuildTool() {
581581
ExitWithExitCode 1
582582
}
583583
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
584-
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
584+
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' }
585585
} elseif ($msbuildEngine -eq "vs") {
586586
try {
587587
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -743,6 +743,8 @@ function MSBuild() {
743743
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
744744
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
745745
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
746+
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')),
747+
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
746748
)
747749
$selectedPath = $null
748750
foreach ($path in $possiblePaths) {

eng/common/tools.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ function InitializeBuildTool {
312312
# return values
313313
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
314314
_InitializeBuildToolCommand="msbuild"
315-
_InitializeBuildToolFramework="net7.0"
315+
_InitializeBuildToolFramework="net8.0"
316316
}
317317

318318
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
@@ -428,6 +428,8 @@ function MSBuild {
428428
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
429429
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
430430
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
431+
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
432+
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
431433
for path in "${possiblePaths[@]}"; do
432434
if [[ -f $path ]]; then
433435
selectedPath=$path

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "7.0.101",
3+
"dotnet": "8.0.100-alpha.1.23055.1",
44
"runtimes": {
55
"dotnet": [
66
"3.1.7",
@@ -13,11 +13,11 @@
1313
"xcopy-msbuild": "16.10.0-preview2"
1414
},
1515
"sdk": {
16-
"version": "7.0.101",
16+
"version": "8.0.100-alpha.1.23055.1",
1717
"allowPrerelease": true,
1818
"rollForward": "patch"
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23054.2"
21+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23055.3"
2222
}
2323
}

0 commit comments

Comments
 (0)