[master] Update dependencies from dotnet/arcade (dotnet/extensions#1279)

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

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19171.6
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19171.6
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19171.6

* Use Arcade NuSpec helpers

* Fix Release flaky test leg

* Fix Release flaky non-Windows test legs

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

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19175.9
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19175.9
- Microsoft.DotNet.Helix.Sdk - 2.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
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19176.14
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19176.14
\n\nCommit migrated from d353f7b020
This commit is contained in:
dotnet-maestro[bot] 2019-03-27 14:40:19 +00:00 committed by GitHub
parent 31446f8c5d
commit a8a3fbab33
2 changed files with 16 additions and 35 deletions

View File

@ -22,31 +22,22 @@
<SignedPackageFile Include="Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.dll" Certificate="$(AssemblySigningCertName)" />
</ItemGroup>
<Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="BuiltProjectOutputGroup;DocumentationProjectOutputGroup;DebugSymbolsProjectOutputGroup;">
<Target Name="PopulateNuspec" BeforeTargets="InitializeStandardNuspecProperties" DependsOnTargets="BuiltProjectOutputGroup;DocumentationProjectOutputGroup;DebugSymbolsProjectOutputGroup;">
<PropertyGroup>
<NuspecProperties>
id=$(PackageId);
version=$(PackageVersion);
authors=$(Authors);
description=$(Description);
tags=$(PackageTags.Replace(';', ' '));
licenseUrl=$(PackageLicenseUrl);
projectUrl=$(PackageProjectUrl);
iconUrl=$(PackageIconUrl);
repositoryUrl=$(RepositoryUrl);
repositoryCommit=$(RepositoryCommit);
copyright=$(Copyright);
targetframework=$(TargetFramework);
AssemblyName=$(AssemblyName);
OutputBinary=@(BuiltProjectOutputGroupOutput);
OutputSymbol=@(DebugSymbolsProjectOutputGroupOutput);
OutputDocumentation=@(DocumentationProjectOutputGroupOutput);
<!-- Include the assembly and symbols from the tasks project -->
TaskAssemblyNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.dll;
TaskSymbolNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.pdb;
</NuspecProperties>
<PackageTags>$(PackageTags.Replace(';',' '))</PackageTags>
<_OutputBinary>@(BuiltProjectOutputGroupOutput)</_OutputBinary>
<_OutputSymbol>@(DebugSymbolsProjectOutputGroupOutput)</_OutputSymbol>
<_OutputDocumentation>@(DocumentationProjectOutputGroupOutput)</_OutputDocumentation>
</PropertyGroup>
<ItemGroup>
<NuspecProperty Include="targetframework=$(TargetFramework)"/>
<NuspecProperty Include="AssemblyName=$(AssemblyName)"/>
<NuspecProperty Include="OutputBinary=$(_OutputBinary)"/>
<NuspecProperty Include="OutputSymbol=$(_OutputSymbol)"/>
<NuspecProperty Include="OutputDocumentation=$(_OutputDocumentation)"/>
<!-- Include the assembly and symbols from the tasks project -->
<NuspecProperty Include="TaskAssemblyNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.dll"/>
<NuspecProperty Include="TaskSymbolNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.pdb"/>
</ItemGroup>
</Target>
</Project>

View File

@ -1,17 +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>
<repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
$CommonMetadataElements$
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$version$" exclude="Build,Analyzers" />