From 7c3086cd9f36436dc8529748877ff5c26f8c9d1f Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 26 Nov 2024 12:18:56 -0500 Subject: [PATCH 1/2] Add hook for importing .props file after .NET SDK props --- .../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props index 2cfe0e4e20e4..73f89886b87c 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props @@ -170,4 +170,7 @@ Copyright (c) .NET Foundation. All rights reserved. + + + From 5fc518d421255218cf575a517ee403eb5ed38398 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 18 Dec 2024 06:54:32 -0500 Subject: [PATCH 2/2] Update src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props Co-authored-by: Jeff Kluge --- .../targets/Microsoft.NET.Sdk.props | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props index 73f89886b87c..7d9a8585a230 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props @@ -170,7 +170,10 @@ Copyright (c) .NET Foundation. All rights reserved. - +