gentoo auto-resync : 24:01:2024 - 04:45:52

2 files changed, 14 insertions, 38 deletions

diff --git a/app-shells/pwsh/files/pwsh-7.3.3-copy-ref.fsx b/app-shells/pwsh/files/pwsh-7.3.3-copy-ref.fsx
index eb33fc4884dc..127d6eb9444b 100644
--- a/app-shells/pwsh/files/pwsh-7.3.3-copy-ref.fsx
+++ b/app-shells/pwsh/files/pwsh-7.3.3-copy-ref.fsx
@@ -1,43 +1,30 @@
-// Copyright 1999-2023 Gentoo Authors
+// Copyright 1999-2024 Gentoo Authors
 // Distributed under the terms of the GNU General Public License v2
 
-
 open System.IO
 open System.Runtime.InteropServices
 
+let args = fsi.CommandLineArgs |> Array.tail
 
-let args =
-    fsi.CommandLineArgs |> Array.tail
-
-
-let wanted_directory =
-    System.IO.Path.GetFullPath args.[0]
-
-printfn $" * Wanted directory: {wanted_directory}"
+let wantedDirectory = System.IO.Path.GetFullPath args.[0]
 
-System.IO.Directory.CreateDirectory wanted_directory
+printfn $" * Wanted directory: {wantedDirectory}"
 
+System.IO.Directory.CreateDirectory wantedDirectory
 
-let runtime_directory =
-    RuntimeEnvironment.GetRuntimeDirectory ()
+let runtimeDirectory = RuntimeEnvironment.GetRuntimeDirectory()
 
-printfn $" * Runtime directory: {runtime_directory}"
+printfn $" * Runtime directory: {runtimeDirectory}"
 
-
-let runtime_files =
-    System.IO.Directory.GetFiles runtime_directory
+let runtimeFiles =
+    System.IO.Directory.GetFiles runtimeDirectory
     |> Array.filter (fun s -> s.EndsWith ".dll")
     |> Array.sort
 
-printfn $" * Copying {runtime_files.Length} files"
-
-
-for runtime_file in runtime_files do
-    let runtime_file_name =
-        System.IO.Path.GetFileName runtime_file
+printfn $" * Copying {runtimeFiles.Length} files into {wantedDirectory}"
 
-    let wanted_runtime_file =
-        System.IO.Path.Join(wanted_directory, runtime_file_name)
+for runtime_file in runtimeFiles do
+    let runtimeFileName = System.IO.Path.GetFileName runtime_file
+    let wantedRuntimeFile = System.IO.Path.Join(wantedDirectory, runtimeFileName)
 
-    FileInfo(runtime_file).CopyTo(wanted_runtime_file, true)
-    |> ignore
+    FileInfo(runtime_file).CopyTo(wantedRuntimeFile, true) |> ignore
diff --git a/app-shells/pwsh/files/pwsh-7.3.3-disable-telemetry.patch b/app-shells/pwsh/files/pwsh-7.3.3-disable-telemetry.patch
deleted file mode 100644
index 5a1852a31898..000000000000
--- a/app-shells/pwsh/files/pwsh-7.3.3-disable-telemetry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/System.Management.Automation/utils/Telemetry.cs
-+++ b/src/System.Management.Automation/utils/Telemetry.cs
-@@ -139,7 +139,7 @@ namespace Microsoft.PowerShell.Telemetry
-         {
-             // If we can't send telemetry, there's no reason to do any of this
-             CanSendTelemetry = !GetEnvironmentVariableAsBool(name: _telemetryOptoutEnvVar, defaultValue: false);
--            if (CanSendTelemetry)
-+            if (false)
-             {
-                 s_sessionId = Guid.NewGuid().ToString();
-                 TelemetryConfiguration configuration = TelemetryConfiguration.CreateDefault();