diff --git a/src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.csproj b/src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.csproj
index b3a9d5b5bf..012600cd8e 100644
--- a/src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.csproj
+++ b/src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.csproj
@@ -4,12 +4,17 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <OutDir>tools</OutDir>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <NuspecFile>Microsoft.Blazor.BuildTools.nuspec</NuspecFile>
-    <PackageVersion>0.0.1</PackageVersion>
-    <NuspecProperties>version=$(PackageVersion)</NuspecProperties>
   </PropertyGroup>
 
+  <Target Name="SetPackageProperties" BeforeTargets="Pack">
+    <PropertyGroup>
+      <NoPackageAnalysis>true</NoPackageAnalysis>
+      <NuspecFile>Microsoft.Blazor.BuildTools.nuspec</NuspecFile>
+      <PackageVersion>0.0.1</PackageVersion>
+      <NuspecProperties>version=$(PackageVersion)</NuspecProperties>
+    </PropertyGroup>
+  </Target>
+
   <ItemGroup>
     <None Remove="tools\**" />
   </ItemGroup>
diff --git a/src/Microsoft.Blazor.Mono/Microsoft.Blazor.Mono.csproj b/src/Microsoft.Blazor.Mono/Microsoft.Blazor.Mono.csproj
index efdd98d27d..ab0a15aa4d 100644
--- a/src/Microsoft.Blazor.Mono/Microsoft.Blazor.Mono.csproj
+++ b/src/Microsoft.Blazor.Mono/Microsoft.Blazor.Mono.csproj
@@ -10,7 +10,7 @@
     <ProjectReference Include="..\Microsoft.Blazor.Common\Microsoft.Blazor.Common.csproj" />
   </ItemGroup>
 
-  <Target Name="EmbedMonoResources" BeforeTargets="PreBuildEvent" DependsOnTargets="OptimizeMono">
+  <Target Name="EmbedMonoResources" BeforeTargets="PreBuildEvent" DependsOnTargets="OptimizeMono" Inputs="$(MonoUnoptimizedDir)\**" Outputs="$(MonoOptimizedDir)\**">
     <ItemGroup>
       <MonoWasmResourcesToEmbed Include="$(MonoOptimizedDir)wasm/**" />
       <MonoAsmJsResourcesToEmbed Include="$(MonoOptimizedDir)asmjs/**" />