diff --git a/build/Publish.targets b/build/Publish.targets
index f810dade57..a8f065fdc5 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -249,12 +249,12 @@
     <ItemGroup>
       <PackageToPublishToTransport
         Include="@(PackageToPublish)"
-        Condition="'%(PackageToPublish.Category)' == 'ship'" />
+        Condition="'%(PackagesToPublish.Category)' == 'ship'" />
 
       <PackageToPublishToTransport
         Include="@(PackageToPublish)"
         ManifestArtifactData="NonShipping=true"
-        Condition="'%(PackageToPublish.Category)' != 'ship'" />
+        Condition="'%(PackagesToPublish.Category)' != 'ship'" />
 
       <!-- Filter aliased artifacts to workaround dotnet/buildtools#1855 -->
       <FilesToPublishToTransport Include="@(FilesToPublish)"
diff --git a/build/dependencies.props b/build/dependencies.props
index 7662a2934b..f442d498dc 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -39,7 +39,7 @@
     <MicrosoftCSharpPackageVersion>4.5.0-preview2-26130-01</MicrosoftCSharpPackageVersion>
     <MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview2-25711-01</MicrosoftDotNetPlatformAbstractionsPackageVersion>
     <MicrosoftDotNetProjectModelPackageVersion>1.0.0-rc3-003121</MicrosoftDotNetProjectModelPackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview2-25711-01</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview1-26208-06</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftExtensionsPlatformAbstractionsPackageVersion>1.1.0</MicrosoftExtensionsPlatformAbstractionsPackageVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.14.2</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
     <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.2.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
diff --git a/build/repo.targets b/build/repo.targets
index 27b08ac0cf..73a131152e 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -100,7 +100,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="GeneratePropsFiles" DependsOnTargets="GetArtifactInfo">
+  <Target Name="GeneratePropsFiles" DependsOnTargets="PrepareOutputPaths;GetArtifactInfo">
     <ItemGroup>
       <_LineupPackages Include="@(ExternalDependency)" />
       <_LineupPackages Include="%(ArtifactInfo.PackageId)" Version="%(ArtifactInfo.Version)" Condition=" '%(ArtifactInfo.ArtifactType)' == 'NuGetPackage' " />