From 72db4520efde966dd0dabc59412c9e4c8b2f4ffe Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 10 Feb 2023 16:20:29 -0800 Subject: [PATCH 1/7] Add lci files to filter localization --- .../osx/clisdk/resources/conclusion.html.lci | 84 +++++++++++++++++++ .../osx/clisdk/resources/welcome.html.lci | 84 +++++++++++++++++++ 2 files changed, 168 insertions(+) create mode 100644 src/redist/targets/packaging/osx/clisdk/resources/conclusion.html.lci create mode 100644 src/redist/targets/packaging/osx/clisdk/resources/welcome.html.lci diff --git a/src/redist/targets/packaging/osx/clisdk/resources/conclusion.html.lci b/src/redist/targets/packaging/osx/clisdk/resources/conclusion.html.lci new file mode 100644 index 000000000..9de14a934 --- /dev/null +++ b/src/redist/targets/packaging/osx/clisdk/resources/conclusion.html.lci @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/redist/targets/packaging/osx/clisdk/resources/welcome.html.lci b/src/redist/targets/packaging/osx/clisdk/resources/welcome.html.lci new file mode 100644 index 000000000..801d5132b --- /dev/null +++ b/src/redist/targets/packaging/osx/clisdk/resources/welcome.html.lci @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From bcb30d460f73a63c1963a12b6ab7571e8753eaa5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 17 Feb 2023 14:46:11 -0800 Subject: [PATCH 2/7] Move the lci files directly next to the end files --- .../osx/clisdk/resources/{ => en.lproj}/conclusion.html.lci | 0 .../osx/clisdk/resources/{ => en.lproj}/welcome.html.lci | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/redist/targets/packaging/osx/clisdk/resources/{ => en.lproj}/conclusion.html.lci (100%) rename src/redist/targets/packaging/osx/clisdk/resources/{ => en.lproj}/welcome.html.lci (100%) diff --git a/src/redist/targets/packaging/osx/clisdk/resources/conclusion.html.lci b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html.lci similarity index 100% rename from src/redist/targets/packaging/osx/clisdk/resources/conclusion.html.lci rename to src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html.lci diff --git a/src/redist/targets/packaging/osx/clisdk/resources/welcome.html.lci b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html.lci similarity index 100% rename from src/redist/targets/packaging/osx/clisdk/resources/welcome.html.lci rename to src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html.lci From 0bfde92839a98d1a0f31be2923ab708bd6dba165 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 13 Apr 2023 13:41:45 -0700 Subject: [PATCH 3/7] Rename the files to lcl file extensions --- .../en.lproj/{conclusion.html.lci => conclusion.html.lcl} | 0 .../resources/en.lproj/{welcome.html.lci => welcome.html.lcl} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/redist/targets/packaging/osx/clisdk/resources/en.lproj/{conclusion.html.lci => conclusion.html.lcl} (100%) rename src/redist/targets/packaging/osx/clisdk/resources/en.lproj/{welcome.html.lci => welcome.html.lcl} (100%) diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html.lci b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html.lcl similarity index 100% rename from src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html.lci rename to src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html.lcl diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html.lci b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html.lcl similarity index 100% rename from src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html.lci rename to src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html.lcl From 83c5bc9d51416cf0694f563711fb67256dc89f36 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 13 Apr 2023 14:15:39 -0700 Subject: [PATCH 4/7] That didn't work so switching them back. --- .../en.lproj/{conclusion.html.lcl => conclusion.html.lci} | 0 .../resources/en.lproj/{welcome.html.lcl => welcome.html.lci} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/redist/targets/packaging/osx/clisdk/resources/en.lproj/{conclusion.html.lcl => conclusion.html.lci} (100%) rename src/redist/targets/packaging/osx/clisdk/resources/en.lproj/{welcome.html.lcl => welcome.html.lci} (100%) diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html.lcl b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html.lci similarity index 100% rename from src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html.lcl rename to src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html.lci diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html.lcl b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html.lci similarity index 100% rename from src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html.lcl rename to src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html.lci From 864797cdcedbb209b45e57c9578ad523ab9eeaf2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 14 Apr 2023 15:33:41 -0700 Subject: [PATCH 5/7] Move the lci files up a level --- .../osx/clisdk/resources/{en.lproj => }/conclusion.html.lci | 0 .../osx/clisdk/resources/{en.lproj => }/welcome.html.lci | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/redist/targets/packaging/osx/clisdk/resources/{en.lproj => }/conclusion.html.lci (100%) rename src/redist/targets/packaging/osx/clisdk/resources/{en.lproj => }/welcome.html.lci (100%) diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html.lci b/src/redist/targets/packaging/osx/clisdk/resources/conclusion.html.lci similarity index 100% rename from src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html.lci rename to src/redist/targets/packaging/osx/clisdk/resources/conclusion.html.lci diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html.lci b/src/redist/targets/packaging/osx/clisdk/resources/welcome.html.lci similarity index 100% rename from src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html.lci rename to src/redist/targets/packaging/osx/clisdk/resources/welcome.html.lci From 5e9593fcb400d89be90cfd08069b9be4581a2bdb Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 17 Apr 2023 14:52:02 -0500 Subject: [PATCH 6/7] Patch to fix command-line-api to work with latest SDK (#16136) --- ...y-cast-default-for-Task.Delay-method.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/SourceBuild/patches/command-line-api/0003-Explicitly-cast-default-for-Task.Delay-method.patch diff --git a/src/SourceBuild/patches/command-line-api/0003-Explicitly-cast-default-for-Task.Delay-method.patch b/src/SourceBuild/patches/command-line-api/0003-Explicitly-cast-default-for-Task.Delay-method.patch new file mode 100644 index 000000000..f71f4b885 --- /dev/null +++ b/src/SourceBuild/patches/command-line-api/0003-Explicitly-cast-default-for-Task.Delay-method.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Mon, 17 Apr 2023 12:26:51 -0500 +Subject: [PATCH] Explicitly cast default for Task.Delay method + +Backport: Not needed since this code is removed in latest version of command-line-api +--- + src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs b/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs +index 0fb30887..cd59971d 100644 +--- a/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs ++++ b/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs +@@ -107,7 +107,7 @@ namespace System.CommandLine + if (timeout! > TimeSpan.Zero) + { + Task +- .Delay(timeout.Value, default) ++ .Delay(timeout.Value, (CancellationToken)default) + .ContinueWith(t => + { + // Prevent our ProcessExit from intervene and block the exit From 9404ce488ab3cfcc22e3141292ab8feb46a6681d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 17 Apr 2023 15:49:55 -0500 Subject: [PATCH 7/7] Update SB prebuilts tarball (#16137) --- src/SourceBuild/content/eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index e5e80ae70..e9378e798 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -19,7 +19,7 @@ prep.sh and pipeline scripts, outside of MSBuild. --> https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.7.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-19.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-20.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23210.1-centos.8-x64.tar.gz