diff --git a/build/Publish.targets b/build/Publish.targets
index b1aadd65b7..13c7e3c7eb 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -199,7 +199,7 @@
     <Error Text="Missing required property: PublishMyGetNpmRegistryUrl"  Condition=" '$(PublishMyGetNpmRegistryUrl)' == '' "/>
     <Error Text="Missing required property: PublishMyGetFeedKey"  Condition=" '$(PublishMyGetFeedKey)' == '' "/>
 
-    <Error Message="No packages found to publish" Condition="@(PackageToPublish->Count()) == 0" />
+    <Error Text="No packages found to publish" Condition="@(PackageToPublish->Count()) == 0" />
 
     <PushNuGetPackages Condition="'%(PackageToPublish.IsSymbolsPackage)' != 'true' AND @(PackageToPublish->Count()) != 0"
       Packages="@(PackageToPublish)"
@@ -215,11 +215,17 @@
       <AuthTokenSetting>$(PublishMyGetNpmRegistryUrl.Replace("https:", "")):_authToken</AuthTokenSetting>
     </PropertyGroup>
 
-    <Exec Command="npm config set &quot;$(AuthTokenSetting)&quot; $(PublishMyGetFeedKey)"
+    <Message Condition=" @(NpmPackageToPublish->Count()) != 0 "
+             Text="Skipping NPM publish because there are no npm packages to publish."
+             Importance="high" />
+
+    <Exec Condition=" @(NpmPackageToPublish->Count()) != 0 "
+          Command="npm config set &quot;$(AuthTokenSetting)&quot; $(PublishMyGetFeedKey)"
           StandardOutputImportance="Normal" />
 
     <!-- When you UseCommandProcessor FileName is ignored -->
-    <Run FileName="cmd"
+    <Run Condition=" @(NpmPackageToPublish->Count()) != 0 "
+         FileName="cmd"
          Arguments="npm;publish;--registry;$(PublishMyGetNpmRegistryUrl);%(NpmPackageToPublish.Identity)"
          MaxRetries="5"
          UseCommandProcessor="true"
@@ -227,10 +233,11 @@
       <Output TaskParameter="ExitCode" ItemName="_NpmExitCodes" />
     </Run>
 
-    <Exec Command="npm config delete $(AuthTokenSetting)"
+    <Exec Condition=" @(NpmPackageToPublish->Count()) != 0 "
+          Command="npm config delete $(AuthTokenSetting)"
           StandardOutputImportance="Normal" />
 
-    <Error Text="Publishing npm modules failed" Condition="%(_NpmExitCodes.Identity) != 0" />
+    <Error Text="Publishing npm modules failed" Condition=" @(NpmPackageToPublish->Count()) != 0 AND %(_NpmExitCodes.Identity) != 0" />
   </Target>
 
   <Target Name="PublishToAzureFeed"
diff --git a/docs/FallbackPackageCache.md b/docs/FallbackPackageCache.md
deleted file mode 100644
index 688d48650f..0000000000
--- a/docs/FallbackPackageCache.md
+++ /dev/null
@@ -1,54 +0,0 @@
-Fallback Package Cache (LZMA)
-=============================
-
-The fallback package cache (commonly called the LZMA) is a set of NuGet packages that are bundled in the .NET Core SDK installers.
-The LZMA is a compressed file format, similar to a .zip.
-On first use or on install, the .NET Core CLI will expand this LZMA file, extracting the packages inside to %DOTNET_INSTALL_DIR%/sdk/NuGetFallbackFolder.
-
-## Requirements
-
-The following requirements are used to determine which packages go into the fallback package cache:
-
- - A user should be able to restore the following templates and only use packages from the offline cache:
-    - `dotnet new console`
-    - `dotnet new library`
-    - `dotnet new web`
-    - `dotnet new razor`
-    - `dotnet new mvc`
-
-The following packages are NOT included in the offline cache.
-  - Packages required for standalone publishing, aka projects that set a Runtime Identifier during restore
-  - Packages required for F# and VB templates
-  - Packages required for  Visual Studio code generation in ASP.NET Core projects
-  - Packages required to restore .NET Framework projects
-  - Packages required to restore test projects, such as xunit, MSTest, NUnit
-
-The result of this typically means including the transitive graph of the following packages:
-
-  - Packages that match bundled runtimes
-    - Microsoft.NETCore.App
-    - Microsoft.AspNetCore.App
-    - Microsoft.AspNetCore.All
-  - Packages that Microsoft.NET.Sdk adds implicitly
-    - Microsoft.NETCore.App
-    - NETStandard.Library
-  - Packages that are a PackageReference/DotNetCliToolReference in basic ASP.NET Core templates. In addition to packages above, this typically includes:
-    - Microsoft.EntityFrameworkCore.Tools{.DotNet}
-    - Microsoft.VisualStudio.Web.CodeGeneration.Design
-    - Microsoft.VisualStudio.Web.BrowserLink
-
-### Example
-
-Given the following parameters:
- - LatestNETCoreAppTFM = netcoreapp2.1
- - DefaultRuntimeVersion = 2.1
- - BundledRuntimeVersion = 2.1.8
- - BundledAspNetRuntimeVersion = 2.1.7
- - LatestNETStandardLibraryTFM = netstandard2.0
- - BundledNETStandardLibraryVersion = 2.0.1
-
-The LZMA should contain
-  - Microsoft.NETCore.App/2.1.0 + netcoreapp2.1 dependencies (Microsoft.NET.Sdk will implicitly reference "2.1", which NuGet to 2.1.0)
-  - Microsoft.NETCore.App/2.1.8 + netcoreapp2.1 dependencies (Matches the runtime in shared/Microsoft.NETCore.App/2.1.8/)
-  - Microsoft.AspNetCore.All/2.1.7 + netcoreapp2.1 dependencies (Matches the runtime in shared/Microsoft.AspNetCore.All/2.1.7/)
-  - NETStandard.Library/2.0.1 + netstandard2.0 dependencies (Microsoft.NET.Sdk will implicitly reference "2.0.1")
diff --git a/docs/PackageArchives.md b/docs/PackageArchives.md
new file mode 100644
index 0000000000..99ebe79cc3
--- /dev/null
+++ b/docs/PackageArchives.md
@@ -0,0 +1,68 @@
+Package Archives
+================
+
+This repo builds multiple package archives which contain a NuGet fallback folder (also known as the fallback or offline package cache). The fallback folder is a set of NuGet packages that is bundled in the .NET Core SDK installers and available in Azure Web App service.
+
+Package archives are available in four varieties.
+
+* **LZMA** - `nuGetPackagesArchive-$(Version).lzma` - The LZMA is a compressed file format, similar to a .zip. On first use or on install, the .NET Core CLI will expand this LZMA file, extracting the packages inside to %DOTNET_INSTALL_DIR%/sdk/NuGetFallbackFolder. This contains all NuGet packages and their complete contents.
+* **ci-server** - `nuGetPackagesArchive-ci-server-$(Version).zip` - this archive is optimized for CI server environments. It contains the same contents as the LZMA, but trimmed of xml docs (these are only required for IDEs) and .nupkg files (not required for NuGet as for the 2.0 SDK).
+* **ci-server-patch** - `nuGetPackagesArchive-ci-server-$(Version).patch.zip` - this archive is the same as the ci-server archive, but each release is incremental - i.e. it does not bundle files that were present in a previous ci-server archive release. This can be used by first starting with a baseline `nuGetPackagesArchive-ci-server-$(Version).zip` and then applying the `.patch.zip` version for subsequent updates.
+* **ci-server-compat-patch** - `nuGetPackagesArchive-ci-server-compat-$(Version).patch.zip` - similar to the ci-server-patch archive, but this includes .nupkg files to satisfy CI environments that may have older NuGet clients.
+
+These archives are built using the projects in [src/PackageArchive/Archive.\*/](/src/PackageArchive/).
+
+## Using a fallback folder
+
+NuGet restore takes a list of fallback folders in the MSBuild property `RestoreAdditionalProjectFallbackFolders`. Unlike a folder restore source, restore will not copy the packages from a fallback folder into the global NuGet cache.
+
+By default, the .NET Core SDK adds `$(DotNetInstallRoot)/sdk/NuGetFallbackFolder/` to this list. The .NET Core CLI expands its bundled `nuGetPackagesArchive.lzma` file into this location on first use or when the installers run. (See [Microsoft.NET.NuGetOfflineCache.targets](https://github.com/dotnet/sdk/blob/v2.1.300/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.NuGetOfflineCache.targets)).
+
+## Scenarios
+
+The following scenarios are used to determine which packages go into the fallback package cache.
+These requirements are formalized as project files in [src/PackageArchive/Scenario.\*/](/src/PackageArchive/).
+
+ - A user should be able to restore the following templates and only use packages from the offline cache:
+    - `dotnet new console`
+    - `dotnet new library`
+    - `dotnet new web`
+    - `dotnet new razor`
+    - `dotnet new mvc`
+
+The following packages are NOT included in the offline cache.
+  - Packages required for standalone publishing, aka projects that set a Runtime Identifier during restore
+  - Packages required for F# and VB templates
+  - Packages required for Visual Studio code generation in ASP.NET Core projects
+  - Packages required to restore .NET Framework projects
+  - Packages required to restore test projects, such as xunit, MSTest, NUnit
+
+The result of this typically means including the transitive graph of the following packages:
+
+  - Packages that match bundled runtimes
+    - Microsoft.NETCore.App
+    - Microsoft.AspNetCore.App
+    - Microsoft.AspNetCore.All
+  - Packages that Microsoft.NET.Sdk adds implicitly
+    - Microsoft.NETCore.App
+    - NETStandard.Library
+  - Packages that are a PackageReference/DotNetCliToolReference in basic ASP.NET Core templates. In addition to packages above, this typically includes:
+    - Microsoft.EntityFrameworkCore.Tools{.DotNet}
+    - Microsoft.VisualStudio.Web.CodeGeneration.Design
+    - Microsoft.VisualStudio.Web.BrowserLink
+
+### Example
+
+Given the following parameters:
+ - LatestNETCoreAppTFM = netcoreapp2.1
+ - DefaultRuntimeVersion = 2.1
+ - BundledRuntimeVersion = 2.1.8
+ - BundledAspNetRuntimeVersion = 2.1.7
+ - LatestNETStandardLibraryTFM = netstandard2.0
+ - BundledNETStandardLibraryVersion = 2.0.1
+
+The LZMA should contain
+  - Microsoft.NETCore.App/2.1.0 + netcoreapp2.1 dependencies (Microsoft.NET.Sdk will implicitly reference "2.1", which NuGet to 2.1.0)
+  - Microsoft.NETCore.App/2.1.8 + netcoreapp2.1 dependencies (Matches the runtime in shared/Microsoft.NETCore.App/2.1.8/)
+  - Microsoft.AspNetCore.All/2.1.7 + netcoreapp2.1 dependencies (Matches the runtime in shared/Microsoft.AspNetCore.All/2.1.7/)
+  - NETStandard.Library/2.0.1 + netstandard2.0 dependencies (Microsoft.NET.Sdk will implicitly reference "2.0.1")
diff --git a/src/PackageArchive/README.md b/src/PackageArchive/README.md
new file mode 100644
index 0000000000..6ac17c97a2
--- /dev/null
+++ b/src/PackageArchive/README.md
@@ -0,0 +1,6 @@
+PackageArchive
+==============
+
+See [docs/PackageArchives.md](/docs/PackageArchives.md) for details.
+
+See [ZipManifestGenerator](/src/PackageArchive/ZipManifestGenerator) for instructions on updating the build for new releases.