Merge pull request #18071 from dotnet-maestro-bot/merge/release/3.0-t…

…o-release/3.1 [automated] Merge branch 'release/3.0' => 'release/3.1'
dotnet · Oct 1, 2019 · d005f54 · d005f54
2 parents cac3491 + e157114
commit d005f54
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -26,12 +26,13 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LangVersion>8.0</LangVersion>
     <DebugType>portable</DebugType>
-    <PackageLicenseUrl Condition="'$(PackageLicenseExpression)' == ''">https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt</PackageLicenseUrl>
-    <PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
+    <PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
     <PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>
   </PropertyGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="**\*.rd.xml" />
+    <None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/packageIcon.png b/packageIcon.png
diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/src/EFCore.Analyzers/EFCore.Analyzers.csproj
@@ -8,6 +8,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <CodeAnalysisRuleSet>..\..\EFCore.ruleset</CodeAnalysisRuleSet>
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
+    <NetStandard13PlaceholderFile>$(MSBuildThisFileDirectory)lib\netstandard1.3\_._</NetStandard13PlaceholderFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,6 +30,8 @@
       <NuspecProperty Include="targetFramework=$(TargetFramework)" />
       <NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
       <NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
+      <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
+      <NuspecProperty Include="NetStandard13PlaceholderFile=$(NetStandard13PlaceholderFile)" />
     </ItemGroup>
   </Target>
 

diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.nuspec b/src/EFCore.Analyzers/EFCore.Analyzers.nuspec
@@ -5,11 +5,14 @@
     <dependencies>
       <group targetFramework=".NETStandard2.0" />
     </dependencies>
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
     <file src="_._" target="lib\$targetFramework$\" />
     <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" />
   </files>
 </package>
diff --git a/src/EFCore.Analyzers/lib/netstandard1.3/_._ b/src/EFCore.Analyzers/lib/netstandard1.3/_._
diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj
@@ -43,6 +43,7 @@ Update-Database
       <NuspecProperty Include="version=$(PackageVersion)" />
       <NuspecProperty Include="configuration=$(Configuration)" />
       <NuspecProperty Include="intermediateOutputPath=$(IntermediateOutputPath)" />
+      <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
     </ItemGroup>
   </Target>
 

diff --git a/src/EFCore.Tools/EFCore.Tools.nuspec b/src/EFCore.Tools/EFCore.Tools.nuspec
@@ -8,6 +8,7 @@
         <dependency id="Microsoft.EntityFrameworkCore.Design" version="$version$" />
       </group>
     </dependencies>
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <file src="lib\**\*" target="lib/" />
@@ -20,5 +21,6 @@
     <file src="../../artifacts/bin/ef/$configuration$/netcoreapp2.0/ef.dll" target="tools/netcoreapp2.0/any/" />
     <file src="../../artifacts/bin/ef/$configuration$/netcoreapp2.0/ef.pdb" target="tools/netcoreapp2.0/any/" />
     <file src="../../artifacts/bin/ef/$configuration$/netcoreapp2.0/ef.runtimeconfig.json" target="tools/netcoreapp2.0/any/" />
+    <file src="$PackageIcon$" target="" />
   </files>
 </package>
diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj
@@ -27,6 +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>
   </PropertyGroup>
 
   <ItemGroup>
@@ -96,6 +97,8 @@ dotnet ef database update
       <NuspecProperty Include="OutputExeSymbol=..\..\artifacts\bin\ef\$(Configuration)\net461\ef.pdb" />
       <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)" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/dotnet-ef/dotnet-ef.nuspec b/src/dotnet-ef/dotnet-ef.nuspec
@@ -8,6 +8,7 @@
     <dependencies>
       <group targetFramework=".NETCoreApp3.1" />
     </dependencies>
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
@@ -21,5 +22,7 @@
     <file src="$OutputExeSymbol$" target="tools\$targetFramework$\any\tools\net461\any" />
     <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" />
   </files>
 </package>
diff --git a/src/dotnet-ef/lib/netcoreapp2.1/_._ b/src/dotnet-ef/lib/netcoreapp2.1/_._