From bfd7a3e20e0d792ee531dfd8d57176351d4f526a Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 2 May 2025 15:59:31 -0700 Subject: [PATCH 1/4] Update Microsoft.Extensions.DependencyModel to 8.0.2 --- build/dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 4535ed08a7ff..e663becf837f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -101,7 +101,7 @@ 0.10.13 4.2.1 2.1.0-prerelease-02430-04 - 2.1.0 + 8.0.2 12.10.0 4.2.3 3.15.0 @@ -128,7 +128,7 @@ 1.7.0 0.2.0-beta-63019-01 1.0.0-rc3-1-003177 - 2.1.0 + 8.0.2 1.1.0 3.14.2 5.7.0 From a3e07c51c3614d5237ecbe401d079d107ef23e46 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 2 May 2025 16:17:40 -0700 Subject: [PATCH 2/4] Net462 --- .../test/Microsoft.AspNetCore.Razor.Language.Test.csproj | 2 +- .../Microsoft.AspNetCore.Razor.Test.Common.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj index 2cbc6382f1a7..25ac693c81b1 100644 --- a/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj +++ b/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj @@ -1,7 +1,7 @@  - net46 + net462 $(DefaultItemExcludes);TestFiles\**\* $(DefineConstants);GENERATE_BASELINES RazorTests diff --git a/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj index d03c8d0d4aeb..4baa5d8f62f9 100644 --- a/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj +++ b/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj @@ -4,7 +4,7 @@ $(DefineConstants);GENERATE_BASELINES $(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES - net46 + net462 true From a9cc4d1ff36b1a7e851e63cdebcb52f1e514cdff Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 7 May 2025 12:31:46 -0700 Subject: [PATCH 3/4] IFDEF --- src/Razor/Razor.Tasks/src/DotnetToolTask.cs | 2 +- src/Razor/Razor.Tools/src/Client.cs | 6 +++--- .../Language/IntegrationTests/IntegrationTestBase.cs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Razor/Razor.Tasks/src/DotnetToolTask.cs b/src/Razor/Razor.Tasks/src/DotnetToolTask.cs index d0ec48f2b274..9d53d53e1e12 100644 --- a/src/Razor/Razor.Tasks/src/DotnetToolTask.cs +++ b/src/Razor/Razor.Tasks/src/DotnetToolTask.cs @@ -124,7 +124,7 @@ protected virtual bool TryExecuteOnServer( string commandLineCommands, out int result) { -#if !NET46 +#if !NET46 && !NET462 if (!SuppressCurrentUserOnlyPipeOptions && !Enum.IsDefined(typeof(PipeOptions), PipeOptionCurrentUserOnly)) { // For security reasons, we don't want to spin up a server that doesn't diff --git a/src/Razor/Razor.Tools/src/Client.cs b/src/Razor/Razor.Tools/src/Client.cs index 9378906d4538..5b70e33d438e 100644 --- a/src/Razor/Razor.Tools/src/Client.cs +++ b/src/Razor/Razor.Tools/src/Client.cs @@ -4,7 +4,7 @@ using System; using System.IO; using System.IO.Pipes; -#if NET46 +#if NET46 || NET462 using System.Security.AccessControl; using System.Security.Principal; #endif @@ -71,7 +71,7 @@ public static async Task ConnectAsync(string pipeName, TimeSpan? timeout ServerLogger.Log("Named pipe '{0}' connected", pipeName); cancellationToken.ThrowIfCancellationRequested(); -#if NET46 +#if NET46 || NET462 // Verify that we own the pipe. if (!CheckPipeConnectionOwnership(stream)) { @@ -89,7 +89,7 @@ public static async Task ConnectAsync(string pipeName, TimeSpan? timeout } } -#if NET46 +#if NET46 || NET462 /// /// Check to ensure that the named pipe server we connected to is owned by the same /// user. diff --git a/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs index b07342e21ae2..2e65968b0c52 100644 --- a/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs +++ b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs @@ -8,7 +8,7 @@ using System.Reflection; using System.Text.RegularExpressions; using System.Threading.Tasks; -#if NET46 +#if NET46 || NET462 using System.Runtime.Remoting; using System.Runtime.Remoting.Messaging; #else @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests [IntializeTestFile] public abstract class IntegrationTestBase { -#if !NET46 +#if !NET46 && !NET462 private static readonly AsyncLocal _fileName = new AsyncLocal(); #endif @@ -44,7 +44,7 @@ protected IntegrationTestBase() // Used by the test framework to set the 'base' name for test files. public static string FileName { -#if NET46 +#if NET46 || NET462 get { var handle = (ObjectHandle)CallContext.LogicalGetData("IntegrationTestBase_FileName"); From 08dc2066eb90bf21acc015ccae4600fe580804c8 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 7 May 2025 14:43:42 -0700 Subject: [PATCH 4/4] Update Microsoft.AspNetCore.Razor.Tools.Test.csproj --- .../test/Microsoft.AspNetCore.Razor.Tools.Test.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Razor/Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj b/src/Razor/Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj index f4894d2d7d45..fbf48fa7bfe3 100644 --- a/src/Razor/Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj +++ b/src/Razor/Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + net462