From 37675ae504047aedccc074f964121b4fe43b89db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Aug 2023 20:33:18 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/runtime build 20230801.3 Microsoft.DotNet.ILCompiler , Microsoft.NET.ILLink.Tasks , Microsoft.NET.Sdk.IL , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.ILAsm , runtime.native.System.IO.Ports , System.Text.Json From Version 8.0.0-rc.1.23374.1 -> To Version 8.0.0-rc.1.23401.3 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb27eb5bd0b55a..1a315ddbe6d282 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -289,34 +289,34 @@ https://github.com/dotnet/llvm-project b3413378946dee5b1787266d11fc2e3c4e1d6ce7 - + 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 diff --git a/eng/Versions.props b/eng/Versions.props index 7de9f197f5bbbd..9249e10b1a0420 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,10 +101,10 @@ 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 @@ -132,12 +132,12 @@ 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 @@ -209,11 +209,11 @@ 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 diff --git a/global.json b/global.json index 6ec35b5ef92b2a..cedd13ac5076c1 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23381.1", "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" } } From 687e05328f84ddd11d9eb217da23faf4fbb09535 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Aug 2023 22:42:36 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/llvm-project build 20230801.4 runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter , runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx-x64.Microsoft.NETCore.Runtime.ObjWriter , runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter From Version 16.0.5-alpha.1.23378.1 -> To Version 16.0.5-alpha.1.23401.4 --- eng/Version.Details.xml | 120 ++++++++++++++++++++-------------------- eng/Versions.props | 60 ++++++++++---------- 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a315ddbe6d282..51a89567e57159 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 @@ -233,61 +233,61 @@ https://github.com/dotnet/runtime-assets 95277f38e68b66f1b48600d90d456c32c9ae0fa2 - + 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 diff --git a/eng/Versions.props b/eng/Versions.props index 9249e10b1a0420..975c2b91887457 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,14 +106,14 @@ 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 @@ -220,20 +220,20 @@ 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 - 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 From c60ab8440b7352fc993ec343ffe1a13350e77fdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Aug 2023 12:06:10 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/arcade build 20230801.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions 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 | 76 ++++++++++---------- eng/Versions.props | 30 ++++---- eng/common/sdl/extract-artifact-packages.ps1 | 20 +++--- global.json | 6 +- 4 files changed, 67 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51a89567e57159..049d88a135f64d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,79 +107,79 @@ - + 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 @@ -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 diff --git a/eng/Versions.props b/eng/Versions.props index 975c2b91887457..a01dc60a2d196b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,21 +83,21 @@ 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 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 cedd13ac5076c1..809f640e39b717 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "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.23401.3" From 359159a4b5c0db67f750c72d96ccefd13a452443 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Aug 2023 12:49:13 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/xharness build 20230801.3 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 8.0.0-prerelease.23377.1 -> To Version 8.0.0-prerelease.23401.3 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) 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 049d88a135f64d..e91fcf97278b5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -318,17 +318,17 @@ https://github.com/dotnet/runtime 70b5e1522c1ca3841413b5841623c90c297cb177 - + https://github.com/dotnet/xharness - 437aa378e900dbfd179b5552e71b81bc99e1e746 + c1216531b6c19ac4a6dcd447503e09fe28687cbd - + https://github.com/dotnet/xharness - 437aa378e900dbfd179b5552e71b81bc99e1e746 + c1216531b6c19ac4a6dcd447503e09fe28687cbd - + https://github.com/dotnet/xharness - 437aa378e900dbfd179b5552e71b81bc99e1e746 + c1216531b6c19ac4a6dcd447503e09fe28687cbd https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index a01dc60a2d196b..cbc75c26fe2113 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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 From 57d167fd18909c191f69870f4a4f9c8db1549bd2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Aug 2023 12:49:49 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/runtime-assets build 20230801.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 8.0.0-beta.23377.2 -> To Version 8.0.0-beta.23401.1 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++--------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e91fcf97278b5d..a2d6703baa15da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,57 +181,57 @@ https://github.com/dotnet/arcade 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 @@ -318,17 +318,17 @@ https://github.com/dotnet/runtime 70b5e1522c1ca3841413b5841623c90c297cb177 - + https://github.com/dotnet/xharness - c1216531b6c19ac4a6dcd447503e09fe28687cbd + 437aa378e900dbfd179b5552e71b81bc99e1e746 - + https://github.com/dotnet/xharness - c1216531b6c19ac4a6dcd447503e09fe28687cbd + 437aa378e900dbfd179b5552e71b81bc99e1e746 - + https://github.com/dotnet/xharness - c1216531b6c19ac4a6dcd447503e09fe28687cbd + 437aa378e900dbfd179b5552e71b81bc99e1e746 https://github.com/dotnet/arcade @@ -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 cbc75c26fe2113..2136998a838003 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -139,20 +139,20 @@ 4.5.0 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 From ada04538852f3b61d19981ea1797a6f9d65cabd4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Aug 2023 12:50:19 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/emsdk build 20230801.2 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rc.1.23377.1 -> To Version 8.0.0-rc.1.23401.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2d6703baa15da..917e994f0842e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,9 +90,9 @@ a6181f7751932da21fd2e22b2b26f44f913f2da7 - + https://github.com/dotnet/emsdk - 3a52d07cd6a500d81d9cee79cbc8f0b9a90e1dbf + 29f305909d4960cdba56195ae28693ff38aad812 diff --git a/eng/Versions.props b/eng/Versions.props index 2136998a838003..39f1074a42a6d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -238,7 +238,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport --> - 8.0.0-rc.1.23377.1 + 8.0.0-rc.1.23401.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 1.1.87-gba258badda