huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[master] Update dependencies from dotnet/arcade (dotnet/aspnetcore-tooling#346) 

* Update dependencies from https://github.com/dotnet/arcade build 20190317.10

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19167.10

* Update dependencies from https://github.com/dotnet/arcade build 20190320.2

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19170.2

* Update dependencies from https://github.com/dotnet/arcade build 20190321.3

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19171.3

* Update dependencies from https://github.com/dotnet/arcade build 20190321.6

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19171.6

* Update dependencies from https://github.com/dotnet/arcade build 20190325.9

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19175.9

* Update dependencies from https://github.com/dotnet/arcade build 20190326.14

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19176.14

* Update dependencies from https://github.com/dotnet/arcade build 20190327.11

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19177.11

* Update dependencies from https://github.com/dotnet/arcade build 20190329.1

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19179.1

* Update dependencies from https://github.com/dotnet/arcade build 20190329.2

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19179.2

* Update dependencies from https://github.com/dotnet/arcade build 20190401.12

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19201.12

* Update dependencies from https://github.com/dotnet/arcade build 20190402.13

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19202.13

* Update dependencies from https://github.com/dotnet/arcade build 20190403.10

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19203.10

* Update dependencies from https://github.com/dotnet/arcade build 20190404.16

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19204.16

* Update dependencies from https://github.com/dotnet/arcade build 20190405.6

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19205.6

* Use updated Arcade NuSpec helpers
- provide `InitializeStandardNuspecProperties` with expected information
- use `$CommonMetadataElements$` in Microsoft.NET.Sdk.Razor.nuspec

nits:
- correct a typo or two
\n\nCommit migrated from c60b63e296
This commit is contained in:
dotnet-maestro[bot] 2019-04-07 00:22:02 +00:00 committed by GitHub
parent 35edb562c5
commit 7957c11d02
2 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
View File

@ -45,10 +45,10 @@
Targets="Publish" />
<ItemGroup>
<MvcRazorExtenionOutput Include="$(ArtifactsBinDir)Microsoft.AspNetCore.Mvc.Razor.Extensions\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
<MvcRazorExtensionOutput Include="$(ArtifactsBinDir)Microsoft.AspNetCore.Mvc.Razor.Extensions\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
</ItemGroup>
<Copy SourceFiles="@(MvcRazorExtenionOutput)" DestinationFolder="$(SdkOutputPath)extensions\mvc-3-0\" SkipUnchangedFiles="true">
<Copy SourceFiles="@(MvcRazorExtensionOutput)" DestinationFolder="$(SdkOutputPath)extensions\mvc-3-0\" SkipUnchangedFiles="true">
<Output TaskParameter="CopiedFiles" ItemName="FileWrites" />
</Copy>
@ -62,24 +62,13 @@
</Copy>
</Target>
<Target Name="PopulateNuspec" AfterTargets="InitializeStandardNuspecProperties" DependsOnTargets="LayoutDependencies">
<Target Name="PopulateNuspec" BeforeTargets="InitializeStandardNuspecProperties" DependsOnTargets="LayoutDependencies">
<PropertyGroup>
<NuspecProperties>
id=$(MSBuildProjectName);
version=$(PackageVersion);
authors=$(Authors);
licenseUrl=$(PackageLicenseUrl);
projectUrl=$(PackageProjectUrl);
iconUrl=$(PackageIconUrl);
copyright=$(Copyright);
description=$(Description);
tags=$([MSBuild]::Escape($(PackageTags)));
serviceable=$(Serviceable);
repositoryUrl=$(RepositoryUrl);
repositoryCommit=$(RepositoryCommit);
targetframework=$(TargetFramework);
outputpath=$(OutputPath)\sdk-output;
</NuspecProperties>
<PackageTags>$(PackageTags.Replace(';',' '))</PackageTags>
</PropertyGroup>
<ItemGroup>
<NuspecProperty Include="outputPath=$(OutputPath)\sdk-output" />
</ItemGroup>
</Target>
</Project>

15
src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.nuspec
View File

@ -1,18 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>$id$</id>
<version>$version$</version>
<authors>$authors$</authors>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<licenseUrl>$licenseUrl$</licenseUrl>
<projectUrl>$projectUrl$</projectUrl>
<iconUrl>$iconUrl$</iconUrl>
<description>$description$</description>
<copyright>$copyright$</copyright>
<tags>$tags$</tags>
<serviceable>$serviceable$</serviceable>
<repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
$CommonMetadataElements$
</metadata>
<files>
@ -20,6 +9,6 @@
<file src="build\**" target="build" />
<file src="buildMultiTargeting\**" target="buildMultiTargeting" />
<file src="$outputpath$\**" target="\" />
<file src="$outputPath$\**" target="\" />
</files>
</package>