From adec60b3bb36cd01af4dd8da03049bfc45a57ca6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jan 2022 13:38:13 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/installer build 20220118.4 Microsoft.Dotnet.Sdk.Internal From Version 6.0.200-preview.22063.5 -> To Version 6.0.200-preview.22068.4 --- 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 2654c9e2ac6..2de5bf6dfa4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 2d72e717b3ffe4e6094d153a9cc970da971ed753 + 41ae4ef8f2facd5d0ca990dc379522b8825ed95d https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 1cf02d90243..c992d4e6114 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.200-preview.22063.5 + 6.0.200-preview.22068.4 6.0.100-1.21519.4 5.0.0-beta.20181.7 6.0.0-beta.21212.6 From e8be52e780e681edd60e35a881d7d50527cae854 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jan 2022 13:25:29 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/installer build 20220119.5 Microsoft.Dotnet.Sdk.Internal From Version 6.0.200-preview.22063.5 -> To Version 6.0.200-preview.22069.5 --- 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 2de5bf6dfa4..d02239d66a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 41ae4ef8f2facd5d0ca990dc379522b8825ed95d + c90f7a2280db25b4284dd11ae9239d8a4aa357ae https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index c992d4e6114..ef8ceb8905e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.200-preview.22068.4 + 6.0.200-preview.22069.5 6.0.100-1.21519.4 5.0.0-beta.20181.7 6.0.0-beta.21212.6 From b1b1e694d16453ba6d4b78134c7df5d78a8eee0c Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 5 Jan 2022 15:53:08 -0600 Subject: [PATCH 3/6] [build] specify --azure-feed Context: https://github.com/dotnet/install-scripts/issues/229 --- .../Steps/Step_InstallDotNetPreview.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index e59cef765eb..a212b775558 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -102,10 +102,18 @@ async Task InstallDotNetAsync (Context context, string dotnetPath, string var type = runtimeOnly ? "runtime" : "SDK"; Log.StatusLine ($"Installing dotnet {type} '{version}'..."); + //TODO: temporarily specify the feed until we get: + // https://github.com/dotnet/install-scripts/issues/229 + var feed = "https://dotnetbuilds.blob.core.windows.net/public"; if (Context.IsWindows) { var args = new List { - "-NoProfile", "-ExecutionPolicy", "unrestricted", "-file", dotnetScriptPath, - "-Version", version, "-InstallDir", dotnetPath, "-Verbose" + "-NoProfile", + "-ExecutionPolicy", "unrestricted", + "-file", dotnetScriptPath, + "-Version", version, + "-InstallDir", dotnetPath, + "-AzureFeed", feed, + "-Verbose" }; if (runtimeOnly) args.AddRange (new string [] { "-Runtime", "dotnet" }); @@ -113,7 +121,11 @@ async Task InstallDotNetAsync (Context context, string dotnetPath, string return Utilities.RunCommand ("powershell.exe", args.ToArray ()); } else { var args = new List { - dotnetScriptPath, "--version", version, "--install-dir", dotnetPath, "--verbose" + dotnetScriptPath, + "--version", version, + "--install-dir", dotnetPath, + "--azure-feed", feed, + "--verbose" }; if (runtimeOnly) args.AddRange (new string [] { "-Runtime", "dotnet" }); From b17aa988b1f21b654e687625a358d634b9ffd2bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Jan 2022 13:41:44 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/installer build 20220121.6 Microsoft.Dotnet.Sdk.Internal From Version 6.0.200-preview.22063.5 -> To Version 6.0.200-preview.22071.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 d02239d66a4..5ef178e147e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - c90f7a2280db25b4284dd11ae9239d8a4aa357ae + 9d335dacf2a133830c14b3b4c46d59ae8a35af2c https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index ef8ceb8905e..d9e941349be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.200-preview.22069.5 + 6.0.200-preview.22071.6 6.0.100-1.21519.4 5.0.0-beta.20181.7 6.0.0-beta.21212.6 From 5ed517e7b4ab7956224c688c9c3d3ad15dbcf4a2 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 24 Jan 2022 16:32:05 -0600 Subject: [PATCH 5/6] Revert "[build] specify --azure-feed" This reverts commit b1b1e694d16453ba6d4b78134c7df5d78a8eee0c. --- .../Steps/Step_InstallDotNetPreview.cs | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index a212b775558..e59cef765eb 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -102,18 +102,10 @@ async Task InstallDotNetAsync (Context context, string dotnetPath, string var type = runtimeOnly ? "runtime" : "SDK"; Log.StatusLine ($"Installing dotnet {type} '{version}'..."); - //TODO: temporarily specify the feed until we get: - // https://github.com/dotnet/install-scripts/issues/229 - var feed = "https://dotnetbuilds.blob.core.windows.net/public"; if (Context.IsWindows) { var args = new List { - "-NoProfile", - "-ExecutionPolicy", "unrestricted", - "-file", dotnetScriptPath, - "-Version", version, - "-InstallDir", dotnetPath, - "-AzureFeed", feed, - "-Verbose" + "-NoProfile", "-ExecutionPolicy", "unrestricted", "-file", dotnetScriptPath, + "-Version", version, "-InstallDir", dotnetPath, "-Verbose" }; if (runtimeOnly) args.AddRange (new string [] { "-Runtime", "dotnet" }); @@ -121,11 +113,7 @@ async Task InstallDotNetAsync (Context context, string dotnetPath, string return Utilities.RunCommand ("powershell.exe", args.ToArray ()); } else { var args = new List { - dotnetScriptPath, - "--version", version, - "--install-dir", dotnetPath, - "--azure-feed", feed, - "--verbose" + dotnetScriptPath, "--version", version, "--install-dir", dotnetPath, "--verbose" }; if (runtimeOnly) args.AddRange (new string [] { "-Runtime", "dotnet" }); From 4a2be2a5743764c585b613963d9a002ee8afafaa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Jan 2022 13:39:12 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/installer build 20220124.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.200-preview.22063.5 -> To Version 6.0.200-rtm.22074.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 88f654a5d4b..cae73f05539 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 9d335dacf2a133830c14b3b4c46d59ae8a35af2c + 52d63724693b2038e76ac0d67c2fa93ca0dc1654 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 1ede5b81015..ad6a63899c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.200-preview.22071.6 + 6.0.200-rtm.22074.2 6.0.100-1.21519.4 5.0.0-beta.20181.7 6.0.0-beta.21212.6