Update build tools

This commit is contained in:
Ryan Nowak 2018-06-29 11:59:53 -07:00
parent 2f548f0b27
commit baf6a21ef6
4 changed files with 7 additions and 30 deletions

View File

@ -2,13 +2,11 @@
<PropertyGroup> <PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup> </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> <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
<InternalAspNetCoreSdkPackageVersion>2.1.0-preview3-17003</InternalAspNetCoreSdkPackageVersion> <InternalAspNetCoreSdkPackageVersion>2.1.0-rtm-15789</InternalAspNetCoreSdkPackageVersion>
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.2.0-preview1-34353</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion> <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.2.0-preview1-34576</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<!-- Used only in development when running the template contents directly from source -->
<TemplateBlazorPackageVersion>0.5.0-preview1-10325</TemplateBlazorPackageVersion> <TemplateBlazorPackageVersion>0.5.0-preview1-10325</TemplateBlazorPackageVersion>
</PropertyGroup> </PropertyGroup>

View File

@ -1,5 +1,5 @@
{ "sdk": { { "sdk": {
"version": "2.1.300-rtm-008823" }, "version": "2.1.300" },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.GlobalTools.Sdk": "2.1.0-rtm-15789"} "Microsoft.DotNet.GlobalTools.Sdk": "2.1.1-rtm-15793"}
} }

View File

@ -1,2 +1,2 @@
version:2.1.0-rtm-15789 version:2.1.1-rtm-15793
commithash:75fdcc47d080b39456e3c905dc1461bf861a44e1 commithash:988313f4b064d6c69fc6f7b845b6384a6af3447a

View File

@ -30,27 +30,6 @@
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Publish" Properties="TargetFramework=%(_TargetFramework.Identity)" /> <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Publish" Properties="TargetFramework=%(_TargetFramework.Identity)" />
</Target> </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> <ItemGroup>
<None Remove="tools\**" /> <None Remove="tools\**" />
</ItemGroup> </ItemGroup>