From 30d1bbb7b05e80880d38dbf31a573763f06bd8b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Aug 2023 12:05:55 +0000 Subject: [PATCH 01/17] Update dependencies from https://github.com/dotnet/arcade build 20230803.7 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.23402.2 -> To Version 8.0.0-beta.23403.7 --- eng/Version.Details.xml | 72 ++++++++++----------- eng/Versions.props | 30 ++++----- eng/common/templates/steps/source-build.yml | 9 +++ global.json | 6 +- 4 files changed, 63 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eafc683b679fe..9cea50822dcbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 @@ -117,69 +117,69 @@ d3553ca27fb1c128f302f52b73c0079e65d62ea8 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 https://github.com/dotnet/runtime-assets @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness 437aa378e900dbfd179b5552e71b81bc99e1e746 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 29732ffa29823..5483dd38557cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,21 +83,21 @@ 8.0.100-preview.7.23329.3 - 8.0.0-beta.23402.2 - 8.0.0-beta.23402.2 - 8.0.0-beta.23402.2 - 8.0.0-beta.23402.2 - 8.0.0-beta.23402.2 - 2.5.1-beta.23402.2 - 8.0.0-beta.23402.2 - 8.0.0-beta.23402.2 - 8.0.0-beta.23402.2 - 8.0.0-beta.23402.2 - 8.0.0-beta.23402.2 - 8.0.0-beta.23402.2 - 8.0.0-beta.23402.2 - 8.0.0-beta.23402.2 - 8.0.0-beta.23402.2 + 8.0.0-beta.23403.7 + 8.0.0-beta.23403.7 + 8.0.0-beta.23403.7 + 8.0.0-beta.23403.7 + 8.0.0-beta.23403.7 + 2.5.1-beta.23403.7 + 8.0.0-beta.23403.7 + 8.0.0-beta.23403.7 + 8.0.0-beta.23403.7 + 8.0.0-beta.23403.7 + 8.0.0-beta.23403.7 + 8.0.0-beta.23403.7 + 8.0.0-beta.23403.7 + 8.0.0-beta.23403.7 + 8.0.0-beta.23403.7 6.0.0-preview.1.102 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 1100521834a94..41bbb915736a6 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -118,3 +118,12 @@ steps: artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() + +# Manually inject component detection so that we can ignore the source build upstream cache, which contains +# a nupkg cache of input packages (a local feed). +# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' +# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets +- task: ComponentGovernanceComponentDetection@0 + displayName: Component Detection (Exclude upstream cache) + inputs: + ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' diff --git a/global.json b/global.json index daa3917d5f285..15f66d393d4c0 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.23402.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23402.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23402.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23403.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23403.7", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23403.7", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23401.3" From 8c3da25f4e20b5cd3ab0ed7d3ff70e5de3230eb4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Aug 2023 14:01:05 +0000 Subject: [PATCH 02/17] Update dependencies from https://github.com/dotnet/xharness build 20230803.1 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.23403.1 --- .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 e7e8375b1ed16..3439f0bb72df5 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "8.0.0-prerelease.23401.3", + "version": "8.0.0-prerelease.23403.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cea50822dcbb..4c0ff660cbd5e 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 + 7e3f2975a8767cd416594d7194ba617f6ef8e88e - + https://github.com/dotnet/xharness - 437aa378e900dbfd179b5552e71b81bc99e1e746 + 7e3f2975a8767cd416594d7194ba617f6ef8e88e - + https://github.com/dotnet/xharness - 437aa378e900dbfd179b5552e71b81bc99e1e746 + 7e3f2975a8767cd416594d7194ba617f6ef8e88e https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 5483dd38557cf..3381908d8ffd3 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.23401.3 - 8.0.0-prerelease.23401.3 - 8.0.0-prerelease.23401.3 + 8.0.0-prerelease.23403.1 + 8.0.0-prerelease.23403.1 + 8.0.0-prerelease.23403.1 8.0.0-alpha.0.23377.1 2.4.2 1.0.0 From 5347d38e43ecc7cecc17b7221f1b21d540f4c20e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Aug 2023 12:05:09 +0000 Subject: [PATCH 03/17] Update dependencies from https://github.com/dotnet/arcade build 20230804.2 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.23402.2 -> To Version 8.0.0-beta.23404.2 --- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 30 ++++---- eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 3810 -> 3842 bytes global.json | 6 +- 4 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c0ff660cbd5e..547c6dc72b96f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 @@ -117,69 +117,69 @@ d3553ca27fb1c128f302f52b73c0079e65d62ea8 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 https://github.com/dotnet/runtime-assets @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness 7e3f2975a8767cd416594d7194ba617f6ef8e88e - + https://github.com/dotnet/arcade - bbafffba44a4dcfce6eee08bdd59db29b919f306 + 1d39647dd408f7afd99cce01f26bba1d6bdeb248 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 3381908d8ffd3..51b3f69102807 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,21 +83,21 @@ 8.0.100-preview.7.23329.3 - 8.0.0-beta.23403.7 - 8.0.0-beta.23403.7 - 8.0.0-beta.23403.7 - 8.0.0-beta.23403.7 - 8.0.0-beta.23403.7 - 2.5.1-beta.23403.7 - 8.0.0-beta.23403.7 - 8.0.0-beta.23403.7 - 8.0.0-beta.23403.7 - 8.0.0-beta.23403.7 - 8.0.0-beta.23403.7 - 8.0.0-beta.23403.7 - 8.0.0-beta.23403.7 - 8.0.0-beta.23403.7 - 8.0.0-beta.23403.7 + 8.0.0-beta.23404.2 + 8.0.0-beta.23404.2 + 8.0.0-beta.23404.2 + 8.0.0-beta.23404.2 + 8.0.0-beta.23404.2 + 2.5.1-beta.23404.2 + 8.0.0-beta.23404.2 + 8.0.0-beta.23404.2 + 8.0.0-beta.23404.2 + 8.0.0-beta.23404.2 + 8.0.0-beta.23404.2 + 8.0.0-beta.23404.2 + 8.0.0-beta.23404.2 + 8.0.0-beta.23404.2 + 8.0.0-beta.23404.2 6.0.0-preview.1.102 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 15f66d393d4c0..852c937a793c6 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.23403.7", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23403.7", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23403.7", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23404.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23404.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23404.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23401.3" From 9b8589d6097bc2df4e215e05963345cb4ad08843 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Aug 2023 12:23:54 +0000 Subject: [PATCH 04/17] Update dependencies from https://github.com/dotnet/runtime build 20230806.6 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.23401.3 -> To Version 8.0.0-rc.1.23406.6 --- 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 547c6dc72b96f..df7c0eccec746 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -289,34 +289,34 @@ https://github.com/dotnet/llvm-project da8189885069c59206b903f1b73c240cd9326327 - + https://github.com/dotnet/runtime - 70b5e1522c1ca3841413b5841623c90c297cb177 + edbd5c769a19798b6955050baccf99e6797d3208 - + https://github.com/dotnet/runtime - 70b5e1522c1ca3841413b5841623c90c297cb177 + edbd5c769a19798b6955050baccf99e6797d3208 - + https://github.com/dotnet/runtime - 70b5e1522c1ca3841413b5841623c90c297cb177 + edbd5c769a19798b6955050baccf99e6797d3208 - + https://github.com/dotnet/runtime - 70b5e1522c1ca3841413b5841623c90c297cb177 + edbd5c769a19798b6955050baccf99e6797d3208 - + https://github.com/dotnet/runtime - 70b5e1522c1ca3841413b5841623c90c297cb177 + edbd5c769a19798b6955050baccf99e6797d3208 - + https://github.com/dotnet/runtime - 70b5e1522c1ca3841413b5841623c90c297cb177 + edbd5c769a19798b6955050baccf99e6797d3208 - + https://github.com/dotnet/runtime - 70b5e1522c1ca3841413b5841623c90c297cb177 + edbd5c769a19798b6955050baccf99e6797d3208 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 51b3f69102807..44538e20b40ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,10 +101,10 @@ 6.0.0-preview.1.102 - 8.0.0-rc.1.23401.3 + 8.0.0-rc.1.23406.6 6.0.0 - 8.0.0-rc.1.23401.3 + 8.0.0-rc.1.23406.6 8.0.0-preview.7.23325.2 16.0.5-alpha.1.23401.4 16.0.5-alpha.1.23401.4 @@ -132,12 +132,12 @@ 5.0.0 5.0.0 7.0.0 - 8.0.0-rc.1.23401.3 + 8.0.0-rc.1.23406.6 6.0.0 7.0.0 4.5.4 4.5.0 - 8.0.0-rc.1.23401.3 + 8.0.0-rc.1.23406.6 8.0.0-beta.23401.1 8.0.0-beta.23401.1 @@ -209,11 +209,11 @@ 7.0.0-preview-20221010.1 - 8.0.0-rc.1.23401.3 + 8.0.0-rc.1.23406.6 0.11.4-alpha.23374.2 - 8.0.0-rc.1.23401.3 + 8.0.0-rc.1.23406.6 8.0.0-rc.1.23381.1 diff --git a/global.json b/global.json index 852c937a793c6..40377c0cf8dd5 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23404.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23401.3" + "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6" } } From 5942d0d9e2bb7919bc0b8167390235cacf53f218 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Aug 2023 12:04:46 +0000 Subject: [PATCH 05/17] Update dependencies from https://github.com/dotnet/arcade build 20230807.1 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.23402.2 -> To Version 8.0.0-beta.23407.1 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- global.json | 6 ++-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df7c0eccec746..d078872ce4137 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 @@ -117,69 +117,69 @@ d3553ca27fb1c128f302f52b73c0079e65d62ea8 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 https://github.com/dotnet/runtime-assets @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness 7e3f2975a8767cd416594d7194ba617f6ef8e88e - + https://github.com/dotnet/arcade - 1d39647dd408f7afd99cce01f26bba1d6bdeb248 + 9a7b1d30fd536da1b71d74b184e857ee96c12a76 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 44538e20b40ec..bc9ac37d9eaf0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,21 +83,21 @@ 8.0.100-preview.7.23329.3 - 8.0.0-beta.23404.2 - 8.0.0-beta.23404.2 - 8.0.0-beta.23404.2 - 8.0.0-beta.23404.2 - 8.0.0-beta.23404.2 - 2.5.1-beta.23404.2 - 8.0.0-beta.23404.2 - 8.0.0-beta.23404.2 - 8.0.0-beta.23404.2 - 8.0.0-beta.23404.2 - 8.0.0-beta.23404.2 - 8.0.0-beta.23404.2 - 8.0.0-beta.23404.2 - 8.0.0-beta.23404.2 - 8.0.0-beta.23404.2 + 8.0.0-beta.23407.1 + 8.0.0-beta.23407.1 + 8.0.0-beta.23407.1 + 8.0.0-beta.23407.1 + 8.0.0-beta.23407.1 + 2.5.1-beta.23407.1 + 8.0.0-beta.23407.1 + 8.0.0-beta.23407.1 + 8.0.0-beta.23407.1 + 8.0.0-beta.23407.1 + 8.0.0-beta.23407.1 + 8.0.0-beta.23407.1 + 8.0.0-beta.23407.1 + 8.0.0-beta.23407.1 + 8.0.0-beta.23407.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 40377c0cf8dd5..3b6ac3b98f824 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.23404.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23404.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23404.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23407.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23407.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23407.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6" From bca8af63c08000c1cf6af1768a04f1953d51ba31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Aug 2023 12:31:08 +0000 Subject: [PATCH 06/17] Update dependencies from https://github.com/dotnet/icu build 20230807.2 Microsoft.NETCore.Runtime.ICU.Transport From Version 8.0.0-rc.1.23381.1 -> To Version 8.0.0-rc.1.23407.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 d078872ce4137..f51c26f8ad337 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 9ce895ca3ea8d3978219abc9756a067fb90a2089 + 92124838d3f0efde3ac483a904691a611babb9a0 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index bc9ac37d9eaf0..8fc71f431f0fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,7 +215,7 @@ 8.0.0-rc.1.23406.6 - 8.0.0-rc.1.23381.1 + 8.0.0-rc.1.23407.2 2.1.7 8.0.0-alpha.1.23180.2 From 282e815e7dc3b0ebc8d392f05af7d4e17fec13e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Aug 2023 12:31:39 +0000 Subject: [PATCH 07/17] Update dependencies from https://github.com/dotnet/xharness build 20230807.2 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.23407.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 3439f0bb72df5..bd60f2e67ceac 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "8.0.0-prerelease.23403.1", + "version": "8.0.0-prerelease.23407.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f51c26f8ad337..0d6caed073188 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 92124838d3f0efde3ac483a904691a611babb9a0 + 9ce895ca3ea8d3978219abc9756a067fb90a2089 https://github.com/dotnet/msquic @@ -318,17 +318,17 @@ https://github.com/dotnet/runtime edbd5c769a19798b6955050baccf99e6797d3208 - + https://github.com/dotnet/xharness - 7e3f2975a8767cd416594d7194ba617f6ef8e88e + 480b9159eb7e69b182a87581d5a336e97e0b6dae - + https://github.com/dotnet/xharness - 7e3f2975a8767cd416594d7194ba617f6ef8e88e + 480b9159eb7e69b182a87581d5a336e97e0b6dae - + https://github.com/dotnet/xharness - 7e3f2975a8767cd416594d7194ba617f6ef8e88e + 480b9159eb7e69b182a87581d5a336e97e0b6dae https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 8fc71f431f0fa..5f0a66c33899e 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.23403.1 - 8.0.0-prerelease.23403.1 - 8.0.0-prerelease.23403.1 + 8.0.0-prerelease.23407.2 + 8.0.0-prerelease.23407.2 + 8.0.0-prerelease.23407.2 8.0.0-alpha.0.23377.1 2.4.2 1.0.0 From 97616de978df9f99df21c381c7367fcb2031f9fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Aug 2023 12:32:15 +0000 Subject: [PATCH 08/17] Update dependencies from https://github.com/dotnet/emsdk build 20230807.1 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rc.1.23402.3 -> To Version 8.0.0-rc.1.23407.1 --- 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 0d6caed073188..7b3583802d3c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,9 +90,9 @@ a6181f7751932da21fd2e22b2b26f44f913f2da7 - + https://github.com/dotnet/emsdk - 7a17b406530ad1d08895bcb1eeb8a64c62951da6 + 6299510d1a43e512457ac1055f4c9335476de7b3 diff --git a/eng/Versions.props b/eng/Versions.props index 5f0a66c33899e..e77dd002b7961 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.23402.3 + 8.0.0-rc.1.23407.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 1.1.87-gba258badda From 3a810cf7104b0e0b59611ace5a1f3ac448e82cee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Aug 2023 12:32:52 +0000 Subject: [PATCH 09/17] Update dependencies from https://github.com/dotnet/hotreload-utils build 20230807.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 8.0.0-alpha.0.23377.1 -> To Version 8.0.0-alpha.0.23407.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 7b3583802d3c3..712afe1c3fefb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -350,9 +350,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 068998a5d91f55a619d1d072ab3094dacd5d6a4f - + https://github.com/dotnet/hotreload-utils - 3f15c1f197fcdb70719b5e3ef0e328dbcd664a3f + 696312fd2a60671797b12311a4cf387d3cd14dd0 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index e77dd002b7961..7d6f921ae6d9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,7 +182,7 @@ 8.0.0-prerelease.23407.2 8.0.0-prerelease.23407.2 8.0.0-prerelease.23407.2 - 8.0.0-alpha.0.23377.1 + 8.0.0-alpha.0.23407.2 2.4.2 1.0.0 2.4.5 From e6cba93b63a8a66e1663b6dad263d079d8ed1e6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Aug 2023 13:47:54 +0000 Subject: [PATCH 10/17] Update dependencies from https://github.com/dotnet/cecil build 20230807.2 Microsoft.DotNet.Cecil From Version 0.11.4-alpha.23374.2 -> To Version 0.11.4-alpha.23407.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 712afe1c3fefb..721810dd50a0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,9 +85,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759b - + https://github.com/dotnet/cecil - a6181f7751932da21fd2e22b2b26f44f913f2da7 + 2f4ef297939628143389ddeea569874ded0b1c1b diff --git a/eng/Versions.props b/eng/Versions.props index 7d6f921ae6d9a..9feb02f09f641 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -211,7 +211,7 @@ 8.0.0-rc.1.23406.6 - 0.11.4-alpha.23374.2 + 0.11.4-alpha.23407.2 8.0.0-rc.1.23406.6 From 4614d1a30f5ca57a6888a5ee29181ee5fd0a8af8 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Tue, 8 Aug 2023 19:43:01 +0000 Subject: [PATCH 11/17] Fix. --- .../tests/System/Globalization/CalendarTestBase.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/CalendarTestBase.cs b/src/libraries/System.Globalization.Calendars/tests/System/Globalization/CalendarTestBase.cs index 563af14ef500e..061d07108e526 100644 --- a/src/libraries/System.Globalization.Calendars/tests/System/Globalization/CalendarTestBase.cs +++ b/src/libraries/System.Globalization.Calendars/tests/System/Globalization/CalendarTestBase.cs @@ -429,11 +429,8 @@ public void GetEra_Invalid_ThrowsArgumentOutOfRangeException() Calendar calendar = Calendar; Assert.All(DateTime_TestData(calendar), dt => { - // JapaneseCalendar throws on ICU, but not on NLS - if ((calendar is JapaneseCalendar && (PlatformDetection.IsNlsGlobalization || PlatformDetection.IsHybridGlobalizationOnOSX)) || - calendar is HebrewCalendar || - calendar is TaiwanLunisolarCalendar || - calendar is JapaneseLunisolarCalendar) + // JapaneseCalendar throws on ICU, but not on NLS or in HybridGlobalization on Browser + if ((calendar is JapaneseCalendar && (PlatformDetection.IsNlsGlobalization || PlatformDetection.IsHybridGlobalizationOnBrowser)) || calendar is HebrewCalendar || calendar is TaiwanLunisolarCalendar || calendar is JapaneseLunisolarCalendar) { calendar.GetEra(dt); } From 02db086dceaeafdd89cb6ee5cf2b80f7558df32a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Aug 2023 12:05:04 +0000 Subject: [PATCH 12/17] Update dependencies from https://github.com/dotnet/arcade build 20230808.6 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.23402.2 -> To Version 8.0.0-beta.23408.6 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23381.1 -> To Version 1.0.0-beta.23407.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 76 +++++++-------- eng/Versions.props | 30 +++--- eng/common/native/init-distro-rid.sh | 132 ++++++++++++++++++++++++++ eng/common/native/init-os-and-arch.sh | 80 ++++++++++++++++ global.json | 10 +- 5 files changed, 270 insertions(+), 58 deletions(-) create mode 100644 eng/common/native/init-distro-rid.sh create mode 100644 eng/common/native/init-os-and-arch.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2496f118bc89..d62e7384da8e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,79 +107,79 @@ - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/xliff-tasks - d3553ca27fb1c128f302f52b73c0079e65d62ea8 + 185f62b89abf4b87778a403a1134c6bd1680a91c - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 https://github.com/dotnet/runtime-assets @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness 480b9159eb7e69b182a87581d5a336e97e0b6dae - + https://github.com/dotnet/arcade - 9a7b1d30fd536da1b71d74b184e857ee96c12a76 + 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index fe9da64fff0ba..e142aa1321ad1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,21 +83,21 @@ 8.0.100-preview.7.23329.3 - 8.0.0-beta.23407.1 - 8.0.0-beta.23407.1 - 8.0.0-beta.23407.1 - 8.0.0-beta.23407.1 - 8.0.0-beta.23407.1 - 2.5.1-beta.23407.1 - 8.0.0-beta.23407.1 - 8.0.0-beta.23407.1 - 8.0.0-beta.23407.1 - 8.0.0-beta.23407.1 - 8.0.0-beta.23407.1 - 8.0.0-beta.23407.1 - 8.0.0-beta.23407.1 - 8.0.0-beta.23407.1 - 8.0.0-beta.23407.1 + 8.0.0-beta.23408.6 + 8.0.0-beta.23408.6 + 8.0.0-beta.23408.6 + 8.0.0-beta.23408.6 + 8.0.0-beta.23408.6 + 2.5.1-beta.23408.6 + 8.0.0-beta.23408.6 + 8.0.0-beta.23408.6 + 8.0.0-beta.23408.6 + 8.0.0-beta.23408.6 + 8.0.0-beta.23408.6 + 8.0.0-beta.23408.6 + 8.0.0-beta.23408.6 + 8.0.0-beta.23408.6 + 8.0.0-beta.23408.6 6.0.0-preview.1.102 diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh new file mode 100644 index 0000000000000..aba9fe24028b0 --- /dev/null +++ b/eng/common/native/init-distro-rid.sh @@ -0,0 +1,132 @@ +#!/usr/bin/env bash + +# getNonPortableDistroRid +# +# Input: +# targetOs: (str) +# targetArch: (str) +# rootfsDir: (str) +# +# Return: +# non-portable rid +getNonPortableDistroRid() +{ + local targetOs="$1" + local targetArch="$2" + local rootfsDir="$3" + local nonPortableRid="" + + if [ "$targetOs" = "linux" ]; then + if [ -e "${rootfsDir}/etc/os-release" ]; then + source "${rootfsDir}/etc/os-release" + + if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then + # remove the last version digit + VERSION_ID="${VERSION_ID%.*}" + fi + + if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then + nonPortableRid="${ID}.${VERSION_ID}-${targetArch}" + else + # Rolling release distros either do not set VERSION_ID, set it as blank or + # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux); + # so omit it here to be consistent with everything else. + nonPortableRid="${ID}-${targetArch}" + fi + + elif [ -e "${rootfsDir}/android_platform" ]; then + source "$rootfsDir"/android_platform + nonPortableRid="$RID" + fi + fi + + if [ "$targetOs" = "freebsd" ]; then + # $rootfsDir can be empty. freebsd-version is shell script and it should always work. + __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; }) + nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}" + elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then + __android_sdk_version=$(getprop ro.build.version.sdk) + nonPortableRid="android.$__android_sdk_version-${targetArch}" + elif [ "$targetOs" = "illumos" ]; then + __uname_version=$(uname -v) + case "$__uname_version" in + omnios-*) + __omnios_major_version=$(echo "${__uname_version:8:2}") + nonPortableRid=omnios."$__omnios_major_version"-"$targetArch" + ;; + joyent_*) + __smartos_major_version=$(echo "${__uname_version:7:4}") + nonPortableRid=smartos."$__smartos_major_version"-"$targetArch" + ;; + illumos_*) + nonPortableRid=openindiana-"$targetArch" + ;; + esac + elif [ "$targetOs" = "solaris" ]; then + __uname_version=$(uname -v) + __solaris_major_version=$(echo "${__uname_version%.*}") + nonPortableRid=solaris."$__solaris_major_version"-"$targetArch" + elif [ "$targetOs" = "haiku" ]; then + __uname_release=$(uname -r) + nonPortableRid=haiku.r"$__uname_release"-"$targetArch" + fi + + echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')" +} + +# initDistroRidGlobal +# +# Input: +# os: (str) +# arch: (str) +# isPortable: (int) +# rootfsDir?: (nullable:string) +# +# Return: +# None +# +# Notes: +# +# It is important to note that the function does not return anything, but it +# exports the following variables on success: +# +# __DistroRid : Non-portable rid of the target platform. +# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform. +# +initDistroRidGlobal() +{ + local targetOs="$1" + local targetArch="$2" + local isPortable="$3" + local rootfsDir="" + if [ "$#" -ge 4 ]; then + rootfsDir="$4" + fi + + if [ -n "${rootfsDir}" ]; then + # We may have a cross build. Check for the existence of the rootfsDir + if [ ! -e "${rootfsDir}" ]; then + echo "Error rootfsDir has been passed, but the location is not valid." + exit 1 + fi + fi + + __DistroRid=$(getNonPortableDistroRid "${targetOs}" "${targetArch}" "${rootfsDir}") + + if [ -z "${__PortableTargetOS:-}" ]; then + __PortableTargetOS="$targetOs" + + STRINGS="$(command -v strings || true)" + if [ -z "$STRINGS" ]; then + STRINGS="$(command -v llvm-strings || true)" + fi + + # Check for musl-based distros (e.g Alpine Linux, Void Linux). + if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || + ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then + __PortableTargetOS="linux-musl" + fi + fi + + export __DistroRid __PortableTargetOS +} diff --git a/eng/common/native/init-os-and-arch.sh b/eng/common/native/init-os-and-arch.sh new file mode 100644 index 0000000000000..e693617a6c2b6 --- /dev/null +++ b/eng/common/native/init-os-and-arch.sh @@ -0,0 +1,80 @@ +#!/usr/bin/env bash + +# Use uname to determine what the OS is. +OSName=$(uname -s | tr '[:upper:]' '[:lower:]') + +if command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then + OSName="android" +fi + +case "$OSName" in +freebsd|linux|netbsd|openbsd|sunos|android|haiku) + os="$OSName" ;; +darwin) + os=osx ;; +*) + echo "Unsupported OS $OSName detected!" + exit 1 ;; +esac + +# On Solaris, `uname -m` is discouraged, see https://docs.oracle.com/cd/E36784_01/html/E36870/uname-1.html +# and `uname -p` returns processor type (e.g. i386 on amd64). +# The appropriate tool to determine CPU is isainfo(1) https://docs.oracle.com/cd/E36784_01/html/E36870/isainfo-1.html. +if [ "$os" = "sunos" ]; then + if uname -o 2>&1 | grep -q illumos; then + os="illumos" + else + os="solaris" + fi + CPUName=$(isainfo -n) +else + # For the rest of the operating systems, use uname(1) to determine what the CPU is. + CPUName=$(uname -m) +fi + +case "$CPUName" in + arm64|aarch64) + arch=arm64 + ;; + + loongarch64) + arch=loongarch64 + ;; + + riscv64) + arch=riscv64 + ;; + + amd64|x86_64) + arch=x64 + ;; + + armv7l|armv8l) + if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then + arch=armel + else + arch=arm + fi + ;; + + armv6l) + arch=armv6 + ;; + + i[3-6]86) + echo "Unsupported CPU $CPUName detected, build might not succeed!" + arch=x86 + ;; + + s390x) + arch=s390x + ;; + + ppc64le) + arch=ppc64le + ;; + *) + echo "Unknown CPU $CPUName detected!" + exit 1 + ;; +esac diff --git a/global.json b/global.json index 3b6ac3b98f824..65b8f16706719 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "8.0.100-preview.6.23330.14", + "version": "8.0.100-preview.7.23376.3", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100-preview.6.23330.14" + "dotnet": "8.0.100-preview.7.23376.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23407.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23407.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23407.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23408.6", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23408.6", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23408.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6" From 8db456f1a2288912406c75e5eca3cdc4a9dce8df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Aug 2023 12:05:52 +0000 Subject: [PATCH 13/17] Update dependencies from https://github.com/dotnet/icu build 20230807.2 Microsoft.NETCore.Runtime.ICU.Transport From Version 8.0.0-rc.1.23381.1 -> To Version 8.0.0-rc.1.23407.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 d62e7384da8e8..7b2de879da9d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 9ce895ca3ea8d3978219abc9756a067fb90a2089 + 92124838d3f0efde3ac483a904691a611babb9a0 https://github.com/dotnet/msquic From 7aabc2fc8212dd1febfc996f5f2ad889626d0cf2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Aug 2023 12:30:12 +0000 Subject: [PATCH 14/17] Update dependencies from https://github.com/dotnet/runtime-assets build 20230808.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.23401.1 -> To Version 8.0.0-beta.23408.1 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b2de879da9d9..fc9fa3d312144 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,57 +181,57 @@ https://github.com/dotnet/arcade 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 https://github.com/dotnet/llvm-project @@ -354,9 +354,9 @@ https://github.com/dotnet/hotreload-utils 696312fd2a60671797b12311a4cf387d3cd14dd0 - + https://github.com/dotnet/runtime-assets - f3a59688fedc19844c670f4d46d7c21ef55cf1f8 + 48270e734aa881c737b80c4fe0459e68aaf08ad6 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index e142aa1321ad1..6b6e47dab130c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -139,20 +139,20 @@ 4.5.0 8.0.0-rc.1.23406.6 - 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 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 + 8.0.0-beta.23408.1 1.0.0-prerelease.23362.5 1.0.0-prerelease.23362.5 From b975b4c16960d6f811bb8759387d9bdd7732a0cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Aug 2023 12:04:49 +0000 Subject: [PATCH 15/17] Update dependencies from https://github.com/dotnet/arcade build 20230809.5 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.23402.2 -> To Version 8.0.0-beta.23409.5 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23381.1 -> To Version 1.0.0-beta.23408.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 6 ++-- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc9fa3d312144..efb545f2c892b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,79 +107,79 @@ - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/xliff-tasks - 185f62b89abf4b87778a403a1134c6bd1680a91c + 493329204079519072f0241ed26f692bdee0d60c - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d https://github.com/dotnet/runtime-assets @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness 480b9159eb7e69b182a87581d5a336e97e0b6dae - + https://github.com/dotnet/arcade - 5cd8dc258e8177b8542adf7abe45e7cfc1c1b1c0 + bebd2de1988036b47ecefc7e72b66ce2f403e43d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 6b6e47dab130c..9df455ea02911 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,21 +83,21 @@ 8.0.100-preview.7.23329.3 - 8.0.0-beta.23408.6 - 8.0.0-beta.23408.6 - 8.0.0-beta.23408.6 - 8.0.0-beta.23408.6 - 8.0.0-beta.23408.6 - 2.5.1-beta.23408.6 - 8.0.0-beta.23408.6 - 8.0.0-beta.23408.6 - 8.0.0-beta.23408.6 - 8.0.0-beta.23408.6 - 8.0.0-beta.23408.6 - 8.0.0-beta.23408.6 - 8.0.0-beta.23408.6 - 8.0.0-beta.23408.6 - 8.0.0-beta.23408.6 + 8.0.0-beta.23409.5 + 8.0.0-beta.23409.5 + 8.0.0-beta.23409.5 + 8.0.0-beta.23409.5 + 8.0.0-beta.23409.5 + 2.5.1-beta.23409.5 + 8.0.0-beta.23409.5 + 8.0.0-beta.23409.5 + 8.0.0-beta.23409.5 + 8.0.0-beta.23409.5 + 8.0.0-beta.23409.5 + 8.0.0-beta.23409.5 + 8.0.0-beta.23409.5 + 8.0.0-beta.23409.5 + 8.0.0-beta.23409.5 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 65b8f16706719..1e8ca8ecb5683 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.7.23376.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23408.6", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23408.6", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23408.6", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23409.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23409.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6" From 400365ae628cc66a8bddc2d1ff4cda42f5c67014 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Aug 2023 12:39:46 +0000 Subject: [PATCH 16/17] Update dependencies from https://github.com/dotnet/emsdk build 20230809.6 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rc.1.23402.3 -> To Version 8.0.0-rc.1.23409.6 --- 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 efb545f2c892b..8e5fcafe0eb94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,9 +90,9 @@ 2f4ef297939628143389ddeea569874ded0b1c1b - + https://github.com/dotnet/emsdk - 6299510d1a43e512457ac1055f4c9335476de7b3 + 63b66faa8838f09a8bd3e19af9d4b35de1d5016f diff --git a/eng/Versions.props b/eng/Versions.props index 9df455ea02911..d5ac9f6bab42a 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.23407.1 + 8.0.0-rc.1.23409.6 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 1.1.87-gba258badda From a29a13b27ce9ee16b7dac4edede4994c433200ce Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 10 Aug 2023 14:05:53 -0400 Subject: [PATCH 17/17] Use PackageDownload not PackageReference for JitTools in SuperFileCheck.csproj --- .../tools/SuperFileCheck/SuperFileCheck.csproj | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/coreclr/tools/SuperFileCheck/SuperFileCheck.csproj b/src/coreclr/tools/SuperFileCheck/SuperFileCheck.csproj index b954034a29b22..a3cf4fe6be2fd 100644 --- a/src/coreclr/tools/SuperFileCheck/SuperFileCheck.csproj +++ b/src/coreclr/tools/SuperFileCheck/SuperFileCheck.csproj @@ -40,9 +40,19 @@ - - $(JITToolsVersion) - + + [$(JITToolsVersion)] + + + + + + + +