Merged PR 11573622: Update SymCrypt static library name

Update vcxproj file name and target name and for SymCrypt static library to avoid name collisions with the user mode DLL

Author: ccalik

SymCrypt.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symcrypt.lib", "lib\symcrypt.vcxproj", "{7C3BD5D2-7213-4CFA-B6CB-EB41623601BC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symcrypt_static.lib", "lib\symcrypt_static.vcxproj", "{7C3BD5D2-7213-4CFA-B6CB-EB41623601BC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symcryptunittest.lib", "unittest\lib\symcryptunittest_lib.vcxproj", "{1146804C-B04F-43F1-83B0-081A5187BA02}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symcryptunittest_lib.lib", "unittest\lib\symcryptunittest_lib.vcxproj", "{1146804C-B04F-43F1-83B0-081A5187BA02}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7C3BD5D2-7213-4CFA-B6CB-EB41623601BC} = {7C3BD5D2-7213-4CFA-B6CB-EB41623601BC}
 	EndProjectSection
@@ -28,7 +28,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SymCryptKernelTestModule.sy
 		{7C3BD5D2-7213-4CFA-B6CB-EB41623601BC} = {7C3BD5D2-7213-4CFA-B6CB-EB41623601BC}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SymCryptKernelTestModule.dll", "unittest\module_windows_sys_um\SymCryptKernelTestModule_UM.vcxproj", "{07DBF66B-64EA-4D2C-9182-9C6E2D89C7DB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SymCryptKernelTestModule_UM.dll", "unittest\module_windows_sys_um\SymCryptKernelTestModule_UM.vcxproj", "{07DBF66B-64EA-4D2C-9182-9C6E2D89C7DB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7C3BD5D2-7213-4CFA-B6CB-EB41623601BC} = {7C3BD5D2-7213-4CFA-B6CB-EB41623601BC}
 	EndProjectSection

SymCryptPackage.json

@@ -83,8 +83,8 @@
         "config" : "release"
     },
     {
-        "source" : "${BIN_DIR}/lib/symcrypt.lib",
-        "dest" : "lib/symcrypt.lib",
+        "source" : "${BIN_DIR}/lib/symcrypt_static.lib",
+        "dest" : "lib/symcrypt_static.lib",
         "platform" : "win32"
     },
     {

lib/symcrypt.vcxproj lib/symcrypt_static.vcxprojlib/symcrypt.vcxproj renamed to lib/symcrypt_static.vcxproj

@@ -6,12 +6,13 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <UseInternalMSUniCrtPackage>true</UseInternalMSUniCrtPackage>
-    <TargetName>symcrypt</TargetName>
+    <TargetName>symcrypt_static</TargetName>
     <UndockedType>lib</UndockedType>
     <UndockedDir>$(SolutionDir)msbuild\</UndockedDir>
     <UndockedOut>$(SolutionDir)</UndockedOut>
     <UndockedKernelModeBuild>true</UndockedKernelModeBuild>
     <IncludePath>$(ProjectDir);$(IncludePath);</IncludePath>
+    <ProjectName>symcrypt_static</ProjectName>
   </PropertyGroup>
   <Import Project="$(UndockedDir)symcrypt.undocked.props" />
   <ItemDefinitionGroup>
@@ -177,7 +178,6 @@
     <SymCryptAsm Include="arm64\fdef369_asm.symcryptasm" Dialect="armasm64" Arch="arm64" Convention="arm64ec" />
     <SymCryptAsm Include="arm64\wipe.symcryptasm" Dialect="armasm64" Arch="arm64" Convention="arm64ec" />
   </ItemGroup>
- 
   <!-- Generate buildInfo.h and symcrypt_internal_shared.inc -->
   <Target Name="GenerateBuildInfo">
     <Message Importance="high" Text="Generating build info header" />

modules/windows/kernel/symcryptk.vcxproj

@@ -40,7 +40,7 @@
   </PropertyGroup>
   <Import Project="$(UndockedDir)symcrypt.undocked.props" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\lib\symcrypt.vcxproj">
+    <ProjectReference Include="..\..\..\lib\symcrypt_static.vcxproj">
       <Project>{7c3bd5d2-7213-4cfa-b6cb-eb41623601bc}</Project>
     </ProjectReference>
   </ItemGroup>

modules/windows/user/symcrypt.vcxproj

@@ -39,7 +39,7 @@
   </PropertyGroup>
   <Import Project="$(UndockedDir)symcrypt.undocked.props" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\lib\symcrypt.vcxproj">
+    <ProjectReference Include="..\..\..\lib\symcrypt_static.vcxproj">
       <Project>{7c3bd5d2-7213-4cfa-b6cb-eb41623601bc}</Project>
     </ProjectReference>
   </ItemGroup>

unittest/exe_test/SymCryptUnitTest.vcxproj

@@ -13,7 +13,7 @@
   </PropertyGroup>
   <Import Project="$(UndockedDir)symcrypt.undocked.props" />
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\symcrypt.vcxproj">
+    <ProjectReference Include="..\..\lib\symcrypt_static.vcxproj">
       <Project>{7c3bd5d2-7213-4cfa-b6cb-eb41623601bc}</Project>
     </ProjectReference>
     <ProjectReference Include="..\lib\symcryptunittest_lib.vcxproj">

unittest/module_windows/symcrypttestmodule.vcxproj

@@ -13,7 +13,7 @@
   </PropertyGroup>
   <Import Project="$(UndockedDir)symcrypt.undocked.props" />
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\symcrypt.vcxproj">
+    <ProjectReference Include="..\..\lib\symcrypt_static.vcxproj">
       <Project>{7c3bd5d2-7213-4cfa-b6cb-eb41623601bc}</Project>
     </ProjectReference>
     <ProjectReference Include="..\lib\symcryptunittest_lib.vcxproj">

unittest/module_windows_sys_km/SymCryptKernelTestModule.vcxproj

@@ -14,7 +14,7 @@
   </PropertyGroup>
   <Import Project="$(UndockedDir)symcrypt.undocked.props" />
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\symcrypt.vcxproj">
+    <ProjectReference Include="..\..\lib\symcrypt_static.vcxproj">
       <Project>{7c3bd5d2-7213-4cfa-b6cb-eb41623601bc}</Project>
     </ProjectReference>
     <ProjectReference Include="..\lib\symcryptunittest_lib.vcxproj">

unittest/module_windows_sys_um/symcryptkerneltestmodule_um.vcxproj

@@ -13,7 +13,7 @@
   </PropertyGroup>
   <Import Project="$(UndockedDir)symcrypt.undocked.props" />
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\symcrypt.vcxproj">
+    <ProjectReference Include="..\..\lib\symcrypt_static.vcxproj">
       <Project>{7c3bd5d2-7213-4cfa-b6cb-eb41623601bc}</Project>
     </ProjectReference>
   </ItemGroup>