From 8524bb2d1c6c51ea8a311f1054d421e6de373ee0 Mon Sep 17 00:00:00 2001
From: stuartmorgan <stuartmorgan@google.com>
Date: Thu, 30 Jan 2020 13:53:19 -0800
Subject: [PATCH] Add a _plugin suffix to plugin DLLs (#657)

Giving them a suffix makes it easier to identify what the DLL is. This is also consistent with the current naming for Linux plugins.
---
 plugins/file_chooser/windows/file_chooser.vcxproj             | 2 ++
 .../path_provider_fde/windows/path_provider_fde.vcxproj       | 2 ++
 .../url_launcher_fde/windows/url_launcher_fde.vcxproj         | 4 +++-
 plugins/sample/windows/sample.vcxproj                         | 4 +++-
 plugins/window_size/windows/window_size.vcxproj               | 2 ++
 testbed/windows/FlutterPlugins.props                          | 2 +-
 6 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/plugins/file_chooser/windows/file_chooser.vcxproj b/plugins/file_chooser/windows/file_chooser.vcxproj
index ab9edaf31..270a8c24d 100644
--- a/plugins/file_chooser/windows/file_chooser.vcxproj
+++ b/plugins/file_chooser/windows/file_chooser.vcxproj
@@ -57,6 +57,7 @@
     <IntDir>$(SolutionDir)..\build\windows\intermediates\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
+    <TargetName>$(ProjectName)_plugin</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -66,6 +67,7 @@
     <IntDir>$(SolutionDir)..\build\windows\intermediates\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
+    <TargetName>$(ProjectName)_plugin</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
diff --git a/plugins/flutter_plugins/path_provider_fde/windows/path_provider_fde.vcxproj b/plugins/flutter_plugins/path_provider_fde/windows/path_provider_fde.vcxproj
index 3b758d9fa..64d796f09 100644
--- a/plugins/flutter_plugins/path_provider_fde/windows/path_provider_fde.vcxproj
+++ b/plugins/flutter_plugins/path_provider_fde/windows/path_provider_fde.vcxproj
@@ -57,6 +57,7 @@
     <IntDir>$(SolutionDir)..\build\windows\intermediates\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
+    <TargetName>$(ProjectName)_plugin</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -66,6 +67,7 @@
     <IntDir>$(SolutionDir)..\build\windows\intermediates\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
+    <TargetName>$(ProjectName)_plugin</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
diff --git a/plugins/flutter_plugins/url_launcher_fde/windows/url_launcher_fde.vcxproj b/plugins/flutter_plugins/url_launcher_fde/windows/url_launcher_fde.vcxproj
index 17f9122ac..19764e473 100644
--- a/plugins/flutter_plugins/url_launcher_fde/windows/url_launcher_fde.vcxproj
+++ b/plugins/flutter_plugins/url_launcher_fde/windows/url_launcher_fde.vcxproj
@@ -57,6 +57,7 @@
     <IntDir>$(SolutionDir)..\build\windows\intermediates\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
+    <TargetName>$(ProjectName)_plugin</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -66,6 +67,7 @@
     <IntDir>$(SolutionDir)..\build\windows\intermediates\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
+    <TargetName>$(ProjectName)_plugin</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -161,4 +163,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/plugins/sample/windows/sample.vcxproj b/plugins/sample/windows/sample.vcxproj
index 361fbf787..e38d94f4b 100644
--- a/plugins/sample/windows/sample.vcxproj
+++ b/plugins/sample/windows/sample.vcxproj
@@ -57,6 +57,7 @@
     <IntDir>$(SolutionDir)..\build\windows\intermediates\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
+    <TargetName>$(ProjectName)_plugin</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -66,6 +67,7 @@
     <IntDir>$(SolutionDir)..\build\windows\intermediates\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
+    <TargetName>$(ProjectName)_plugin</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -161,4 +163,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/plugins/window_size/windows/window_size.vcxproj b/plugins/window_size/windows/window_size.vcxproj
index 810cce092..99ccf74e7 100644
--- a/plugins/window_size/windows/window_size.vcxproj
+++ b/plugins/window_size/windows/window_size.vcxproj
@@ -57,6 +57,7 @@
     <IntDir>$(SolutionDir)..\build\windows\intermediates\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
+    <TargetName>$(ProjectName)_plugin</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -66,6 +67,7 @@
     <IntDir>$(SolutionDir)..\build\windows\intermediates\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
+    <TargetName>$(ProjectName)_plugin</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
diff --git a/testbed/windows/FlutterPlugins.props b/testbed/windows/FlutterPlugins.props
index 8e9046fc2..63918f93a 100644
--- a/testbed/windows/FlutterPlugins.props
+++ b/testbed/windows/FlutterPlugins.props
@@ -4,7 +4,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>sample.lib;file_chooser.lib;path_provider_fde.lib;url_launcher_fde.lib;window_size.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>sample_plugin.lib;file_chooser_plugin.lib;path_provider_fde_plugin.lib;url_launcher_fde_plugin.lib;window_size_plugin.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>