From 2875ad2cfb95d6f8688125e1b14d9bcbccc8cd5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Aug 2023 12:27:12 +0000 Subject: [PATCH 1/8] Update dependencies from https://github.com/dotnet/source-build-externals build 20230731.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23374.2 -> To Version 8.0.0-alpha.1.23381.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11b7b6812..617877666 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,9 +181,9 @@ 9e870996b8bf0b91a791edd1039bfd23bdd01af8 - + https://github.com/dotnet/source-build-externals - b9eb9bc83da8a0dc5b62e67d576867f7f11e7c0c + 3a7a792f6acb133df4a3e6dffba51c4a016b8fa0 From 3abb504b0c7963f7978f215a4c5ad80340dab967 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Aug 2023 12:13:56 +0000 Subject: [PATCH 2/8] Update dependencies from https://github.com/dotnet/arcade build 20230801.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23381.1 -> To Version 8.0.0-beta.23401.3 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23374.1 -> To Version 1.0.0-beta.23381.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/sdl/extract-artifact-packages.ps1 | 20 +++++++++++--------- global.json | 4 ++-- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d569fc0c7..a2504161b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,18 +202,18 @@ - + https://github.com/dotnet/arcade - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d - + https://github.com/dotnet/arcade - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d - + https://github.com/dotnet/arcade - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d https://github.com/dotnet/arcade-services @@ -237,9 +237,9 @@ d2e046aec870a5a7601cc51c5607f34463cc2d42 - + https://github.com/dotnet/xliff-tasks - a61cdec7a7f96c654b8c92bea0167df0427cc26c + d3553ca27fb1c128f302f52b73c0079e65d62ea8 diff --git a/eng/Versions.props b/eng/Versions.props index f32317ad5..b8f47cf7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ - 8.0.0-beta.23381.1 + 8.0.0-beta.23401.3 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..b9a440c7c 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.23401.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23401.3" } } From a1671e1b8290b1138f73e948c5dd1455a0d0f2b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Aug 2023 12:27:14 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/source-build-externals build 20230801.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23374.2 -> To Version 8.0.0-alpha.1.23401.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 617877666..cccd5b329 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,9 +181,9 @@ 9e870996b8bf0b91a791edd1039bfd23bdd01af8 - + https://github.com/dotnet/source-build-externals - 3a7a792f6acb133df4a3e6dffba51c4a016b8fa0 + ef9a715923692e0a8f693e64e9c2da4bbc0515f3 From 96ebbaf0fad36869f2d2c5161320ae821329dc16 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 2 Aug 2023 09:21:32 -0500 Subject: [PATCH 4/8] Use a different nuget path for smoke tests This is needed to avoid the smoke tests project from using reference assemblies that were restored in the product build phase. Those all get placed in the prereqs/packages/restored path. So this change sets the smoke tests to use an isolated location at prereqs/packages/restored/smoke-tests --- src/SourceBuild/content/build.sh | 1 + 1 file changed, 1 insertion(+) 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[@]} "$@" From 48d2b5b7243afe54b4ce050d22242f3a71e089cd Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 2 Aug 2023 15:46:48 -0700 Subject: [PATCH 5/8] Let's try to calculate the prerelease label automatically in the future --- eng/Versions.props | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f32317ad5..c80cb9dba 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 From 4c8139b85138fe939254cb2476842843038f8333 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Aug 2023 12:13:28 +0000 Subject: [PATCH 6/8] Update dependencies from https://github.com/dotnet/arcade build 20230802.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23381.1 -> To Version 8.0.0-beta.23402.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23374.1 -> To Version 1.0.0-beta.23381.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd2dbfa06..1fad563d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,18 +206,18 @@ - + https://github.com/dotnet/arcade - f99e2f9b8aca08b8fa0877e78a448c0c0b74236d + 3addc5d978d01e864792d2c6bce0b50ec105f857 - + https://github.com/dotnet/arcade - f99e2f9b8aca08b8fa0877e78a448c0c0b74236d + 3addc5d978d01e864792d2c6bce0b50ec105f857 - + https://github.com/dotnet/arcade - f99e2f9b8aca08b8fa0877e78a448c0c0b74236d + 3addc5d978d01e864792d2c6bce0b50ec105f857 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index b8f47cf7b..72a5b4d57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ - 8.0.0-beta.23401.3 + 8.0.0-beta.23402.2 diff --git a/global.json b/global.json index b9a440c7c..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.23401.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23401.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23402.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23402.2" } } From e12f683e7c9243e505a6d1ec0079ee258c13006b Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 7 Aug 2023 07:15:26 -0500 Subject: [PATCH 7/8] Revert "aspnetcore patch to exclude WasmLinkerTest project from build" (#17122) --- ...rTest-project-is-not-included-in-bui.patch | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 src/SourceBuild/patches/aspnetcore/0001-Ensure-WasmLinkerTest-project-is-not-included-in-bui.patch 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; From c7045b1a4a4fd64558c9291a88aeb03b692b9ec5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 21:08:19 +0000 Subject: [PATCH 8/8] [main] Update dependencies from dotnet/source-build-reference-packages (#17096) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49a573c97..56ce87c05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -231,9 +231,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - b5368f118ae0b04a7ea1c08c41ba5df3494ff7c6 + b0cef4cffdd83138fa76c8a6430f7f8c2aa09f07