From a8a3fbab33cbb863e1cb660a728df21c13adf0c5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 27 Mar 2019 14:40:19 +0000
Subject: [PATCH] [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 https://github.com/dotnet/extensions/commit/d353f7b0204136d352423d44ad6df0505d17a376
---
 ...t.Extensions.FileProviders.Embedded.csproj | 39 +++++++------------
 ...t.Extensions.FileProviders.Embedded.nuspec | 12 +-----
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
index 792b9ff5b3..7d84c19f9d 100644
--- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
+++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
@@ -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>
diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.nuspec
index ff6d385add..4a33eb6a95 100644
--- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.nuspec
+++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.nuspec
@@ -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" />