From 136f129ddca49729a24f0e65465fc638bd584c70 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Fri, 17 May 2024 07:50:49 -0700 Subject: [PATCH] Update to arcade with WiX fix (225808) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 3810 -> 3842 bytes global.json | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7adb7da350b..6b9af2d6ffe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,17 +39,17 @@ - + https://github.com/dotnet/arcade - 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 + 4c7a2a3a3a23698ba4ce15cf9a98560c654483b6 - + https://github.com/dotnet/arcade - 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 + 4c7a2a3a3a23698ba4ce15cf9a98560c654483b6 - + https://github.com/dotnet/arcade - 91f852db39356b3f8fd9efa00a3dee82a9a7c2b3 + 4c7a2a3a3a23698ba4ce15cf9a98560c654483b6 diff --git a/eng/Versions.props b/eng/Versions.props index 0041f662680..811fcbe8531 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ 7.0.0 - 7.0.0-beta.24209.2 + 7.0.0-beta.24266.2 diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss index 6661fed566e49b0c206665bc21f135e06c9b89c4..858a0b237c62ce4f2ee12aa14794f160f6b122b7 100644 GIT binary patch delta 274 zcmaDP+a$;Ke*az|n#iQX$U9L_gN>JqL4iSGqQ3ORGAW?Q1Qjlb2!joS{zOAbi0B6! zCSI<|ip=VhLl{FCc_;TV>rD1wb_28WKvIp|l9MO!aluqwVe-JE3Mi$(QiGy^k2Qyp zcXJgh2O}fzByO?EbC~%yFJp^h0r5&8LVSE82)RSthrlX5CZFL2dIY2eC=as!FRvoZ VC5(KsFeZ}w7+K^&o(6kQ830GCL398B delta 289 zcmZpYdnC*B|KCJ59Y(H+iP97Oc_zkKO`NVWagPln*JOPr<;k*)5sCa-6G z0Wy(Sbn`m43>Gj`eDVTrmdU$#btcDi1KkdioE*R>0M!WMtz(ne{FHkKBZ~3}45bsf c6(=X~aZS$V(*VjreBsR}4-AfjvJ?He0GoYJrT_o{ diff --git a/global.json b/global.json index 2963cc7e319..537dd83306e 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,7 @@ "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24209.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24209.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24266.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24266.2" } }