diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7ec574b24..56ce87c05 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -185,9 +185,9 @@
9e870996b8bf0b91a791edd1039bfd23bdd01af8
-
+
https://github.com/dotnet/source-build-externals
- b9eb9bc83da8a0dc5b62e67d576867f7f11e7c0c
+ ef9a715923692e0a8f693e64e9c2da4bbc0515f3
@@ -206,18 +206,18 @@
-
+
https://github.com/dotnet/arcade
- aeaa48c51d6494adc1b1fab870e7b8c89752d1ba
+ 3addc5d978d01e864792d2c6bce0b50ec105f857
-
+
https://github.com/dotnet/arcade
- aeaa48c51d6494adc1b1fab870e7b8c89752d1ba
+ 3addc5d978d01e864792d2c6bce0b50ec105f857
-
+
https://github.com/dotnet/arcade
- aeaa48c51d6494adc1b1fab870e7b8c89752d1ba
+ 3addc5d978d01e864792d2c6bce0b50ec105f857
https://github.com/dotnet/arcade-services
@@ -231,14 +231,14 @@
https://github.com/dotnet/runtime
af841c8b33cecc92d74222298f1e45bf7bf3d90a
-
+
https://github.com/dotnet/source-build-reference-packages
- b5368f118ae0b04a7ea1c08c41ba5df3494ff7c6
+ b0cef4cffdd83138fa76c8a6430f7f8c2aa09f07
-
+
https://github.com/dotnet/xliff-tasks
- a61cdec7a7f96c654b8c92bea0167df0427cc26c
+ d3553ca27fb1c128f302f52b73c0079e65d62ea8
diff --git a/eng/Versions.props b/eng/Versions.props
index f32317ad5..85b13ee3b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,13 +10,16 @@
1
00
$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)
- rc
- 1
$(VersionMajor).$(VersionMinor)
$(MajorMinorVersion).$(VersionSDKMinor)
false
release
+
+ rc
+ rtm
+ servicing
+ 1
30
@@ -36,7 +39,7 @@
- 8.0.0-beta.23381.1
+ 8.0.0-beta.23402.2
diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1
index 7f28d9c59..f031ed5b2 100644
--- a/eng/common/sdl/extract-artifact-packages.ps1
+++ b/eng/common/sdl/extract-artifact-packages.ps1
@@ -35,31 +35,33 @@ try {
param(
[string] $PackagePath # Full path to a NuGet package
)
-
+
if (!(Test-Path $PackagePath)) {
Write-PipelineTelemetryError -Category 'Build' -Message "Input file does not exist: $PackagePath"
ExitWithExitCode 1
}
-
+
$RelevantExtensions = @('.dll', '.exe', '.pdb')
Write-Host -NoNewLine 'Extracting ' ([System.IO.Path]::GetFileName($PackagePath)) '...'
-
+
$PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
$ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId
-
+
Add-Type -AssemblyName System.IO.Compression.FileSystem
-
+
[System.IO.Directory]::CreateDirectory($ExtractPath);
-
+
try {
$zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath)
$zip.Entries |
Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} |
ForEach-Object {
- $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.Name
-
- [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true)
+ $TargetPath = Join-Path -Path $ExtractPath -ChildPath (Split-Path -Path $_.FullName)
+ [System.IO.Directory]::CreateDirectory($TargetPath);
+
+ $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.FullName
+ [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile)
}
}
catch {
diff --git a/global.json b/global.json
index 1da780075..0891df6a9 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23381.1",
- "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23381.1"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23402.2",
+ "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23402.2"
}
}
diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh
index 3acb4ae4f..e217a8323 100755
--- a/src/SourceBuild/content/build.sh
+++ b/src/SourceBuild/content/build.sh
@@ -252,6 +252,7 @@ LogDateStamp=$(date +"%m%d%H%M%S")
"$CLI_ROOT/dotnet" build-server shutdown
if [ "$alternateTarget" == "true" ]; then
+ export NUGET_PACKAGES=$NUGET_PACKAGES/smoke-tests
"$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog" -flp:"LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log" -clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@"
else
"$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog" -flp:LogFile="$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log" -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@"
diff --git a/src/SourceBuild/patches/aspnetcore/0001-Ensure-WasmLinkerTest-project-is-not-included-in-bui.patch b/src/SourceBuild/patches/aspnetcore/0001-Ensure-WasmLinkerTest-project-is-not-included-in-bui.patch
deleted file mode 100644
index 5e3e08c89..000000000
--- a/src/SourceBuild/patches/aspnetcore/0001-Ensure-WasmLinkerTest-project-is-not-included-in-bui.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Matt Thalman
-Date: Wed, 2 Aug 2023 08:06:29 -0500
-Subject: [PATCH] Ensure WasmLinkerTest project is not included in build
-
-Backport: https://github.com/dotnet/aspnetcore/issues/49774
----
- eng/Build.props | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/eng/Build.props b/eng/Build.props
-index d61fcb6e58..f2e7334cfd 100644
---- a/eng/Build.props
-+++ b/eng/Build.props
-@@ -31,8 +31,7 @@
- Include="$(RepoRoot)src\**\testassets\**\*.*proj;
- @(RequiresDelayedBuild);
- "
-- Exclude="$(RepoRoot)src\Components\WebAssembly\testassets\WasmLinkerTest\*.*proj;
-- $(RepoRoot)src\Components\WebView\Samples\PhotinoPlatform\testassets\PhotinoTestApp\*.*proj;
-+ Exclude="$(RepoRoot)src\Components\WebView\Samples\PhotinoPlatform\testassets\PhotinoTestApp\*.*proj;
- $(RepoRoot)src\Http\Routing\test\testassets\RoutingSandbox\*.*proj;
- $(RepoRoot)src\Security\Authentication\Negotiate\test\testassets\Negotiate.Client\*.*proj;
- $(RepoRoot)src\Security\Authentication\Negotiate\test\testassets\Negotiate.Server\*.*proj;