From baf6a21ef68b7ba4429c14137c623b5bd3f682af Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Fri, 29 Jun 2018 11:59:53 -0700
Subject: [PATCH] Update build tools

---
 build/dependencies.props                      |  8 +++----
 global.json                                   |  4 ++--
 korebuild-lock.txt                            |  4 ++--
 .../Microsoft.AspNetCore.Blazor.Build.csproj  | 21 -------------------
 4 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index cfe4c20602..1d118df14f 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -2,13 +2,11 @@
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
-  <PropertyGroup Label="Package Versions">
+  <PropertyGroup Label="Package Versions"><!-- Used only in development when running the template contents directly from source -->
   
     <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
-    <InternalAspNetCoreSdkPackageVersion>2.1.0-preview3-17003</InternalAspNetCoreSdkPackageVersion>
-    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.2.0-preview1-34353</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
-
-    <!-- Used only in development when running the template contents directly from source -->
+    <InternalAspNetCoreSdkPackageVersion>2.1.0-rtm-15789</InternalAspNetCoreSdkPackageVersion>
+    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.2.0-preview1-34576</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
     <TemplateBlazorPackageVersion>0.5.0-preview1-10325</TemplateBlazorPackageVersion>
   </PropertyGroup>
 
diff --git a/global.json b/global.json
index 1884160934..faea04686d 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 { "sdk": { 
-"version": "2.1.300-rtm-008823" },
+"version": "2.1.300" },
 "msbuild-sdks": {
-"Microsoft.DotNet.GlobalTools.Sdk": "2.1.0-rtm-15789"}
+"Microsoft.DotNet.GlobalTools.Sdk": "2.1.1-rtm-15793"}
  }
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index b51627af43..bc84e0cd53 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-rtm-15789
-commithash:75fdcc47d080b39456e3c905dc1461bf861a44e1
+version:2.1.1-rtm-15793
+commithash:988313f4b064d6c69fc6f7b845b6384a6af3447a
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
index ee810d9981..6591e50a4d 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
@@ -30,27 +30,6 @@
     <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Publish" Properties="TargetFramework=%(_TargetFramework.Identity)" />
   </Target>
 
-  <!-- Our build tools and nuget don't play well together with hand-authoring a .nuspec -->
-  <Target Name="_GetArtifactInfoWorkaround" AfterTargets="GetSignedPackageFiles">
-    <ItemGroup>
-      <ArtifactInfo Include="$(PackageOutputPath)$(PackageId).$(PackageVersion).symbols.nupkg">
-        <ArtifactType>NuGetSymbolsPackage</ArtifactType>
-        <PackageId>$(PackageId)</PackageId>
-        <Version>$(PackageVersion)</Version>
-        <TargetFramework>$(TargetFramework)</TargetFramework>
-        <TargetFrameworks>$([MSBuild]::Escape($(TargetFrameworks)))</TargetFrameworks>
-        <SourceIncluded>$(IncludeSource)</SourceIncluded>
-        <PackageType>$(PackageType)</PackageType>
-        <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
-        <RepositoryUrl>$(RepositoryUrl)</RepositoryUrl>
-        <Category>$(PackageArtifactCategory)</Category>
-        <Certificate>$(PackageSigningCertName)</Certificate>
-        <ShouldBeSigned Condition="'$(PackageSigningCertName)' != '' OR @(SignedPackageFile-&gt;Count()) != 0 ">true</ShouldBeSigned>
-        <ShouldBeSigned Condition=" '$(DisableCodeSigning)' == 'true' ">false</ShouldBeSigned>
-        <IsContainer>true</IsContainer>
-      </ArtifactInfo>
-    </ItemGroup>
-  </Target>
   <ItemGroup>
     <None Remove="tools\**" />
   </ItemGroup>