diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f03965aa50fc3c..e7e8375b1ed169 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "8.0.0-prerelease.23377.1", + "version": "8.0.0-prerelease.23401.3", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb27eb5bd0b55a..917e994f0842e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,69 +12,69 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 https://github.com/dotnet/command-line-api @@ -90,9 +90,9 @@ a6181f7751932da21fd2e22b2b26f44f913f2da7 - + https://github.com/dotnet/emsdk - 3a52d07cd6a500d81d9cee79cbc8f0b9a90e1dbf + 29f305909d4960cdba56195ae28693ff38aad812 @@ -107,216 +107,216 @@ - + https://github.com/dotnet/arcade - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d - + https://github.com/dotnet/xliff-tasks - a61cdec7a7f96c654b8c92bea0167df0427cc26c + d3553ca27fb1c128f302f52b73c0079e65d62ea8 - + 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 - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d - + 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 - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d - + 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 - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d - + 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 - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/llvm-project - b3413378946dee5b1787266d11fc2e3c4e1d6ce7 + da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/runtime - 8470b87bcb366cc06486c6f7aa23ae6de3259eba + 70b5e1522c1ca3841413b5841623c90c297cb177 - + https://github.com/dotnet/runtime - 8470b87bcb366cc06486c6f7aa23ae6de3259eba + 70b5e1522c1ca3841413b5841623c90c297cb177 - + https://github.com/dotnet/runtime - 8470b87bcb366cc06486c6f7aa23ae6de3259eba + 70b5e1522c1ca3841413b5841623c90c297cb177 - + https://github.com/dotnet/runtime - 8470b87bcb366cc06486c6f7aa23ae6de3259eba + 70b5e1522c1ca3841413b5841623c90c297cb177 - + https://github.com/dotnet/runtime - 8470b87bcb366cc06486c6f7aa23ae6de3259eba + 70b5e1522c1ca3841413b5841623c90c297cb177 - + https://github.com/dotnet/runtime - 8470b87bcb366cc06486c6f7aa23ae6de3259eba + 70b5e1522c1ca3841413b5841623c90c297cb177 - + https://github.com/dotnet/runtime - 5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c + 70b5e1522c1ca3841413b5841623c90c297cb177 https://github.com/dotnet/xharness @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness 437aa378e900dbfd179b5552e71b81bc99e1e746 - + https://github.com/dotnet/arcade - aeaa48c51d6494adc1b1fab870e7b8c89752d1ba + f99e2f9b8aca08b8fa0877e78a448c0c0b74236d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -354,9 +354,9 @@ https://github.com/dotnet/hotreload-utils 3f15c1f197fcdb70719b5e3ef0e328dbcd664a3f - + https://github.com/dotnet/runtime-assets - 95277f38e68b66f1b48600d90d456c32c9ae0fa2 + f3a59688fedc19844c670f4d46d7c21ef55cf1f8 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 7de9f197f5bbbd..39f1074a42a6d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,37 +83,37 @@ 8.0.100-preview.7.23329.3 - 8.0.0-beta.23381.1 - 8.0.0-beta.23381.1 - 8.0.0-beta.23381.1 - 8.0.0-beta.23381.1 - 8.0.0-beta.23381.1 - 2.5.1-beta.23381.1 - 8.0.0-beta.23381.1 - 8.0.0-beta.23381.1 - 8.0.0-beta.23381.1 - 8.0.0-beta.23381.1 - 8.0.0-beta.23381.1 - 8.0.0-beta.23381.1 - 8.0.0-beta.23381.1 - 8.0.0-beta.23381.1 - 8.0.0-beta.23381.1 + 8.0.0-beta.23401.3 + 8.0.0-beta.23401.3 + 8.0.0-beta.23401.3 + 8.0.0-beta.23401.3 + 8.0.0-beta.23401.3 + 2.5.1-beta.23401.3 + 8.0.0-beta.23401.3 + 8.0.0-beta.23401.3 + 8.0.0-beta.23401.3 + 8.0.0-beta.23401.3 + 8.0.0-beta.23401.3 + 8.0.0-beta.23401.3 + 8.0.0-beta.23401.3 + 8.0.0-beta.23401.3 + 8.0.0-beta.23401.3 6.0.0-preview.1.102 - 8.0.0-rc.1.23381.1 + 8.0.0-rc.1.23401.3 6.0.0 - 8.0.0-rc.1.23381.1 + 8.0.0-rc.1.23401.3 8.0.0-preview.7.23325.2 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 6.0.0 1.1.1 @@ -132,27 +132,27 @@ 5.0.0 5.0.0 7.0.0 - 8.0.0-rc.1.23381.1 + 8.0.0-rc.1.23401.3 6.0.0 7.0.0 4.5.4 4.5.0 - 8.0.0-rc.1.23381.1 + 8.0.0-rc.1.23401.3 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 - 8.0.0-beta.23377.2 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 + 8.0.0-beta.23401.1 1.0.0-prerelease.23362.5 1.0.0-prerelease.23362.5 @@ -179,9 +179,9 @@ 1.1.0 17.4.0-preview-20220707-01 - 8.0.0-prerelease.23377.1 - 8.0.0-prerelease.23377.1 - 8.0.0-prerelease.23377.1 + 8.0.0-prerelease.23401.3 + 8.0.0-prerelease.23401.3 + 8.0.0-prerelease.23401.3 8.0.0-alpha.0.23377.1 2.4.2 1.0.0 @@ -209,49 +209,49 @@ 7.0.0-preview-20221010.1 - 8.0.0-rc.1.23381.1 + 8.0.0-rc.1.23401.3 0.11.4-alpha.23374.2 - 8.0.0-rc.1.23374.1 + 8.0.0-rc.1.23401.3 8.0.0-rc.1.23381.1 2.1.7 8.0.0-alpha.1.23180.2 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 - 8.0.0-rc.1.23377.1 + 8.0.0-rc.1.23401.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 - 16.0.5-alpha.1.23378.1 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 + 16.0.5-alpha.1.23401.4 3.1.7 1.0.406601 diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1 index 7f28d9c59ec69c..f031ed5b25e9fa 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 6ec35b5ef92b2a..809f640e39b717 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "8.0.100-preview.6.23330.14" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23381.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23381.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23381.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23401.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23401.3", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23401.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23381.1" + "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23401.3" } }