From 076caaff26e2dbf0dd56744eb08474f0e76a6efb Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Thu, 3 Oct 2019 14:26:36 -0700
Subject: [PATCH 1/2] Fix placeholder file locations to match nuspecs

---
 src/EFCore.Analyzers/EFCore.Analyzers.csproj                  | 4 ++--
 src/EFCore.Analyzers/EFCore.Analyzers.nuspec                  | 2 +-
 .../lib/{netstandard1.3 => netstandard2.0}/_._                | 0
 src/dotnet-ef/dotnet-ef.csproj                                | 4 ++--
 src/dotnet-ef/dotnet-ef.nuspec                                | 2 +-
 src/dotnet-ef/lib/{netcoreapp2.1 => netcoreapp3.1}/_._        | 0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename src/EFCore.Analyzers/lib/{netstandard1.3 => netstandard2.0}/_._ (100%)
 rename src/dotnet-ef/lib/{netcoreapp2.1 => netcoreapp3.1}/_._ (100%)

diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/src/EFCore.Analyzers/EFCore.Analyzers.csproj
index abadaa68d75..67b9efe2730 100644
--- a/src/EFCore.Analyzers/EFCore.Analyzers.csproj
+++ b/src/EFCore.Analyzers/EFCore.Analyzers.csproj
@@ -8,7 +8,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <CodeAnalysisRuleSet>..\..\EFCore.ruleset</CodeAnalysisRuleSet>
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
-    <NetStandard13PlaceholderFile>$(MSBuildThisFileDirectory)lib\netstandard1.3\_._</NetStandard13PlaceholderFile>
+    <NetStandardPlaceholderFile>$(MSBuildThisFileDirectory)lib\netstandard2.0\_._</NetStandardPlaceholderFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -31,7 +31,7 @@
       <NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
       <NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
       <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
-      <NuspecProperty Include="NetStandard13PlaceholderFile=$(NetStandard13PlaceholderFile)" />
+      <NuspecProperty Include="NetStandardPlaceholderFile=$(NetStandardPlaceholderFile)" />
     </ItemGroup>
   </Target>
 
diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.nuspec b/src/EFCore.Analyzers/EFCore.Analyzers.nuspec
index d0008bc0613..62b87151550 100644
--- a/src/EFCore.Analyzers/EFCore.Analyzers.nuspec
+++ b/src/EFCore.Analyzers/EFCore.Analyzers.nuspec
@@ -13,6 +13,6 @@
     <file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
     <file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
     <file src="$PackageIcon$" target="" />
-    <file src="$NetStandard13PlaceholderFile$" target="lib\netstandard1.3" />
+    <file src="$NetStandardPlaceholderFile$" target="lib\netstandard2.0" />
   </files>
 </package>
diff --git a/src/EFCore.Analyzers/lib/netstandard1.3/_._ b/src/EFCore.Analyzers/lib/netstandard2.0/_._
similarity index 100%
rename from src/EFCore.Analyzers/lib/netstandard1.3/_._
rename to src/EFCore.Analyzers/lib/netstandard2.0/_._
diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj
index 475129a282e..1549f4d8d05 100644
--- a/src/dotnet-ef/dotnet-ef.csproj
+++ b/src/dotnet-ef/dotnet-ef.csproj
@@ -27,7 +27,7 @@ dotnet ef database update
       which maximizes the machines on which this tool will be compatible.
     -->
     <TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' ">false</TargetLatestDotNetRuntime>
-    <NetCoreApp21PlaceholderFile>$(MSBuildThisFileDirectory)lib\netcoreapp2.1\_._</NetCoreApp21PlaceholderFile>
+    <NetCoreAppPlaceholderFile>$(MSBuildThisFileDirectory)lib\$(TargetFramework)\_._</NetCoreAppPlaceholderFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -98,7 +98,7 @@ dotnet ef database update
       <NuspecProperty Include="OutputX86Exe=..\..\artifacts\bin\ef\x86\$(Configuration)\net461\ef.exe" />
       <NuspecProperty Include="OutputX86ExeSymbol=..\..\artifacts\bin\ef\x86\$(Configuration)\net461\ef.pdb" />
       <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
-      <NuspecProperty Include="NetCoreApp21PlaceholderFile=$(NetCoreApp21PlaceholderFile)" />
+      <NuspecProperty Include="NetCoreAppPlaceholderFile=$(NetCoreAppPlaceholderFile)" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/dotnet-ef/dotnet-ef.nuspec b/src/dotnet-ef/dotnet-ef.nuspec
index 1a758aeb1de..c926eb188f6 100644
--- a/src/dotnet-ef/dotnet-ef.nuspec
+++ b/src/dotnet-ef/dotnet-ef.nuspec
@@ -23,6 +23,6 @@
     <file src="$OutputX86Exe$" target="tools\$targetFramework$\any\tools\net461\win-x86" />
     <file src="$OutputX86ExeSymbol$" target="tools\$targetFramework$\any\tools\net461\win-x86" />
     <file src="$PackageIcon$" target="" />
-    <file src="$NetCoreApp21PlaceholderFile$" target="lib\netcoreapp2.1" />
+    <file src="$NetCoreAppPlaceholderFile$" target="lib\$targetFramework$" />
   </files>
 </package>
diff --git a/src/dotnet-ef/lib/netcoreapp2.1/_._ b/src/dotnet-ef/lib/netcoreapp3.1/_._
similarity index 100%
rename from src/dotnet-ef/lib/netcoreapp2.1/_._
rename to src/dotnet-ef/lib/netcoreapp3.1/_._

From 9fe96665600971e741db5d5e0d350c1f8fab48cd Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Thu, 3 Oct 2019 14:33:13 -0700
Subject: [PATCH 2/2] Remove unneeded placeholder files

---
 src/EFCore.Analyzers/EFCore.Analyzers.csproj | 2 --
 src/EFCore.Analyzers/EFCore.Analyzers.nuspec | 1 -
 src/EFCore.Analyzers/lib/netstandard2.0/_._  | 0
 src/dotnet-ef/dotnet-ef.csproj               | 2 --
 src/dotnet-ef/dotnet-ef.nuspec               | 1 -
 src/dotnet-ef/lib/netcoreapp3.1/_._          | 0
 6 files changed, 6 deletions(-)
 delete mode 100644 src/EFCore.Analyzers/lib/netstandard2.0/_._
 delete mode 100644 src/dotnet-ef/lib/netcoreapp3.1/_._

diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/src/EFCore.Analyzers/EFCore.Analyzers.csproj
index 67b9efe2730..5bde3989216 100644
--- a/src/EFCore.Analyzers/EFCore.Analyzers.csproj
+++ b/src/EFCore.Analyzers/EFCore.Analyzers.csproj
@@ -8,7 +8,6 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <CodeAnalysisRuleSet>..\..\EFCore.ruleset</CodeAnalysisRuleSet>
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
-    <NetStandardPlaceholderFile>$(MSBuildThisFileDirectory)lib\netstandard2.0\_._</NetStandardPlaceholderFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -31,7 +30,6 @@
       <NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
       <NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
       <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
-      <NuspecProperty Include="NetStandardPlaceholderFile=$(NetStandardPlaceholderFile)" />
     </ItemGroup>
   </Target>
 
diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.nuspec b/src/EFCore.Analyzers/EFCore.Analyzers.nuspec
index 62b87151550..7ae3d4eca49 100644
--- a/src/EFCore.Analyzers/EFCore.Analyzers.nuspec
+++ b/src/EFCore.Analyzers/EFCore.Analyzers.nuspec
@@ -13,6 +13,5 @@
     <file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
     <file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
     <file src="$PackageIcon$" target="" />
-    <file src="$NetStandardPlaceholderFile$" target="lib\netstandard2.0" />
   </files>
 </package>
diff --git a/src/EFCore.Analyzers/lib/netstandard2.0/_._ b/src/EFCore.Analyzers/lib/netstandard2.0/_._
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj
index 1549f4d8d05..1fa9b9f0e2c 100644
--- a/src/dotnet-ef/dotnet-ef.csproj
+++ b/src/dotnet-ef/dotnet-ef.csproj
@@ -27,7 +27,6 @@ dotnet ef database update
       which maximizes the machines on which this tool will be compatible.
     -->
     <TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' ">false</TargetLatestDotNetRuntime>
-    <NetCoreAppPlaceholderFile>$(MSBuildThisFileDirectory)lib\$(TargetFramework)\_._</NetCoreAppPlaceholderFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -98,7 +97,6 @@ dotnet ef database update
       <NuspecProperty Include="OutputX86Exe=..\..\artifacts\bin\ef\x86\$(Configuration)\net461\ef.exe" />
       <NuspecProperty Include="OutputX86ExeSymbol=..\..\artifacts\bin\ef\x86\$(Configuration)\net461\ef.pdb" />
       <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
-      <NuspecProperty Include="NetCoreAppPlaceholderFile=$(NetCoreAppPlaceholderFile)" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/dotnet-ef/dotnet-ef.nuspec b/src/dotnet-ef/dotnet-ef.nuspec
index c926eb188f6..c1b33fd18ec 100644
--- a/src/dotnet-ef/dotnet-ef.nuspec
+++ b/src/dotnet-ef/dotnet-ef.nuspec
@@ -23,6 +23,5 @@
     <file src="$OutputX86Exe$" target="tools\$targetFramework$\any\tools\net461\win-x86" />
     <file src="$OutputX86ExeSymbol$" target="tools\$targetFramework$\any\tools\net461\win-x86" />
     <file src="$PackageIcon$" target="" />
-    <file src="$NetCoreAppPlaceholderFile$" target="lib\$targetFramework$" />
   </files>
 </package>
diff --git a/src/dotnet-ef/lib/netcoreapp3.1/_._ b/src/dotnet-ef/lib/netcoreapp3.1/_._
deleted file mode 100644
index e69de29bb2d..00000000000