File tree Expand file tree Collapse file tree 5 files changed +14
-10
lines changed Expand file tree Collapse file tree 5 files changed +14
-10
lines changed Original file line number Diff line number Diff line change 3
3
<ProductDependencies >
4
4
</ProductDependencies >
5
5
<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 " >
7
7
<Uri >https://github.com/dotnet/arcade</Uri >
8
- <Sha >eae015fb1c92ceef69126164b3969447d0355c08 </Sha >
8
+ <Sha >7502a87ca569989008d3acef120b614604b6805f </Sha >
9
9
<SourceBuild RepoName =" arcade" ManagedOnly =" true" />
10
10
</Dependency >
11
11
</ToolsetDependencies >
Original file line number Diff line number Diff line change 1
1
parameters :
2
2
runAsPublic : false
3
- sourceIndexPackageVersion : 1.0.1-20220804.1
3
+ sourceIndexPackageVersion : 1.0.1-20221220.2
4
4
sourceIndexPackageSource : https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
5
5
sourceIndexBuildCommand : powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
6
6
preSteps : []
@@ -40,10 +40,10 @@ jobs:
40
40
- ${{ preStep }}
41
41
42
42
- task : UseDotNet@2
43
- displayName : Use .NET Core sdk 3.1
43
+ displayName : Use .NET Core SDK 6
44
44
inputs :
45
45
packageType : sdk
46
- version : 3.1 .x
46
+ version : 6.0 .x
47
47
installationPath : $(Agent.TempDirectory)/dotnet
48
48
workingDirectory : $(Agent.TempDirectory)
49
49
Original file line number Diff line number Diff line change @@ -581,7 +581,7 @@ function InitializeBuildTool() {
581
581
ExitWithExitCode 1
582
582
}
583
583
$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' }
585
585
} elseif ($msbuildEngine -eq " vs" ) {
586
586
try {
587
587
$msbuildPath = InitializeVisualStudioMSBuild - install:$restore
@@ -743,6 +743,8 @@ function MSBuild() {
743
743
(Join-Path $basePath (Join-Path netcoreapp2.1 ' Microsoft.DotNet.Arcade.Sdk.dll' ))
744
744
(Join-Path $basePath (Join-Path netcoreapp3.1 ' Microsoft.DotNet.ArcadeLogging.dll' )),
745
745
(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' ))
746
748
)
747
749
$selectedPath = $null
748
750
foreach ($path in $possiblePaths ) {
Original file line number Diff line number Diff line change @@ -312,7 +312,7 @@ function InitializeBuildTool {
312
312
# return values
313
313
_InitializeBuildTool=" $_InitializeDotNetCli /dotnet"
314
314
_InitializeBuildToolCommand=" msbuild"
315
- _InitializeBuildToolFramework=" net7 .0"
315
+ _InitializeBuildToolFramework=" net8 .0"
316
316
}
317
317
318
318
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
@@ -428,6 +428,8 @@ function MSBuild {
428
428
possiblePaths+=( " $toolset_dir /netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
429
429
possiblePaths+=( " $toolset_dir /netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
430
430
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" )
431
433
for path in " ${possiblePaths[@]} " ; do
432
434
if [[ -f $path ]]; then
433
435
selectedPath=$path
Original file line number Diff line number Diff line change 1
1
{
2
2
"tools" : {
3
- "dotnet" : " 7 .0.101 " ,
3
+ "dotnet" : " 8 .0.100-alpha.1.23055.1 " ,
4
4
"runtimes" : {
5
5
"dotnet" : [
6
6
" 3.1.7" ,
13
13
"xcopy-msbuild" : " 16.10.0-preview2"
14
14
},
15
15
"sdk" : {
16
- "version" : " 7 .0.101 " ,
16
+ "version" : " 8 .0.100-alpha.1.23055.1 " ,
17
17
"allowPrerelease" : true ,
18
18
"rollForward" : " patch"
19
19
},
20
20
"msbuild-sdks" : {
21
- "Microsoft.DotNet.Arcade.Sdk" : " 8.0.0-beta.23054.2 "
21
+ "Microsoft.DotNet.Arcade.Sdk" : " 8.0.0-beta.23055.3 "
22
22
}
23
23
}
You can’t perform that action at this time.
0 commit comments