diff --git a/Directory.Build.props b/Directory.Build.props
index 18ffc64973d..e52a0860cd1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,12 +19,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>
\ No newline at end of file
diff --git a/global.json b/global.json
index 2b51fa31f68..ca73040cfa4 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview8-013656",
+    "dotnet": "3.0.100",
     "runtimes": {
       "dotnet": [
         "2.0.9",
@@ -9,7 +9,7 @@
     }
   },
   "sdk": {
-    "version": "3.0.100-preview8-013656"
+    "version": "3.0.100"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7"
diff --git a/packageIcon.png b/packageIcon.png
new file mode 100644
index 00000000000..a0f1fdbf4d5
Binary files /dev/null and b/packageIcon.png differ
diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/src/EFCore.Analyzers/EFCore.Analyzers.csproj
index 7465d00804b..c2ad8962ced 100644
--- 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>
@@ -28,6 +29,8 @@
     <ItemGroup>
       <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
index b73c8d277c7..1a2f21a0d1e 100644
--- a/src/EFCore.Analyzers/EFCore.Analyzers.nuspec
+++ b/src/EFCore.Analyzers/EFCore.Analyzers.nuspec
@@ -10,5 +10,7 @@
   <files>
     <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/_._
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj
index 0cf6158ab6e..6c201ab3ae3 100644
--- 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
index b06bbbfbe83..2b28baf3747 100644
--- a/src/EFCore.Tools/EFCore.Tools.nuspec
+++ b/src/EFCore.Tools/EFCore.Tools.nuspec
@@ -20,5 +20,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
index f4c3f57f6fb..af7a98645c0 100644
--- 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
index eee54ea5876..77bcaa90794 100644
--- a/src/dotnet-ef/dotnet-ef.nuspec
+++ b/src/dotnet-ef/dotnet-ef.nuspec
@@ -8,6 +8,7 @@
     <dependencies>
       <group targetFramework=".NETCoreApp2.1" />
     </dependencies>
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
@@ -20,5 +21,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/_._
new file mode 100644
index 00000000000..e69de29bb2d