diff --git a/Directory.Build.props b/Directory.Build.props
index 92f9f10e90..a3d2d55efe 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,9 +9,14 @@
   <PropertyGroup>
     <PackageTags>Microsoft;EntityFramework;EF;Database;Data;O/RM;ADO.NET</PackageTags>
     <Product>Microsoft Entity Framework</Product>
-    <PackageLicenseUrl Condition="'$(PackageLicenseExpression)' == ''">http://go.microsoft.com/fwlink/?LinkID=262998</PackageLicenseUrl>
-    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=386613</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
+    <PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
     <PackageProjectUrl>http://go.microsoft.com/fwlink/?LinkID=263480</PackageProjectUrl>
     <DebugType>portable</DebugType>
   </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+  
 </Project>
diff --git a/global.json b/global.json
index 2d175095f6..96135b55c5 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview8-013656",
+    "dotnet": "3.0.100",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCoreAppRuntimeVersion)"
@@ -8,7 +8,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 0000000000..a0f1fdbf4d
Binary files /dev/null and b/packageIcon.png differ
diff --git a/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.csproj b/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.csproj
index cec3e309b0..dd7ee7a033 100644
--- a/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.csproj
+++ b/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.csproj
@@ -16,6 +16,7 @@
     <NuspecProperty Include="Configuration=$(Configuration)" />
     <NuSpecProperty Include="MicrosoftSqlServerCompactVersion=$(MicrosoftSqlServerCompactVersion)" />
     <NuspecProperty Include="NeutralLanguage=$(NeutralLanguage)" />
+    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec b/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec
index 3fbfedb12a..2fc4ee9231 100644
--- a/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec
+++ b/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec
@@ -8,7 +8,12 @@
         <dependency id="EntityFramework" version="$Version$" exclude="Build,Analyzers" />
         <dependency id="Microsoft.SqlServer.Compact" version="$MicrosoftSqlServerCompactVersion$" exclude="Build,Analyzers" />
       </group>
+      <group targetFramework=".NETFramework4.5">
+        <dependency id="EntityFramework" version="$Version$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.SqlServer.Compact" version="$MicrosoftSqlServerCompactVersion$" exclude="Build,Analyzers" />
+      </group>
     </dependencies>
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <file src="../../artifacts/bin/EntityFramework.SqlServerCompact/$Configuration$/net40/EntityFramework.SqlServerCompact.dll" target="lib/net40/" />
@@ -16,5 +21,6 @@
     <file src="../../artifacts/bin/EntityFramework.SqlServerCompact/$Configuration$/net45/EntityFramework.SqlServerCompact.dll" target="lib/net45/" />
     <file src="../../artifacts/bin/EntityFramework.SqlServerCompact/$Configuration$/net45/EntityFramework.SqlServerCompact.xml" target="lib/net45/" />
     <file src="content\**\*" target="content/" />
+    <file src="$PackageIcon$" target="" />
   </files>
 </package>
diff --git a/src/EntityFramework/EntityFramework.InternalsVisibleTo.csproj b/src/EntityFramework/EntityFramework.InternalsVisibleTo.csproj
index 687105bc2c..c5eb5dbd66 100644
--- a/src/EntityFramework/EntityFramework.InternalsVisibleTo.csproj
+++ b/src/EntityFramework/EntityFramework.InternalsVisibleTo.csproj
@@ -5,6 +5,9 @@
     <RootNamespace>System.Data.Entity</RootNamespace>
     <TargetFrameworks>net45;netstandard2.1</TargetFrameworks>
     <AssemblyVersion>6.0.0.0</AssemblyVersion>
+
+    <!-- Properties\Resources.tt expects a path that does not match the class in Properties\Resources.cs -->
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
diff --git a/src/EntityFramework/EntityFramework.csproj b/src/EntityFramework/EntityFramework.csproj
index 0a44a0bbb3..10f35b7179 100644
--- a/src/EntityFramework/EntityFramework.csproj
+++ b/src/EntityFramework/EntityFramework.csproj
@@ -7,6 +7,9 @@
     <Description>EntityFramework.dll</Description>
     <AssemblyVersion>6.0.0.0</AssemblyVersion>
     <DefineConstants>$(DefineConstants);INTERNALS_INVISIBLE</DefineConstants>
+
+    <!-- Properties\Resources.tt expects a path that does not match the class in Properties\Resources.cs -->
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
diff --git a/src/NuGet/EntityFramework.CodeTemplates.CSharp/EntityFramework.CodeTemplates.CSharp.nuspec b/src/NuGet/EntityFramework.CodeTemplates.CSharp/EntityFramework.CodeTemplates.CSharp.nuspec
index 7481b6a2e0..420a22a6a3 100644
--- a/src/NuGet/EntityFramework.CodeTemplates.CSharp/EntityFramework.CodeTemplates.CSharp.nuspec
+++ b/src/NuGet/EntityFramework.CodeTemplates.CSharp/EntityFramework.CodeTemplates.CSharp.nuspec
@@ -4,12 +4,12 @@
     <id>EntityFramework.CodeTemplates.CSharp</id>
     <version>$NuGetPackageVersion$</version>
     <title>EntityFramework.CodeTemplates.CSharp</title>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=386613</iconUrl>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <tags>Microsoft EF EntityFramework</tags>
     <projectUrl>http://go.microsoft.com/fwlink/?LinkID=$ProjectUrlFwLinkID$</projectUrl>
     <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=$LicenseUrlFwLinkID$</licenseUrl>
+    <icon>packageIcon.png</icon>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>Adds the templates that EF uses to generate Code First models from a database so that code generation can be customized.</description>
     <summary>Adds the templates that EF uses to generate Code First models from a database so that code generation can be customized.</summary>
@@ -18,5 +18,6 @@
   <files>
     <file src="Content\net40\CodeTemplates\EFModelFromDatabase\Context.cs.t4" target="Content\net40\CodeTemplates\EFModelFromDatabase" />
     <file src="Content\net40\CodeTemplates\EFModelFromDatabase\EntityType.cs.t4" target="Content\net40\CodeTemplates\EFModelFromDatabase" />
+    <file src="$PackageIcon$" target="" />
   </files>
 </package>
\ No newline at end of file
diff --git a/src/NuGet/EntityFramework.CodeTemplates.VisualBasic/EntityFramework.CodeTemplates.VisualBasic.nuspec b/src/NuGet/EntityFramework.CodeTemplates.VisualBasic/EntityFramework.CodeTemplates.VisualBasic.nuspec
index e3a9751f19..4be628085f 100644
--- a/src/NuGet/EntityFramework.CodeTemplates.VisualBasic/EntityFramework.CodeTemplates.VisualBasic.nuspec
+++ b/src/NuGet/EntityFramework.CodeTemplates.VisualBasic/EntityFramework.CodeTemplates.VisualBasic.nuspec
@@ -4,12 +4,12 @@
     <id>EntityFramework.CodeTemplates.VisualBasic</id>
     <version>$NuGetPackageVersion$</version>
     <title>EntityFramework.CodeTemplates.VisualBasic</title>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=386613</iconUrl>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <tags>Microsoft EF EntityFramework</tags>
     <projectUrl>http://go.microsoft.com/fwlink/?LinkID=$ProjectUrlFwLinkID$</projectUrl>
     <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=$LicenseUrlFwLinkID$</licenseUrl>
+    <icon>packageIcon.png</icon>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>Adds the templates that EF uses to generate Code First models from a database so that code generation can be customized.</description>
     <summary>Adds the templates that EF uses to generate Code First models from a database so that code generation can be customized.</summary>
@@ -18,5 +18,6 @@
   <files>
     <file src="Content\net40\CodeTemplates\EFModelFromDatabase\Context.vb.t4" target="Content\net40\CodeTemplates\EFModelFromDatabase" />
     <file src="Content\net40\CodeTemplates\EFModelFromDatabase\EntityType.vb.t4" target="Content\net40\CodeTemplates\EFModelFromDatabase" />
+    <file src="$PackageIcon$" target="" />
   </files>
 </package>
\ No newline at end of file
diff --git a/src/NuGet/EntityFramework/EntityFramework.NuGet.csproj b/src/NuGet/EntityFramework/EntityFramework.NuGet.csproj
index 50ace3d2cc..1a51dcdbbc 100644
--- a/src/NuGet/EntityFramework/EntityFramework.NuGet.csproj
+++ b/src/NuGet/EntityFramework/EntityFramework.NuGet.csproj
@@ -25,6 +25,7 @@
     <NuspecProperty Include="SystemConfigurationConfigurationManagerVersion=$(SystemConfigurationConfigurationManagerVersion)" />
     <NuspecProperty Include="SystemDataSqlClientVersion=$(SystemDataSqlClientVersion)" />
     <NuspecProperty Include="IntermediateOutputPath=$(IntermediateOutputPath)" />
+    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
diff --git a/src/NuGet/EntityFramework/EntityFramework.NuGet.nuspec b/src/NuGet/EntityFramework/EntityFramework.NuGet.nuspec
index 679cc9766e..daf5ae595b 100644
--- a/src/NuGet/EntityFramework/EntityFramework.NuGet.nuspec
+++ b/src/NuGet/EntityFramework/EntityFramework.NuGet.nuspec
@@ -17,6 +17,7 @@
         <dependency id="System.Data.SqlClient" version="$SystemDataSqlClientVersion$" exclude="Build,Analyzers" />
       </group>
     </dependencies>
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <file src="$IntermediateOutputPath$EntityFramework6.psd1" target="tools/"/>
@@ -49,5 +50,6 @@
     <file src="buildTransitive\**\*" target="buildTransitive/" />
     <file src="content\**\*" target="content/" />
     <file src="tools\**\*" target="tools/" />
+    <file src="$PackageIcon$" target="" />
   </files>
 </package>
diff --git a/src/ef6/ef6.csproj b/src/ef6/ef6.csproj
index 85258a1df6..1aaab5cbd3 100644
--- a/src/ef6/ef6.csproj
+++ b/src/ef6/ef6.csproj
@@ -4,6 +4,9 @@
     <OutputType>Exe</OutputType>
     <TargetFrameworks>netcoreapp3.0;net40;net45</TargetFrameworks>
     <RootNamespace>System.Data.Entity.Tools</RootNamespace>
+
+    <!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
diff --git a/test/EntityFramework/FunctionalTests/FunctionalTests.csproj b/test/EntityFramework/FunctionalTests/FunctionalTests.csproj
index 755756e54f..8a49a752ec 100644
--- a/test/EntityFramework/FunctionalTests/FunctionalTests.csproj
+++ b/test/EntityFramework/FunctionalTests/FunctionalTests.csproj
@@ -6,6 +6,9 @@
     <TargetFrameworks>net452;netcoreapp3.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);EF_FUNCTIONALS</DefineConstants>
     <NoWarn>$(NoWarn);CS0169</NoWarn>
+
+    <!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">