diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5e76f1a5f179..a6b410ce4e21 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -302,22 +302,22 @@
https://github.com/dotnet/runtime
9197fd555152762b2f400459d46cb14ad741bf75
-
+
https://github.com/dotnet/arcade
- e82404fca08383513e0b0b3c5308d4a9b18b7c7a
+ 7502a87ca569989008d3acef120b614604b6805f
-
+
https://github.com/dotnet/arcade
- e82404fca08383513e0b0b3c5308d4a9b18b7c7a
+ 7502a87ca569989008d3acef120b614604b6805f
-
+
https://github.com/dotnet/arcade
- e82404fca08383513e0b0b3c5308d4a9b18b7c7a
+ 7502a87ca569989008d3acef120b614604b6805f
-
+
https://github.com/dotnet/arcade
- e82404fca08383513e0b0b3c5308d4a9b18b7c7a
+ 7502a87ca569989008d3acef120b614604b6805f
diff --git a/eng/Versions.props b/eng/Versions.props
index 9e43fb88dc9e..bd4c452391b2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -135,8 +135,8 @@
8.0.0-alpha.1.23056.1
8.0.0-alpha.1.23056.1
- 8.0.0-beta.22630.1
- 8.0.0-beta.22630.1
+ 8.0.0-beta.23055.3
+ 8.0.0-beta.23055.3
8.0.0-alpha.1.22615.1
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index 09c506d11855..71b66aeb8a5c 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -1,6 +1,6 @@
parameters:
runAsPublic: false
- sourceIndexPackageVersion: 1.0.1-20220804.1
+ sourceIndexPackageVersion: 1.0.1-20221220.2
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
@@ -40,10 +40,10 @@ jobs:
- ${{ preStep }}
- task: UseDotNet@2
- displayName: Use .NET Core sdk 3.1
+ displayName: Use .NET Core SDK 6
inputs:
packageType: sdk
- version: 3.1.x
+ version: 6.0.x
installationPath: $(Agent.TempDirectory)/dotnet
workingDirectory: $(Agent.TempDirectory)
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 1a8c16c56e56..7caacc6de2e1 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -581,7 +581,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
- $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
+ $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' }
} elseif ($msbuildEngine -eq "vs") {
try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -743,6 +743,8 @@ function MSBuild() {
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
+ (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')),
+ (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
)
$selectedPath = $null
foreach ($path in $possiblePaths) {
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 2f27d7453cd4..cf9fb1ea2d32 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -312,7 +312,7 @@ function InitializeBuildTool {
# return values
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="msbuild"
- _InitializeBuildToolFramework="net7.0"
+ _InitializeBuildToolFramework="net8.0"
}
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
@@ -428,6 +428,8 @@ function MSBuild {
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
+ possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
+ possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
for path in "${possiblePaths[@]}"; do
if [[ -f $path ]]; then
selectedPath=$path
diff --git a/global.json b/global.json
index dd810f15653d..17a119bfa118 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
{
"sdk": {
- "version": "8.0.100-alpha.1.22531.1"
+ "version": "8.0.100-alpha.1.23055.1"
},
"tools": {
- "dotnet": "8.0.100-alpha.1.22531.1",
+ "dotnet": "8.0.100-alpha.1.23055.1",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
@@ -27,7 +27,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.22.10",
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22630.1",
- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22630.1"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23055.3",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23055.3"
}
}