From a612700fa438e33ae76dc91c515f0b29eee3d507 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Jan 2023 13:30:59 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/installer build 20230127.6 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.23070.23 -> To Version 8.0.100-alpha.1.23077.6 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100 From Version 8.0.0-alpha.1.23070.1 -> To Version 8.0.0-alpha.1.23076.9 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4907216b6f3..dadd8c0e4f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - 779a6442daf6b95c5662d2f0c20801de5e179a05 + 1d88a6bfb16c024ae327168e2c4db0267fbf62ac https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - ddb69889684da95dc8d83a51b987774de5e47598 + 007df054a526ed9e3dc70b43bfa330943bd4816a - + https://github.com/dotnet/emsdk - 5b46122b31036064483ce2e55b5e2240e5548204 + ff2362091c3ce19e09606a7de927670ba5d1cb81 diff --git a/eng/Versions.props b/eng/Versions.props index b6912ea71dc..0da0bf29e1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 8.0.100-alpha.1.23070.23 + 8.0.100-alpha.1.23077.6 8.0.100-1.23067.1 - 8.0.0-alpha.1.23070.1 + 8.0.0-alpha.1.23076.9 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-alpha.1.23066.1 + 8.0.0-alpha.1.23073.2 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) 7.0.100-rc.1.22410.7 From bc741f88d756a545ed9ed2b3d31cbb97e2e8aee7 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 31 Jan 2023 09:59:36 -0600 Subject: [PATCH 2/3] `darc update-dependencies --id 164908` I also made changes to: * Use `8.0.100-alpha.1` version band on Mono/Emscripten workloads * Update logic in `xaprepare` --- .../xaprepare/Steps/Step_InstallDotNetPreview.cs | 11 ++++------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 12 ++++++------ 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index e2c15d75d14..e7b2d6b7605 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -54,18 +54,15 @@ protected override async Task Execute (Context context) var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests"); // Copy the WorkloadManifest.* files from the latest Microsoft.NET.Workload.* listed in package-download.proj - // NOTE: the packages that actually *exist* in .NET 8 are mismatched right now... - var dotnets = new [] { ".net6", ".net7", "" }; + var dotnets = new [] { ".net6", ".net7", ".current" }; foreach (var dotnet in dotnets) { var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), $"microsoft.net.workload.mono.toolchain{dotnet}"); foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "WorkloadManifest.*")) { Utilities.CopyFileToDir (file, destination); } - if (dotnet != "") { - destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand), $"microsoft.net.workload.emscripten{dotnet}"); - foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "WorkloadManifest.*")) { - Utilities.CopyFileToDir (file, destination); - } + destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand), $"microsoft.net.workload.emscripten{dotnet}"); + foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "WorkloadManifest.*")) { + Utilities.CopyFileToDir (file, destination); } } diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dadd8c0e4f5..33b4096ba6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - 1d88a6bfb16c024ae327168e2c4db0267fbf62ac + dec120944450abb58bc07a2fcdae2f4383bfd6bf https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - 007df054a526ed9e3dc70b43bfa330943bd4816a + 9529803ae29c2804880c6bd8ca710b8c037cb498 - + https://github.com/dotnet/emsdk - ff2362091c3ce19e09606a7de927670ba5d1cb81 + 0fe864fc71191ff4ee18e59ef0af2929ca367a11 diff --git a/eng/Versions.props b/eng/Versions.props index 0da0bf29e1e..19024b93e52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,13 +1,13 @@ - 8.0.100-alpha.1.23077.6 + 8.0.100-alpha.1.23080.11 8.0.100-1.23067.1 - 8.0.0-alpha.1.23076.9 + 8.0.0-alpha.1.23080.2 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-alpha.1.23073.2 - $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) + 8.0.0-alpha.1.23077.4 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version) 7.0.100-rc.1.22410.7 @@ -16,7 +16,7 @@ $(DotNetPreviewVersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc|alpha).\d+`)) $(DotNetPreviewVersionBand) - 8.0.100 - 8.0.100 + $(DotNetPreviewVersionBand) + $(DotNetPreviewVersionBand) From 76bb64702acd70664178aa914dc26be7e808f7ac Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 31 Jan 2023 10:34:02 -0600 Subject: [PATCH 3/3] Fixes for changes to version bands `$(DotNetPreviewVersionBand)` should now be `8.0.100-alpha.1` `package-download.proj` should now install appropriately named manifest packs. --- .../xaprepare/xaprepare/ConfigAndData/Configurables.cs | 4 ++-- .../xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs | 6 +++--- build-tools/xaprepare/xaprepare/package-download.proj | 3 ++- eng/Versions.props | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs index 1ada940a77f..c26df75a5e1 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs @@ -329,7 +329,7 @@ public static partial class Paths public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine ( XAPackagesDir, - $"microsoft.net.workload.mono.toolchain{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}", + $"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}", ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETCoreAppRefPackageVersion) ); @@ -337,7 +337,7 @@ public static partial class Paths public static string MicrosoftNETWorkloadEmscriptenPackageDir => Path.Combine ( XAPackagesDir, - $"microsoft.net.workload.emscripten{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}", + $"microsoft.net.workload.emscripten.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}", ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion) ); diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index e7b2d6b7605..705b2b11da9 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -54,13 +54,13 @@ protected override async Task Execute (Context context) var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests"); // Copy the WorkloadManifest.* files from the latest Microsoft.NET.Workload.* listed in package-download.proj - var dotnets = new [] { ".net6", ".net7", ".current" }; + var dotnets = new [] { "net6", "net7", "current" }; foreach (var dotnet in dotnets) { - var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), $"microsoft.net.workload.mono.toolchain{dotnet}"); + var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), $"microsoft.net.workload.mono.toolchain.{dotnet}"); foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "WorkloadManifest.*")) { Utilities.CopyFileToDir (file, destination); } - destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand), $"microsoft.net.workload.emscripten{dotnet}"); + destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand), $"microsoft.net.workload.emscripten.{dotnet}"); foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "WorkloadManifest.*")) { Utilities.CopyFileToDir (file, destination); } diff --git a/build-tools/xaprepare/xaprepare/package-download.proj b/build-tools/xaprepare/xaprepare/package-download.proj index 6d6d4805ac5..ec7b895af10 100644 --- a/build-tools/xaprepare/xaprepare/package-download.proj +++ b/build-tools/xaprepare/xaprepare/package-download.proj @@ -20,9 +20,10 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will - + + diff --git a/eng/Versions.props b/eng/Versions.props index 19024b93e52..926781e3a0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,9 @@ - $([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `^\d+\.\d+\.\d`))00 - $(DotNetPreviewVersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc|alpha).\d+`)) + $([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `^\d+\.\d+\.\d`))00 + $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc|alpha).\d+`)) + $(DotNetPreviewVersionBand) $(DotNetPreviewVersionBand) $(DotNetPreviewVersionBand)