From f760239f41468f1a26755d729f80b924a6ff09e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 28 Jul 2022 08:49:52 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#14170) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-rc.1.22366.1 to 7.0.0-rc.1.22376.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rc.1.22366.1 to 7.0.0-rc.1.22376.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rc.1.22366.1 to 7.0.0-rc.1.22376.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-rc.1.22368.5 to 7.0.100-rc.1.22377.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-rc.1.22368.5 to 7.0.100-rc.1.22377.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rc.1.22366.1 to 7.0.0-rc.1.22376.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-rc.1.22364.3 to 7.0.0-rc.1.22370.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rc.1.22366.1 to 7.0.0-rc.1.22376.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22370.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.0.6-beta.22366.1 to 12.0.6-beta.22376.4 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.6-beta.22366.1 to 6.0.6-beta.22376.4 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.4.0-preview-20220715-02 to 17.4.0-preview-20220727-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22368.1 to 7.0.100-1.22377.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.4.0-1.22367.2 to 4.4.0-2.22377.14 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.4.0-preview-22366-04 to 17.4.0-preview-22375-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.4.0-preview.1.6 to 6.4.0-preview.1.17 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk) - Merge branch 'main' into darc-main-9ab2355d-f3b4-4448-b7ae-90bca2c547ca - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-9ab2355d-f3b4-4448-b7ae-90bca2c547ca - Resolve source-build patch conflicts - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-9ab2355d-f3b4-4448-b7ae-90bca2c547ca - Remove backported source-build sdk patch - Remove backported fsharp source-build patch --- eng/Version.Details.xml | 124 ++-- eng/Versions.props | 48 +- ...e-SDK-to-7.0.100-rc.1.22368.21-42803.patch | 241 ------- .../fsharp/0002-Update-to-7.0-Arcade.patch | 657 ------------------ ...directly-reference-SCI-and-SCM-5.0.0.patch | 23 - 5 files changed, 86 insertions(+), 1007 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0003-Update-SDK-to-7.0.100-rc.1.22368.21-42803.patch delete mode 100644 src/SourceBuild/tarball/patches/fsharp/0002-Update-to-7.0-Arcade.patch delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Don-t-directly-reference-SCI-and-SCM-5.0.0.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9518fdd25..72e4867ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 72e09152a35ce78eb06abf2c8c3971ab43817069 + 9d9a5d969a820d0940bc716c07669f286e3f7134 - + https://github.com/dotnet/windowsdesktop - 72e09152a35ce78eb06abf2c8c3971ab43817069 + 9d9a5d969a820d0940bc716c07669f286e3f7134 - + https://github.com/dotnet/windowsdesktop - 72e09152a35ce78eb06abf2c8c3971ab43817069 + 9d9a5d969a820d0940bc716c07669f286e3f7134 - + https://github.com/dotnet/windowsdesktop - 72e09152a35ce78eb06abf2c8c3971ab43817069 + 9d9a5d969a820d0940bc716c07669f286e3f7134 - + https://github.com/dotnet/runtime - aafa91036e1efd3d4dcb67eeb261cb6d8f774685 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - aafa91036e1efd3d4dcb67eeb261cb6d8f774685 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - aafa91036e1efd3d4dcb67eeb261cb6d8f774685 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - aafa91036e1efd3d4dcb67eeb261cb6d8f774685 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - aafa91036e1efd3d4dcb67eeb261cb6d8f774685 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - aafa91036e1efd3d4dcb67eeb261cb6d8f774685 + 2c31641b96d880dfb74d46fe63a91c8b35737cab @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - aafa91036e1efd3d4dcb67eeb261cb6d8f774685 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/aspnetcore - 8537d21033f92d6521adf5ce4350d052f48f4185 + c2cba55ca149ab3bd3fadcf97b9d16a74f561111 - + https://github.com/dotnet/aspnetcore - 8537d21033f92d6521adf5ce4350d052f48f4185 + c2cba55ca149ab3bd3fadcf97b9d16a74f561111 - + https://github.com/dotnet/aspnetcore - 8537d21033f92d6521adf5ce4350d052f48f4185 + c2cba55ca149ab3bd3fadcf97b9d16a74f561111 - + https://github.com/dotnet/aspnetcore - 8537d21033f92d6521adf5ce4350d052f48f4185 + c2cba55ca149ab3bd3fadcf97b9d16a74f561111 - + https://github.com/dotnet/aspnetcore - 8537d21033f92d6521adf5ce4350d052f48f4185 + c2cba55ca149ab3bd3fadcf97b9d16a74f561111 - + https://github.com/dotnet/aspnetcore - 8537d21033f92d6521adf5ce4350d052f48f4185 + c2cba55ca149ab3bd3fadcf97b9d16a74f561111 - + https://github.com/dotnet/aspnetcore - 8537d21033f92d6521adf5ce4350d052f48f4185 + c2cba55ca149ab3bd3fadcf97b9d16a74f561111 https://github.com/dotnet/test-templates @@ -98,66 +98,66 @@ 5e161651b822b9a2a1f9202a4d60077006f286a4 - + https://github.com/dotnet/templating - dd6fd984dc69ebfbe7c6f093888e310a9d92f817 + fd6314b7134eb0022bb6b6997469756f94cf73d0 - + https://github.com/dotnet/templating - dd6fd984dc69ebfbe7c6f093888e310a9d92f817 + fd6314b7134eb0022bb6b6997469756f94cf73d0 - + https://github.com/dotnet/sdk - 5f8d2d4fa2e70c11a9c2b1b0ec45f1c2658082b5 + 34b76a9b82f7887e52ba2f50f088a555d60a4b8c - + https://github.com/dotnet/sdk - 5f8d2d4fa2e70c11a9c2b1b0ec45f1c2658082b5 + 34b76a9b82f7887e52ba2f50f088a555d60a4b8c - + https://github.com/dotnet/winforms - 5c70730ff8edbb3f8ac71501dd3b1dab8520e302 + 0f10e2bdc7a075b7af583f972ce237e9e94c567f - + https://github.com/dotnet/wpf - 68c8848c2904a237a03b08ba3b76f81ce20d60e2 + a23f5b082741ff532edc5cf28d847370c3097b0f - + https://github.com/dotnet/fsharp - e4ef7b3d8b923e0d9b700dd48b2c22e8a7980a06 + 0e8a2053cc2fc7d3801205a873e0afd3b6a1235e - + https://github.com/dotnet/fsharp - e4ef7b3d8b923e0d9b700dd48b2c22e8a7980a06 + 0e8a2053cc2fc7d3801205a873e0afd3b6a1235e - + https://github.com/microsoft/vstest - 1eb80c294954918d6ad766c06c3517f09c423209 + 63149fdc913835956b51759399e0d0ede3ad0ac3 - + https://github.com/dotnet/linker - 31a57b5762d8aceb4a61cc1e6cf96605cce417f1 + f09bacf09ef10b61cf9f19825f8782171a816dab linker - + https://github.com/dotnet/roslyn - 8659bb6911c30a26c813761851ba3c76805c851d + 06c4d76d14427a5e6f6096ba58ed2527a458267d - + https://github.com/dotnet/msbuild - d2871ca139be8aab866ca995696a9902b6da87f9 + a0c9ab143b42fdff9f1dfbb88cff20217cea42c5 - + https://github.com/nuget/nuget.client - 0707bff6451711b69e078ab7d8976f0d211b97a5 + 4a6ca8b1c8656f2c4dbbba3a57a1ecea2d9a6d27 diff --git a/eng/Versions.props b/eng/Versions.props index 77e852471..f69a6a93c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-rc.1.22364.3 + 7.0.0-rc.1.22370.1 - 7.0.0-rc.1.22364.7 + 7.0.0-rc.1.22370.2 - 7.0.100-rc.1.22368.5 + 7.0.100-rc.1.22377.1 @@ -52,45 +52,45 @@ - 7.0.0-rc.1.22368.6 - 7.0.0-rc.1.22368.6 - 7.0.0-rc.1.22368.6 - 7.0.0-rc.1.22368.6 - 7.0.0-rc.1.22368.6 - 7.0.0-rc.1.22368.6 - 7.0.0-rc.1.22368.6 + 7.0.0-rc.1.22377.2 + 7.0.0-rc.1.22377.2 + 7.0.0-rc.1.22377.2 + 7.0.0-rc.1.22377.2 + 7.0.0-rc.1.22377.2 + 7.0.0-rc.1.22377.2 + 7.0.0-rc.1.22377.2 0.2.0 - 7.0.100-rc.1.22368.25 - 7.0.100-rc.1.22368.25 + 7.0.100-rc.1.22377.19 + 7.0.100-rc.1.22377.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rc.1.22367.4 + 7.0.0-rc.1.22376.8 - 7.0.0-rc.1.22367.4 - 7.0.0-rc.1.22367.4 - 7.0.0-rc.1.22367.4 - 7.0.0-rc.1.22367.4 - 7.0.0-rc.1.22367.4 - 7.0.0-rc.1.22367.4 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 2.1.0 - 7.0.0-rc.1.22366.1 - 7.0.0-rc.1.22366.1 - 7.0.0-rc.1.22366.1 - 7.0.0-rc.1.22366.1 + 7.0.0-rc.1.22376.1 + 7.0.0-rc.1.22376.1 + 7.0.0-rc.1.22376.1 + 7.0.0-rc.1.22376.1 @@ -168,7 +168,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-preview-20220715-02 + 17.4.0-preview-20220727-01 diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0003-Update-SDK-to-7.0.100-rc.1.22368.21-42803.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-Update-SDK-to-7.0.100-rc.1.22368.21-42803.patch deleted file mode 100644 index 8517a4371..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0003-Update-SDK-to-7.0.100-rc.1.22368.21-42803.patch +++ /dev/null @@ -1,241 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Stephen Halter -Date: Wed, 20 Jul 2022 09:32:56 -0700 -Subject: [PATCH] Update SDK to 7.0.100-rc.1.22368.21 (#42803) - -Backport: https://github.com/dotnet/aspnetcore/pull/42803 - ---- - global.json | 4 ++-- - .../src/CodeFixRunner.cs | 3 ++- - .../Analyzers/test/Verifiers/DiagnosticVerifier.cs | 4 ++-- - .../WebAssembly/src/HotReload/HotReloadAgent.cs | 11 +++++++++-- - src/Http/Headers/src/HeaderUtilities.cs | 2 +- - src/Http/Headers/src/SetCookieHeaderValue.cs | 3 ++- - src/Middleware/WebSockets/src/HandshakeHelpers.cs | 4 ++-- - .../src/CompilationFailedExceptionFactory.cs | 4 ++-- - src/Shared/ParameterBindingMethodCache.cs | 1 + - src/Testing/src/AssemblyTestLog.cs | 6 +++++- - .../Components/test/Verifiers/DiagnosticVerifier.cs | 4 ++-- - 11 files changed, 30 insertions(+), 16 deletions(-) - -diff --git a/global.json b/global.json -index d7a9a7f4a1..84ca052b3d 100644 ---- a/global.json -+++ b/global.json -@@ -1,9 +1,9 @@ - { - "sdk": { -- "version": "7.0.100-preview.7.22361.1" -+ "version": "7.0.100-rc.1.22368.21" - }, - "tools": { -- "dotnet": "7.0.100-preview.7.22361.1", -+ "dotnet": "7.0.100-rc.1.22368.21", - "runtimes": { - "dotnet/x86": [ - "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" -diff --git a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/CodeFixRunner.cs b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/CodeFixRunner.cs -index 1b0493f4fe..7163503d7e 100644 ---- a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/CodeFixRunner.cs -+++ b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/CodeFixRunner.cs -@@ -3,6 +3,7 @@ - - using System; - using System.Collections.Generic; -+using System.Globalization; - using System.Linq; - using System.Threading; - using System.Threading.Tasks; -@@ -52,7 +53,7 @@ public class CodeFixRunner - { - var message = string.Join( - Environment.NewLine, -- diagnostics.Select(d => CSharpDiagnosticFormatter.Instance.Format(d))); -+ diagnostics.Select(d => CSharpDiagnosticFormatter.Instance.Format(d, CultureInfo.InvariantCulture))); - throw new InvalidOperationException($"Compilation failed:{Environment.NewLine}{message}"); - } - } -diff --git a/src/Components/Analyzers/test/Verifiers/DiagnosticVerifier.cs b/src/Components/Analyzers/test/Verifiers/DiagnosticVerifier.cs -index f020e0a221..8dde75a736 100644 ---- a/src/Components/Analyzers/test/Verifiers/DiagnosticVerifier.cs -+++ b/src/Components/Analyzers/test/Verifiers/DiagnosticVerifier.cs -@@ -169,13 +169,13 @@ public abstract partial class DiagnosticVerifier - expected.Severity, actual.Severity, FormatDiagnostics(analyzer, actual))); - } - -- if (actual.GetMessage() != expected.Message) -+ if (actual.GetMessage(CultureInfo.InvariantCulture) != expected.Message) - { - Assert.True(false, - string.Format( - CultureInfo.InvariantCulture, - "Expected diagnostic message to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", -- expected.Message, actual.GetMessage(), FormatDiagnostics(analyzer, actual))); -+ expected.Message, actual.GetMessage(CultureInfo.InvariantCulture), FormatDiagnostics(analyzer, actual))); - } - } - } -diff --git a/src/Components/WebAssembly/WebAssembly/src/HotReload/HotReloadAgent.cs b/src/Components/WebAssembly/WebAssembly/src/HotReload/HotReloadAgent.cs -index eac34897a6..76606a3264 100644 ---- a/src/Components/WebAssembly/WebAssembly/src/HotReload/HotReloadAgent.cs -+++ b/src/Components/WebAssembly/WebAssembly/src/HotReload/HotReloadAgent.cs -@@ -13,6 +13,9 @@ namespace Microsoft.Extensions.HotReload; - - internal sealed class HotReloadAgent : IDisposable - { -+ /// Flags for hot reload handler Types like MVC's HotReloadService. -+ private const DynamicallyAccessedMemberTypes HotReloadHandlerLinkerFlags = DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods; -+ - private readonly Action _log; - private readonly AssemblyLoadEventHandler _assemblyLoad; - private readonly ConcurrentDictionary> _deltas = new(); -@@ -49,6 +52,8 @@ internal sealed class HotReloadAgent : IDisposable - public List> UpdateApplication { get; } = new(); - } - -+ [UnconditionalSuppressMessage("Trimmer", "IL2072", -+ Justification = "The handlerType passed to GetHandlerActions is preserved by MetadataUpdateHandlerAttribute with DynamicallyAccessedMemberTypes.All.")] - private UpdateHandlerActions GetMetadataUpdateHandlerActions() - { - // We need to execute MetadataUpdateHandlers in a well-defined order. For v1, the strategy that is used is to topologically -@@ -84,7 +89,9 @@ internal sealed class HotReloadAgent : IDisposable - return handlerActions; - } - -- internal void GetHandlerActions(UpdateHandlerActions handlerActions, Type handlerType) -+ internal void GetHandlerActions( -+ UpdateHandlerActions handlerActions, -+ [DynamicallyAccessedMembers(HotReloadHandlerLinkerFlags)] Type handlerType) - { - bool methodFound = false; - -@@ -122,7 +129,7 @@ internal sealed class HotReloadAgent : IDisposable - }; - } - -- MethodInfo? GetUpdateMethod(Type handlerType, string name) -+ MethodInfo? GetUpdateMethod([DynamicallyAccessedMembers(HotReloadHandlerLinkerFlags)] Type handlerType, string name) - { - if (handlerType.GetMethod(name, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static, new[] { typeof(Type[]) }) is MethodInfo updateMethod && - updateMethod.ReturnType == typeof(void)) -diff --git a/src/Http/Headers/src/HeaderUtilities.cs b/src/Http/Headers/src/HeaderUtilities.cs -index 1be3d47bc3..59e62d1b56 100644 ---- a/src/Http/Headers/src/HeaderUtilities.cs -+++ b/src/Http/Headers/src/HeaderUtilities.cs -@@ -553,7 +553,7 @@ public static class HeaderUtilities - return string.Create(31, dateTime, (span, dt) => - { - span[0] = span[30] = '"'; -- dt.TryFormat(span.Slice(1), out _, "r"); -+ dt.TryFormat(span.Slice(1), out _, "r", CultureInfo.InvariantCulture); - }); - } - -diff --git a/src/Http/Headers/src/SetCookieHeaderValue.cs b/src/Http/Headers/src/SetCookieHeaderValue.cs -index 719e814179..d20dd90591 100644 ---- a/src/Http/Headers/src/SetCookieHeaderValue.cs -+++ b/src/Http/Headers/src/SetCookieHeaderValue.cs -@@ -4,6 +4,7 @@ - using System.Diagnostics; - using System.Diagnostics.CodeAnalysis; - using System.Diagnostics.Contracts; -+using System.Globalization; - using System.Text; - using Microsoft.Extensions.Primitives; - -@@ -262,7 +263,7 @@ public class SetCookieHeaderValue - Append(ref span, ExpiresToken); - Append(ref span, EqualsToken); - -- var formatted = expiresValue.TryFormat(span, out var charsWritten, ExpiresDateFormat); -+ var formatted = expiresValue.TryFormat(span, out var charsWritten, ExpiresDateFormat, CultureInfo.InvariantCulture); - span = span.Slice(charsWritten); - - Debug.Assert(formatted); -diff --git a/src/Middleware/WebSockets/src/HandshakeHelpers.cs b/src/Middleware/WebSockets/src/HandshakeHelpers.cs -index 3b69336fc1..e0047d2bcd 100644 ---- a/src/Middleware/WebSockets/src/HandshakeHelpers.cs -+++ b/src/Middleware/WebSockets/src/HandshakeHelpers.cs -@@ -171,7 +171,7 @@ internal static class HandshakeHelpers - builder.Append('='); - var len = (parsedOptions.ClientMaxWindowBits > 9) ? 2 : 1; - var span = builder.AppendSpan(len); -- var ret = parsedOptions.ClientMaxWindowBits.TryFormat(span, out var written); -+ var ret = parsedOptions.ClientMaxWindowBits.TryFormat(span, out var written, provider: CultureInfo.InvariantCulture); - Debug.Assert(ret); - Debug.Assert(written == len); - } -@@ -266,7 +266,7 @@ internal static class HandshakeHelpers - builder.Append('='); - var len = (parsedOptions.ServerMaxWindowBits > 9) ? 2 : 1; - var span = builder.AppendSpan(len); -- var ret = parsedOptions.ServerMaxWindowBits.TryFormat(span, out var written); -+ var ret = parsedOptions.ServerMaxWindowBits.TryFormat(span, out var written, provider: CultureInfo.InvariantCulture); - Debug.Assert(ret); - Debug.Assert(written == len); - } -diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/CompilationFailedExceptionFactory.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/CompilationFailedExceptionFactory.cs -index e243ad4896..2a44958603 100644 ---- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/CompilationFailedExceptionFactory.cs -+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/CompilationFailedExceptionFactory.cs -@@ -118,8 +118,8 @@ internal static class CompilationFailedExceptionFactory - { - var mappedLineSpan = diagnostic.Location.GetMappedLineSpan(); - return new DiagnosticMessage( -- diagnostic.GetMessage(), -- CSharpDiagnosticFormatter.Instance.Format(diagnostic), -+ diagnostic.GetMessage(CultureInfo.CurrentCulture), -+ CSharpDiagnosticFormatter.Instance.Format(diagnostic, CultureInfo.CurrentCulture), - mappedLineSpan.Path, - mappedLineSpan.StartLinePosition.Line + 1, - mappedLineSpan.StartLinePosition.Character + 1, -diff --git a/src/Shared/ParameterBindingMethodCache.cs b/src/Shared/ParameterBindingMethodCache.cs -index ea236a9d98..55fa8c19ae 100644 ---- a/src/Shared/ParameterBindingMethodCache.cs -+++ b/src/Shared/ParameterBindingMethodCache.cs -@@ -411,6 +411,7 @@ internal sealed class ParameterBindingMethodCache - return TValue.BindAsync(httpContext, parameter); - } - -+ [RequiresUnreferencedCode("Performs reflection on type hierarchy. This cannot be statically analyzed.")] - private MethodInfo? GetStaticMethodFromHierarchy(Type type, string name, Type[] parameterTypes, Func validateReturnType) - { - bool IsMatch(MethodInfo? method) => method is not null && !method.IsAbstract && validateReturnType(method); -diff --git a/src/Testing/src/AssemblyTestLog.cs b/src/Testing/src/AssemblyTestLog.cs -index 231458991b..5475b6b905 100644 ---- a/src/Testing/src/AssemblyTestLog.cs -+++ b/src/Testing/src/AssemblyTestLog.cs -@@ -286,7 +286,11 @@ public class AssemblyTestLog : IAcceptFailureReports, IDisposable - .Enrich.FromLogContext() - .Enrich.With(new AssemblyLogTimestampOffsetEnricher(logStart)) - .MinimumLevel.Verbose() -- .WriteTo.File(fileName, outputTemplate: "[{TimestampOffset}] [{SourceContext}] [{Level}] {Message:l}{NewLine}{Exception}", flushToDiskInterval: TimeSpan.FromSeconds(1), shared: true) -+ .WriteTo.File(fileName, -+ outputTemplate: "[{TimestampOffset}] [{SourceContext}] [{Level}] {Message:l}{NewLine}{Exception}", -+ flushToDiskInterval: TimeSpan.FromSeconds(1), -+ shared: true, -+ formatProvider: CultureInfo.InvariantCulture) - .CreateLogger(); - - return new SerilogLoggerProvider(serilogger, dispose: true); -diff --git a/src/Tools/SDK-Analyzers/Components/test/Verifiers/DiagnosticVerifier.cs b/src/Tools/SDK-Analyzers/Components/test/Verifiers/DiagnosticVerifier.cs -index f020e0a221..8dde75a736 100644 ---- a/src/Tools/SDK-Analyzers/Components/test/Verifiers/DiagnosticVerifier.cs -+++ b/src/Tools/SDK-Analyzers/Components/test/Verifiers/DiagnosticVerifier.cs -@@ -169,13 +169,13 @@ public abstract partial class DiagnosticVerifier - expected.Severity, actual.Severity, FormatDiagnostics(analyzer, actual))); - } - -- if (actual.GetMessage() != expected.Message) -+ if (actual.GetMessage(CultureInfo.InvariantCulture) != expected.Message) - { - Assert.True(false, - string.Format( - CultureInfo.InvariantCulture, - "Expected diagnostic message to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", -- expected.Message, actual.GetMessage(), FormatDiagnostics(analyzer, actual))); -+ expected.Message, actual.GetMessage(CultureInfo.InvariantCulture), FormatDiagnostics(analyzer, actual))); - } - } - } diff --git a/src/SourceBuild/tarball/patches/fsharp/0002-Update-to-7.0-Arcade.patch b/src/SourceBuild/tarball/patches/fsharp/0002-Update-to-7.0-Arcade.patch deleted file mode 100644 index e1bf25e2b..000000000 --- a/src/SourceBuild/tarball/patches/fsharp/0002-Update-to-7.0-Arcade.patch +++ /dev/null @@ -1,657 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "dotnet-maestro[bot]" -Date: Tue, 5 Jul 2022 12:03:36 +0000 -Subject: [PATCH] Update to 7.0 Arcade - -Backport: https://github.com/dotnet/fsharp/pull/13441 ---- - Proto.sln | 34 ++++++++++++++++ - eng/Version.Details.xml | 4 +- - eng/build-utils.ps1 | 4 +- - eng/build.sh | 3 +- - eng/common/cross/build-rootfs.sh | 33 ++++++++------- - eng/common/cross/toolchain.cmake | 30 +++++++++----- - eng/common/generate-locproject.ps1 | 14 +++---- - eng/common/generate-sbom-prep.ps1 | 2 + - eng/common/generate-sbom-prep.sh | 12 ++++++ - eng/common/init-tools-native.ps1 | 4 +- - eng/common/native/init-compiler.sh | 2 +- - eng/common/tools.ps1 | 2 +- - global.json | 6 +-- - proto.proj | 40 ------------------- - src/FSharp.Build/FSharp.Build.fsproj | 5 ++- - src/FSharp.Core/FSharp.Core.fsproj | 1 + - src/fsc/fscArm64Project/fscArm64.fsproj | 2 +- - src/fsc/fscProject/fsc.fsproj | 12 ++++-- - src/fsi/fsiArm64Project/fsiArm64.fsproj | 2 +- - src/fsi/fsiProject/fsi.fsproj | 12 ++++-- - .../FSharpScriptTests.fs | 13 ------ - tests/fsharp/core/libtest/test.fsx | 2 +- - 23 files changed, 135 insertions(+), 115 deletions(-) - create mode 100644 Proto.sln - delete mode 100644 proto.proj - -diff --git a/Proto.sln b/Proto.sln -new file mode 100644 -index 000000000..d48b1e3d1 ---- /dev/null -+++ b/Proto.sln -@@ -0,0 +1,34 @@ -+ -+Microsoft Visual Studio Solution File, Format Version 12.00 -+# Visual Studio Version 17 -+VisualStudioVersion = 17.2.32630.192 -+MinimumVisualStudioVersion = 10.0.40219.1 -+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Build", "src\FSharp.Build\FSharp.Build.fsproj", "{C02D44B2-BB67-4A17-9678-9D21D93B3930}" -+EndProject -+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsc", "src\fsc\fscProject\fsc.fsproj", "{5BEC9F77-5AE6-4EC3-BDE9-63CF8E1D0086}" -+EndProject -+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsi", "src\fsi\fsiProject\fsi.fsproj", "{07CB51BF-8E98-4CFF-A7BA-99C4A0BC6037}" -+EndProject -+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Core", "src\FSharp.Core\FSharp.Core.fsproj", "{8A772476-D857-4810-9A9C-E67AC61497AB}" -+EndProject -+Global -+ GlobalSection(SolutionConfigurationPlatforms) = preSolution -+ Proto|Any CPU = Proto|Any CPU -+ EndGlobalSection -+ GlobalSection(ProjectConfigurationPlatforms) = postSolution -+ {C02D44B2-BB67-4A17-9678-9D21D93B3930}.Proto|Any CPU.ActiveCfg = Proto|Any CPU -+ {C02D44B2-BB67-4A17-9678-9D21D93B3930}.Proto|Any CPU.Build.0 = Proto|Any CPU -+ {5BEC9F77-5AE6-4EC3-BDE9-63CF8E1D0086}.Proto|Any CPU.ActiveCfg = Proto|Any CPU -+ {5BEC9F77-5AE6-4EC3-BDE9-63CF8E1D0086}.Proto|Any CPU.Build.0 = Proto|Any CPU -+ {07CB51BF-8E98-4CFF-A7BA-99C4A0BC6037}.Proto|Any CPU.ActiveCfg = Proto|Any CPU -+ {07CB51BF-8E98-4CFF-A7BA-99C4A0BC6037}.Proto|Any CPU.Build.0 = Proto|Any CPU -+ {8A772476-D857-4810-9A9C-E67AC61497AB}.Proto|Any CPU.ActiveCfg = Proto|Any CPU -+ {8A772476-D857-4810-9A9C-E67AC61497AB}.Proto|Any CPU.Build.0 = Proto|Any CPU -+ EndGlobalSection -+ GlobalSection(SolutionProperties) = preSolution -+ HideSolutionNode = FALSE -+ EndGlobalSection -+ GlobalSection(ExtensibilityGlobals) = postSolution -+ SolutionGuid = {53F11F0A-D5FC-4410-B875-DC432F12B5AF} -+ EndGlobalSection -+EndGlobal -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index 0ff466b9e..d65e5136c 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -8,9 +8,9 @@ - - - -- -+ - https://github.com/dotnet/arcade -- a264eb13fea14125f3ef8d4056586cd66fa55309 -+ 11672d906390046e77a34b6406d9e02229fd7e45 - - - -diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1 -index 3ba2549e0..2aca2e02a 100644 ---- a/eng/build-utils.ps1 -+++ b/eng/build-utils.ps1 -@@ -256,8 +256,8 @@ function Make-BootstrapBuild() { - Copy-Item "$ArtifactsDir\bin\AssemblyCheck\$bootstrapConfiguration\net6.0" -Destination "$dir\AssemblyCheck" -Force -Recurse - - # prepare compiler -- $protoProject = "`"$RepoRoot\proto.proj`"" -- $args = "build $protoProject -c $bootstrapConfiguration -v $verbosity -f $bootstrapTfm" + $argNoRestore + $argNoIncremental -+ $protoProject = "`"$RepoRoot\proto.sln`"" -+ $args = "build $protoProject -c $bootstrapConfiguration -v $verbosity " + $argNoRestore + $argNoIncremental - if ($binaryLog) { - $logFilePath = Join-Path $LogDir "protoBootstrapLog.binlog" - $args += " /bl:`"$logFilePath`"" -diff --git a/eng/build.sh b/eng/build.sh -index 284bae206..8bac7ce52 100755 ---- a/eng/build.sh -+++ b/eng/build.sh -@@ -262,7 +262,7 @@ function BuildSolution { - fi - if [ ! -f "$bootstrap_dir/fsc.exe" ]; then - BuildMessage="Error building bootstrap" -- MSBuild "$repo_root/proto.proj" \ -+ MSBuild "$repo_root/Proto.sln" \ - /restore \ - /p:Configuration=$bootstrap_config - -@@ -275,7 +275,6 @@ function BuildSolution { - BuildMessage="Error building solution" - MSBuild $toolset_build_proj \ - $bl \ -- /v:$verbosity \ - /p:Configuration=$configuration \ - /p:Projects="$projects" \ - /p:RepoRoot="$repo_root" \ -diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh -index 5a59dcff2..c8540474a 100755 ---- a/eng/common/cross/build-rootfs.sh -+++ b/eng/common/cross/build-rootfs.sh -@@ -5,7 +5,7 @@ set -e - usage() - { - echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]" -- echo "BuildArch can be: arm(default), armel, arm64, x86" -+ echo "BuildArch can be: arm(default), armel, arm64, x86, x64" - echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." - echo " for FreeBSD can be: freebsd12, freebsd13" - echo " for illumos can be: illumos." -@@ -21,6 +21,9 @@ __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) - __InitialDir=$PWD - __BuildArch=arm - __AlpineArch=armv7 -+__FreeBSDArch=arm -+__FreeBSDMachineArch=armv7 -+__IllumosArch=arm7 - __QEMUArch=arm - __UbuntuArch=armhf - __UbuntuRepo="http://ports.ubuntu.com/" -@@ -115,6 +118,8 @@ while :; do - __UbuntuArch=arm64 - __AlpineArch=aarch64 - __QEMUArch=aarch64 -+ __FreeBSDArch=arm64 -+ __FreeBSDMachineArch=aarch64 - ;; - armel) - __BuildArch=armel -@@ -140,6 +145,14 @@ while :; do - __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//') - unset __LLDB_Package - ;; -+ x64) -+ __BuildArch=x64 -+ __UbuntuArch=amd64 -+ __FreeBSDArch=amd64 -+ __FreeBSDMachineArch=amd64 -+ __illumosArch=x86_64 -+ __UbuntuRepo= -+ ;; - x86) - __BuildArch=x86 - __UbuntuArch=i386 -@@ -205,11 +218,6 @@ while :; do - __LLDB_Package="liblldb-6.0-dev" - ;; - tizen) -- if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ] && [ "$__BuildArch" != "x86" ] ; then -- echo "Tizen is available only for arm, armel, arm64 and x86." -- usage; -- exit 1; -- fi - __CodeName= - __UbuntuRepo= - __Tizen=tizen -@@ -228,19 +236,16 @@ while :; do - ;; - freebsd12) - __CodeName=freebsd -- __BuildArch=x64 - __SkipUnmount=1 - ;; - freebsd13) - __CodeName=freebsd - __FreeBSDBase="13.0-RELEASE" - __FreeBSDABI="13" -- __BuildArch=x64 - __SkipUnmount=1 - ;; - illumos) - __CodeName=illumos -- __BuildArch=x64 - __SkipUnmount=1 - ;; - --skipunmount) -@@ -312,8 +317,8 @@ if [[ "$__CodeName" == "alpine" ]]; then - elif [[ "$__CodeName" == "freebsd" ]]; then - mkdir -p $__RootfsDir/usr/local/etc - JOBS="$(getconf _NPROCESSORS_ONLN)" -- wget -O - https://download.freebsd.org/ftp/releases/amd64/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version -- echo "ABI = \"FreeBSD:${__FreeBSDABI}:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf -+ wget -O - https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version -+ echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf - echo "FreeBSD: { url: "pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > ${__RootfsDir}/etc/pkg/FreeBSD.conf - mkdir -p $__RootfsDir/tmp - # get and build package manager -@@ -335,7 +340,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then - echo "Building binutils. Please wait.." - wget -O - https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - - mkdir build-binutils && cd build-binutils -- ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir" -+ ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" - make -j "$JOBS" && make install && cd .. - echo "Building gcc. Please wait.." - wget -O - https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - -@@ -345,7 +350,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then - CFLAGS_FOR_TARGET="-fPIC" - export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET - mkdir build-gcc && cd build-gcc -- ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ -+ ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ - --with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \ - --disable-libquadmath-support --disable-shared --enable-tls - make -j "$JOBS" && make install && cd .. -@@ -353,7 +358,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then - if [[ "$__UseMirror" == 1 ]]; then - BaseUrl=http://pkgsrc.smartos.skylime.net - fi -- BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/x86_64/All -+ BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/${__illumosArch}/All - echo "Downloading dependencies." - read -ra array <<<"$__IllumosPackages" - for package in "${array[@]}"; do -diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake -index eaeeab38f..d5dfc1350 100644 ---- a/eng/common/cross/toolchain.cmake -+++ b/eng/common/cross/toolchain.cmake -@@ -48,11 +48,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") - set(CMAKE_SYSTEM_PROCESSOR aarch64) - if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl) - set(TOOLCHAIN "aarch64-alpine-linux-musl") -- else() -+ elseif(LINUX) - set(TOOLCHAIN "aarch64-linux-gnu") -- endif() -- if(TIZEN) -- set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") -+ if(TIZEN) -+ set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") -+ endif() -+ elseif(FREEBSD) -+ set(triple "aarch64-unknown-freebsd12") - endif() - elseif(TARGET_ARCH_NAME STREQUAL "ppc64le") - set(CMAKE_SYSTEM_PROCESSOR ppc64le) -@@ -66,12 +68,18 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") - if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") - endif() --elseif (FREEBSD) -- set(CMAKE_SYSTEM_PROCESSOR "x86_64") -- set(triple "x86_64-unknown-freebsd12") --elseif (ILLUMOS) -- set(CMAKE_SYSTEM_PROCESSOR "x86_64") -- set(TOOLCHAIN "x86_64-illumos") -+elseif(TARGET_ARCH_NAME STREQUAL "x64") -+ set(CMAKE_SYSTEM_PROCESSOR x86_64) -+ if(LINUX) -+ set(TOOLCHAIN "x86_64-linux-gnu") -+ if(TIZEN) -+ set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") -+ endif() -+ elseif(FREEBSD) -+ set(triple "x86_64-unknown-freebsd12") -+ elseif(ILLUMOS) -+ set(TOOLCHAIN "x86_64-illumos") -+ endif() - else() - message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, ppc64le, s390x and x86 are supported!") - endif() -@@ -218,7 +226,7 @@ endif() - - # Specify compile options - --if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID) OR ILLUMOS) -+if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS) - set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) - set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) - set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) -diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 -index 25e97ac00..afdd17502 100644 ---- a/eng/common/generate-locproject.ps1 -+++ b/eng/common/generate-locproject.ps1 -@@ -10,9 +10,7 @@ Param( - - Set-StrictMode -Version 2.0 - $ErrorActionPreference = "Stop" --. $PSScriptRoot\tools.ps1 -- --Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') -+. $PSScriptRoot\pipeline-logging-functions.ps1 - - $exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json" - $exclusions = @{ Exclusions = @() } -@@ -28,7 +26,7 @@ $jsonFiles = @() - $jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern - $jsonTemplateFiles | ForEach-Object { - $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json -- -+ - $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json" - $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } -@@ -46,7 +44,7 @@ if ($allXlfFiles) { - } - $langXlfFiles | ForEach-Object { - $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf -- -+ - $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" - $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } -@@ -59,7 +57,7 @@ $locJson = @{ - LanguageSet = $LanguageSet - LocItems = @( - $locFiles | ForEach-Object { -- $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" -+ $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" - $continue = $true - foreach ($exclusion in $exclusions.Exclusions) { - if ($outputPath.Contains($exclusion)) -@@ -108,10 +106,10 @@ else { - - if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) { - Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." -- -+ - exit 1 - } - else { - Write-Host "Generated LocProject.json and current LocProject.json are identical." - } --} -\ No newline at end of file -+} -diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 -index a733a8885..3e5c1c74a 100644 ---- a/eng/common/generate-sbom-prep.ps1 -+++ b/eng/common/generate-sbom-prep.ps1 -@@ -2,6 +2,8 @@ Param( - [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed - ) - -+. $PSScriptRoot\pipeline-logging-functions.ps1 -+ - Write-Host "Creating dir $ManifestDirPath" - # create directory for sbom manifest to be placed - if (!(Test-Path -path $ManifestDirPath)) -diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh -index f6c774531..d5c76dc82 100644 ---- a/eng/common/generate-sbom-prep.sh -+++ b/eng/common/generate-sbom-prep.sh -@@ -2,6 +2,18 @@ - - source="${BASH_SOURCE[0]}" - -+# resolve $SOURCE until the file is no longer a symlink -+while [[ -h $source ]]; do -+ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -+ source="$(readlink "$source")" -+ -+ # if $source was a relative symlink, we need to resolve it relative to the path where the -+ # symlink file was located -+ [[ $source != /* ]] && source="$scriptroot/$source" -+done -+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -+. $scriptroot/pipeline-logging-functions.sh -+ - manifest_dir=$1 - - if [ ! -d "$manifest_dir" ] ; then -diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 -index 24a5e65de..8d48ec568 100644 ---- a/eng/common/init-tools-native.ps1 -+++ b/eng/common/init-tools-native.ps1 -@@ -87,6 +87,7 @@ try { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value -+ $InstalledTools = @{} - - if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { - if ($ToolVersion -eq "latest") { -@@ -111,9 +112,10 @@ try { - $ToolPath = Convert-Path -Path $BinPath - Write-Host "Adding $ToolName to the path ($ToolPath)..." - Write-Host "##vso[task.prependpath]$ToolPath" -+ $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } - } - } -- exit 0 -+ return $InstalledTools - } else { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name -diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh -index 6d7ba15e5..4b99a9cad 100644 ---- a/eng/common/native/init-compiler.sh -+++ b/eng/common/native/init-compiler.sh -@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then - # Set default versions - if [[ -z "$majorVersion" ]]; then - # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. -- if [[ "$compiler" == "clang" ]]; then versions=( 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) -+ if [[ "$compiler" == "clang" ]]; then versions=( 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) - elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi - - for version in "${versions[@]}"; do -diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 -index 395b43eeb..9638c63c7 100644 ---- a/eng/common/tools.ps1 -+++ b/eng/common/tools.ps1 -@@ -635,7 +635,7 @@ function InitializeNativeTools() { - InstallDirectory = "$ToolsDir" - } - } -- if (Test-Path variable:NativeToolsOnMachine) { -+ if ($env:NativeToolsOnMachine) { - Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..." - $nativeArgs += @{ PathPromotion = $true } - } -diff --git a/global.json b/global.json -index 48c9ae9da..9212af17a 100644 ---- a/global.json -+++ b/global.json -@@ -1,11 +1,11 @@ - { - "sdk": { -- "version": "6.0.302", -+ "version": "7.0.100-preview.5.22307.18", - "allowPrerelease": true, - "rollForward": "latestMajor" - }, - "tools": { -- "dotnet": "7.0.100-preview.2.22153.17", -+ "dotnet": "7.0.100-preview.5.22307.18", - "vs": { - "version": "17.0", - "components": [ -@@ -18,7 +18,7 @@ - "perl": "5.32.1.1" - }, - "msbuild-sdks": { -- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.1", -+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22372.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" - } - } -diff --git a/proto.proj b/proto.proj -deleted file mode 100644 -index 8973f53fb..000000000 ---- a/proto.proj -+++ /dev/null -@@ -1,40 +0,0 @@ -- -- -- -- Proto -- AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName} -- -- -- -- -- TargetFramework=netstandard2.0 -- -- -- TargetFramework=net6.0 -- -- -- TargetFramework=net6.0 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -diff --git a/src/FSharp.Build/FSharp.Build.fsproj b/src/FSharp.Build/FSharp.Build.fsproj -index a79179f19..5fcd59b43 100644 ---- a/src/FSharp.Build/FSharp.Build.fsproj -+++ b/src/FSharp.Build/FSharp.Build.fsproj -@@ -11,7 +11,8 @@ - $(DefineConstants);LOCALIZATION_FSBUILD - NU1701;FS0075 - true -- 6.0 -+ 6.0 -+ Debug;Release;Proto - - - -@@ -60,7 +61,7 @@ - - - -- -+ - - - -diff --git a/src/FSharp.Core/FSharp.Core.fsproj b/src/FSharp.Core/FSharp.Core.fsproj -index 0bf44a3d1..2059fcc60 100644 ---- a/src/FSharp.Core/FSharp.Core.fsproj -+++ b/src/FSharp.Core/FSharp.Core.fsproj -@@ -36,6 +36,7 @@ - true - FSharp.Core redistributables from F# Tools version $(FSProductVersionPrefix) For F# $(FSLanguageVersion). Contains code from the F# Software Foundation. - /blob/main/release-notes.md#FSharp-Core-$(FSCoreReleaseNotesVersion) -+ Debug;Release;Proto - - - -diff --git a/src/fsc/fscArm64Project/fscArm64.fsproj b/src/fsc/fscArm64Project/fscArm64.fsproj -index d430a0222..08265c05d 100644 ---- a/src/fsc/fscArm64Project/fscArm64.fsproj -+++ b/src/fsc/fscArm64Project/fscArm64.fsproj -@@ -3,7 +3,7 @@ - - - -- net472 -+ net472 - arm64 - .exe - true -diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj -index 03fbcd56d..d6bdf814c 100644 ---- a/src/fsc/fscProject/fsc.fsproj -+++ b/src/fsc/fscProject/fsc.fsproj -@@ -2,9 +2,15 @@ - - - -- -- $(ProtoTargetFramework) -- net472;net6.0 -+ -+ net472;net6.0 -+ net6.0 -+ x86 -+ Debug;Release;Proto -+ -+ -+ -+ net472 - net6.0 - x86 - -diff --git a/src/fsi/fsiArm64Project/fsiArm64.fsproj b/src/fsi/fsiArm64Project/fsiArm64.fsproj -index 4d46d947d..3356a42f3 100644 ---- a/src/fsi/fsiArm64Project/fsiArm64.fsproj -+++ b/src/fsi/fsiArm64Project/fsiArm64.fsproj -@@ -3,7 +3,7 @@ - - - -- net472 -+ net472 - arm64 - .exe - true -diff --git a/src/fsi/fsiProject/fsi.fsproj b/src/fsi/fsiProject/fsi.fsproj -index b027f97e2..46ca382c3 100644 ---- a/src/fsi/fsiProject/fsi.fsproj -+++ b/src/fsi/fsiProject/fsi.fsproj -@@ -2,9 +2,15 @@ - - - -- -- $(ProtoTargetFramework) -- net472;net6.0 -+ -+ net472;net6.0 -+ net6.0 -+ x86 -+ Debug;Release;Proto -+ -+ -+ -+ net472 - net6.0 - x86 - -diff --git a/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs b/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs -index 431ac983e..c218cc2f4 100644 ---- a/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs -+++ b/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs -@@ -317,19 +317,6 @@ typeof.Assembly.Location - // Only Windows/Linux supported. - () - -- [] -- member _.``Reference -- Azure.ResourceManager.Resources``() = -- let code = """ --#r "nuget: Azure.Identity, 1.3.0" --#r "nuget: Azure.ResourceManager.Resources, 1.0.0-preview.2" --let creds = Azure.Identity.DefaultAzureCredential() --let client = Azure.ResourceManager.Resources.ResourcesManagementClient("mySubscriptionId", creds) --true""" -- use script = new FSharpScript(additionalArgs=[|"/langversion:preview"|]) -- let opt = script.Eval(code) |> getValue -- let value = opt.Value -- Assert.True(true = downcast value.ReflectionValue) -- - [] - member _.``Simple pinvoke should not be impacted by native resolver``() = - let code = @" -diff --git a/tests/fsharp/core/libtest/test.fsx b/tests/fsharp/core/libtest/test.fsx -index a2cdb2fd6..0e4931b0b 100644 ---- a/tests/fsharp/core/libtest/test.fsx -+++ b/tests/fsharp/core/libtest/test.fsx -@@ -22,7 +22,7 @@ let test s b = - - - let format_uint64 outc formatc width left_justify add_zeros num_prefix_if_pos (n:uint64) = -- let _ = match formatc with 'd' | 'i' | 'u' -> 10UL | 'o' -> 8UL | 'x' | 'X' -> 16UL in -+ let _ = match formatc with 'd' | 'i' | 'u' -> 10UL | 'o' -> 8UL | 'x' | 'X'-> 16UL | _ -> failwith "invalid value" in - failwith "hello" - - diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Don-t-directly-reference-SCI-and-SCM-5.0.0.patch b/src/SourceBuild/tarball/patches/sdk/0001-Don-t-directly-reference-SCI-and-SCM-5.0.0.patch deleted file mode 100644 index acf938090..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-Don-t-directly-reference-SCI-and-SCM-5.0.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 27 Jun 2022 11:42:04 -0700 -Subject: [PATCH] Don't directly reference SCI and SCM 5.0.0 - -Backport: https://github.com/dotnet/sdk/pull/26289 ---- - .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -index 69e4b02162..f6991efb5f 100644 ---- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -@@ -61,7 +61,7 @@ - - - -- -+ -