From b869f40132d9f152bdc46b5a760953579843bae9 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Fri, 24 Jun 2022 06:13:27 +0300
Subject: [PATCH] Set NativeLib=Shared for classlib by default (#70879)

---
 ...tive.Unix.props => Microsoft.NETCore.Native.Unix.targets} | 2 +-
 ...indows.props => Microsoft.NETCore.Native.Windows.targets} | 2 +-
 .../BuildIntegration/Microsoft.NETCore.Native.targets        | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename src/coreclr/nativeaot/BuildIntegration/{Microsoft.NETCore.Native.Unix.props => Microsoft.NETCore.Native.Unix.targets} (99%)
 rename src/coreclr/nativeaot/BuildIntegration/{Microsoft.NETCore.Native.Windows.props => Microsoft.NETCore.Native.Windows.targets} (99%)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.props b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
similarity index 99%
rename from src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.props
rename to src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index c8ef6487bd50..243754c30229 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.props
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -1,6 +1,6 @@
 <!--
 ***********************************************************************************************
-Microsoft.NETCore.Native.Unix.props
+Microsoft.NETCore.Native.Unix.targets
 
 WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
           created a backup copy.  Incorrect changes to this file will make it
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.props b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets
similarity index 99%
rename from src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.props
rename to src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets
index e0e595e2f8c9..39d305749451 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.props
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets
@@ -1,6 +1,6 @@
 <!--
 ***********************************************************************************************
-Microsoft.NETCore.Native.Windows.props
+Microsoft.NETCore.Native.Windows.targets
 
 WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
           created a backup copy.  Incorrect changes to this file will make it
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
index 9f079b4323fb..ea054c7e8d2c 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -16,6 +16,7 @@ The .NET Foundation licenses this file to you under the MIT license.
 
   <!-- Set defaults for unspecified properties -->
   <PropertyGroup>
+    <NativeLib Condition="'$(OutputType)' == 'Library' and '$(NativeLib)' == ''">Shared</NativeLib>
     <NativeIntermediateOutputPath Condition="'$(NativeIntermediateOutputPath)' == ''">$(IntermediateOutputPath)native\</NativeIntermediateOutputPath>
     <NativeOutputPath Condition="'$(NativeOutputPath)' == ''">$(OutputPath)native\</NativeOutputPath>
     <NativeCompilationDuringPublish Condition="'$(NativeCompilationDuringPublish)' == ''">true</NativeCompilationDuringPublish>
@@ -274,8 +275,8 @@ The .NET Foundation licenses this file to you under the MIT license.
     <Touch Condition="$([MSBuild]::VersionLessThan('$(NETCoreSdkVersion)', '7.0.0'))" Files="$(_LinkSemaphore)" AlwaysCreate="true" />
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NETCore.Native.Windows.props" Condition="'$(TargetOS)' == 'windows'" />
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NETCore.Native.Unix.props" Condition="'$(TargetOS)' != 'windows'" />
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NETCore.Native.Windows.targets" Condition="'$(TargetOS)' == 'windows'" />
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NETCore.Native.Unix.targets" Condition="'$(TargetOS)' != 'windows'" />
 
   <Target Name="MultiFileCopyNative"
       Inputs="@(NativeObjects)"