Merge pull request #1943 from dotnet-maestro-bot/merge/release/3.1-to…

…-master

[automated] Merge branch 'release/3.1' => 'master'

Directory.Build.props

@@ -5,17 +5,11 @@
     <Product>Microsoft ASP.NET Core Blazor</Product>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://asp.net/</PackageProjectUrl>
-    <PackageIcon>packageIcon.png</PackageIcon>
-    <PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
     <RepositoryUrl>https://github.com/aspnet/Blazor</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
-  </ItemGroup>
-
 </Project>

NuGet.config

@@ -2,8 +2,9 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
-    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
+    <add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
+    <add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
+    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

eng/Version.Details.xml

@@ -8,4 +8,4 @@
       <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
     </Dependency>
   </ToolsetDependencies>
-</Dependencies>
+</Dependencies>

src/Microsoft.AspNetCore.Blazor.Mono/Microsoft.AspNetCore.Blazor.Mono.csproj

@@ -23,10 +23,6 @@
     <BclWipeSpecFiles Include="$(BclWipeSpecDir)**" />
   </ItemGroup>
 
-  <ItemGroup>
-    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
-  </ItemGroup>
-
   <Target Name="OptimizeMono" DependsOnTargets="OptimizeMonoWasm; OptimizeBcl" BeforeTargets="Build" />
 
   <Target Name="OptimizeMonoWasm" Inputs="@(WasmItemsToCopy)" Outputs="@(WasmItemsToCopy->'$(MonoDistDir)wasm\%(RecursiveDir)%(FileName)%(Extension)')">

src/Microsoft.AspNetCore.Blazor.Mono/Microsoft.AspNetCore.Blazor.Mono.nuspec

@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-   $CommonMetadataElements$
-   <icon>packageIcon.png</icon>
-  </metadata>
-  <files>
-    <file src="..\..\THIRD-PARTY-NOTICES.txt" />
-    <file src="build\**" target="build" />
-    <file src="dist\**\*" target="tools\mono"  />
-    <file src="tools\binaries\monolinker\**\*.*" target="tools\monolinker" />
-    <file src="$PackageIcon$" target="" />
-  </files>
-</package>
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+   $CommonMetadataElements$
+  </metadata>
+  <files>
+    $CommonFileElements$
+    <file src="..\..\THIRD-PARTY-NOTICES.txt" />
+    <file src="build\**" target="build" />
+    <file src="dist\**\*" target="tools\mono"  />
+    <file src="tools\binaries\monolinker\**\*.*" target="tools\monolinker" />
+  </files>
+</package>