Skip to content

Commit c82a95e

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/3.1] Update dependencies from 3 repositories (#15218)
* Update dependencies from https://github.com/dotnet/arcade build 20191017.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19517.3 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19517.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19517.3 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.2 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.2 - dotnet-ef - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.2 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.4 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.4 - dotnet-ef - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.4 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.5 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.5 - dotnet-ef - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.5 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.7 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.7 - dotnet-ef - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.7 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.8 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.8 - dotnet-ef - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.8 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.9 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.9 - dotnet-ef - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.9 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.11 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.11 - dotnet-ef - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.11 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.12 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.12 - dotnet-ef - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.12 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.13 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.13 - dotnet-ef - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.13 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191022.1 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19522.1 - dotnet-ef - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19522.1 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191022.3 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19522.3 - dotnet-ef - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19522.3 * Remove duplicate icon url * Remove more duplicate icon elements * Remove more package icons * Remove packageIcon * Update dependencies from https://github.com/aspnet/Blazor build 20191023.1 - Microsoft.AspNetCore.Blazor.Mono - 3.1.0-preview2.19523.1 * Undo bad deletion of eng/common file
1 parent 9f9fbd0 commit c82a95e

31 files changed

+48
-91
lines changed

‎Directory.Build.props

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@
4646
<!-- Contact email address for NuGet packages and Linux installers. -->
4747
<MaintainerEmail>[email protected]</MaintainerEmail>
4848

49-
<PackageIcon>packageIcon.png</PackageIcon>
50-
<PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
5149
<PackageProjectUrl>https://asp.net</PackageProjectUrl>
5250
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
5351

@@ -56,10 +54,6 @@
5654
<DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
5755
</PropertyGroup>
5856

59-
<ItemGroup>
60-
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
61-
</ItemGroup>
62-
6357
<!-- Warnings and errors -->
6458
<PropertyGroup>
6559
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎eng/Version.Details.xml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="3.1.0-preview1.19503.1">
12+
<Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="3.1.0-preview2.19523.1">
1313
<Uri>https://github.com/aspnet/Blazor</Uri>
14-
<Sha>bf49a4e1a5401c0e952147f1c7452261a058813d</Sha>
14+
<Sha>1eea415dd9381f7f13585fe3a5c60ce73ce65174</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.1.0-preview2.19518.7">
1717
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
@@ -29,33 +29,33 @@
2929
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
3030
<Sha>c034007a2d17e04decd619d875307392656ae94f</Sha>
3131
</Dependency>
32-
<Dependency Name="dotnet-ef" Version="3.1.0-preview2.19518.9">
32+
<Dependency Name="dotnet-ef" Version="3.1.0-preview2.19522.3">
3333
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
34-
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
34+
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0-preview2.19518.9">
36+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0-preview2.19522.3">
3737
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
38-
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
38+
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0-preview2.19518.9">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0-preview2.19522.3">
4141
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
42-
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
42+
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0-preview2.19518.9">
44+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0-preview2.19522.3">
4545
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
46-
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
46+
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0-preview2.19518.9">
48+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0-preview2.19522.3">
4949
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
50-
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
50+
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0-preview2.19518.9">
52+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0-preview2.19522.3">
5353
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
54-
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
54+
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
5555
</Dependency>
56-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="3.1.0-preview2.19518.9">
56+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="3.1.0-preview2.19522.3">
5757
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
58-
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
58+
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
5959
</Dependency>
6060
<Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.1.0-preview2.19518.29" CoherentParentDependency="Microsoft.EntityFrameworkCore">
6161
<Uri>https://github.com/aspnet/Extensions</Uri>
@@ -412,17 +412,17 @@
412412
<Uri>https://github.com/aspnet/Extensions</Uri>
413413
<Sha>2f68d18ef7139b6c7577038342464479c7d26c11</Sha>
414414
</Dependency>
415-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19510.3">
415+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19517.3">
416416
<Uri>https://github.com/dotnet/arcade</Uri>
417-
<Sha>f70d1fca3d5d4045be75694006f1bee0e0aec572</Sha>
417+
<Sha>a42a124635ce1a218309ecb31ec59d559cacb886</Sha>
418418
</Dependency>
419-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19510.3">
419+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19517.3">
420420
<Uri>https://github.com/dotnet/arcade</Uri>
421-
<Sha>f70d1fca3d5d4045be75694006f1bee0e0aec572</Sha>
421+
<Sha>a42a124635ce1a218309ecb31ec59d559cacb886</Sha>
422422
</Dependency>
423-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19510.3">
423+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19517.3">
424424
<Uri>https://github.com/dotnet/arcade</Uri>
425-
<Sha>f70d1fca3d5d4045be75694006f1bee0e0aec572</Sha>
425+
<Sha>a42a124635ce1a218309ecb31ec59d559cacb886</Sha>
426426
</Dependency>
427427
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.0-preview2.19518.29" CoherentParentDependency="Microsoft.EntityFrameworkCore">
428428
<Uri>https://github.com/aspnet/Extensions</Uri>

‎eng/Versions.props

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/arcade -->
65-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19510.3</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19517.3</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.4.0-beta3-19518-02</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/core-setup -->
@@ -96,7 +96,7 @@
9696
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
9797
<MicrosoftNETCorePlatformsPackageVersion>3.1.0-preview2.19518.6</MicrosoftNETCorePlatformsPackageVersion>
9898
<!-- Packages from aspnet/Blazor -->
99-
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.1.0-preview1.19503.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
99+
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.1.0-preview2.19523.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
100100
<!-- Packages from aspnet/Extensions -->
101101
<InternalAspNetCoreAnalyzersPackageVersion>3.1.0-preview2.19518.29</InternalAspNetCoreAnalyzersPackageVersion>
102102
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.0-preview2.19518.29</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
@@ -160,13 +160,13 @@
160160
<MicrosoftJSInteropPackageVersion>3.1.0-preview2.19518.29</MicrosoftJSInteropPackageVersion>
161161
<MonoWebAssemblyInteropPackageVersion>3.1.0-preview2.19518.29</MonoWebAssemblyInteropPackageVersion>
162162
<!-- Packages from aspnet/EntityFrameworkCore -->
163-
<dotnetefPackageVersion>3.1.0-preview2.19518.9</dotnetefPackageVersion>
164-
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.1.0-preview2.19518.9</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
165-
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.1.0-preview2.19518.9</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
166-
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.1.0-preview2.19518.9</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
167-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.1.0-preview2.19518.9</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
168-
<MicrosoftEntityFrameworkCoreToolsPackageVersion>3.1.0-preview2.19518.9</MicrosoftEntityFrameworkCoreToolsPackageVersion>
169-
<MicrosoftEntityFrameworkCorePackageVersion>3.1.0-preview2.19518.9</MicrosoftEntityFrameworkCorePackageVersion>
163+
<dotnetefPackageVersion>3.1.0-preview2.19522.3</dotnetefPackageVersion>
164+
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.1.0-preview2.19522.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
165+
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.1.0-preview2.19522.3</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
166+
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.1.0-preview2.19522.3</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
167+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.1.0-preview2.19522.3</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
168+
<MicrosoftEntityFrameworkCoreToolsPackageVersion>3.1.0-preview2.19522.3</MicrosoftEntityFrameworkCoreToolsPackageVersion>
169+
<MicrosoftEntityFrameworkCorePackageVersion>3.1.0-preview2.19522.3</MicrosoftEntityFrameworkCorePackageVersion>
170170
<!-- Packages from aspnet/AspNetCore-Tooling -->
171171
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.1.0-preview2.19518.7</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
172172
<MicrosoftAspNetCoreRazorLanguagePackageVersion>3.1.0-preview2.19518.7</MicrosoftAspNetCoreRazorLanguagePackageVersion>

‎eng/common/post-build/setup-maestro-vars.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ param(
66

77
try {
88
$Content = Get-Content $ReleaseConfigsPath
9-
9+
1010
$BarId = $Content | Select -Index 0
11-
11+
1212
$Channels = ""
1313
$Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," }
14-
14+
1515
$IsStableBuild = $Content | Select -Index 2
1616

1717
Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId
@@ -23,4 +23,4 @@ catch {
2323
Write-Host $_.Exception
2424
Write-Host $_.ScriptStackTrace
2525
ExitWithExitCode 1
26-
}
26+
}

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.15.2",
28-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19510.3",
29-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19510.3"
28+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19517.3",
29+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19517.3"
3030
}
3131
}

‎packageIcon.png

-6.84 KB
Binary file not shown.

‎src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<ItemGroup>
2626
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2727
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
28-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2928
</ItemGroup>
3029

3130
</Project>

‎src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<icon>packageIcon.png</icon>
65
</metadata>
76

87
<files>
8+
$CommonFileElements$
99
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
1010
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11-
<file src="$PackageIcon$" target="" />
1211
</files>
1312
</package>

‎src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<NuspecProperty Include="componentsversion=$(ComponentsPackageVersion)" />
2424
<NuspecProperty Include="razorversion=$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
2525
<NuspecProperty Include="blazormonoversion=$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
26-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2726
</ItemGroup>
2827

2928
<ItemGroup>

‎src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
<dependencies>
66
<dependency id="Microsoft.AspNetCore.Blazor.Mono" version="$blazormonoversion$" include="all" />
77
</dependencies>
8-
<icon>packageIcon.png</icon>
98
</metadata>
109
<files>
10+
$CommonFileElements$
1111
<file src="..\..\..\THIRD-PARTY-NOTICES.txt" />
1212
<file src="build\**" target="build" />
1313
<file src="targets\**" target="targets" />
1414
<file src="$publishdir$**\*" target="tools/" />
1515
<file src="..\..\..\Web.JS\dist\$configuration$\blazor.*.js" target="tools/blazor" />
16-
<file src="$PackageIcon$" target="" />
1716
</files>
1817
</package>

‎src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<NuspecProperty Include="publishDir=$(PublishDir)" />
3434
<NuspecProperty Include="componentsrootdir=..\..\..\" />
3535
<NuspecProperty Include="blazorversion=$(PackageVersion)" />
36-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
3736
</ItemGroup>
3837

3938
</Project>

‎src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<icon>packageIcon.png</icon>
65
</metadata>
76
<files>
7+
$CommonFileElements$
88
<file src="build\**" target="build" />
99
<file src="$publishDir$**\*" target="tools" />
1010
<file src="$componentsrootdir$THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
11-
<file src="$PackageIcon$" target="" />
1211
</files>
1312
</package>

‎src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
1616
</PropertyGroup>
1717

18-
<ItemGroup>
19-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
20-
</ItemGroup>
21-
2218
<ItemGroup>
2319
<UpToDateCheckInput Include="content\**\.template.config.src\**\*.*" />
2420
</ItemGroup>

‎src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
<packageTypes>
66
<packageType name="Template" />
77
</packageTypes>
8-
<icon>packageIcon.png</icon>
98
</metadata>
109
<files>
10+
$CommonFileElements$
1111
<file
1212
src="content/**"
1313
exclude="**/bin/**;**/obj/**;**/.template.config.src/**;content/Directory.Build.props;content/Directory.Build.targets;"
1414
target="Content" />
15-
<file src="$PackageIcon$" target="" />
1615
</files>
1716
</package>

‎src/Components/Components/src/Microsoft.AspNetCore.Components.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<NuspecProperty Condition="'$(DotNetBuildFromSource)' != 'true'" Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" />
5656
<NuspecProperty Include="AssemblyName=$(AssemblyName)" />
5757
<NuspecProperty Include="OutputPath=$(OutputPath)" />
58-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
5958
</ItemGroup>
6059

6160
</Project>

‎src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
1616
</group>
1717
</dependencies>
18-
<icon>packageIcon.png</icon>
1918
</metadata>
2019
<files>
20+
$CommonFileElements$
2121
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
2222
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
2323
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
24-
<file src="$PackageIcon$" target="" />
2524
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
2625
</files>
2726
</package>

‎src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
1010
</group>
1111
</dependencies>
12-
<icon>packageIcon.png</icon>
1312
</metadata>
1413
<files>
14+
$CommonFileElements$
1515
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
1616
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
1717
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
18-
<file src="$PackageIcon$" target="" />
1918
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
2019
</files>
2120
</package>

‎src/Installers/Windows/SharedFramework/SharedFramework.wixproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
<ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec</ToolsetInstallerNuspecFile>
2525
</PropertyGroup>
2626

27-
<ItemGroup>
28-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
29-
</ItemGroup>
30-
3127
<ItemGroup>
3228
<WixExtension Include="WixDependencyExtension">
3329
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>

‎src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<owners>Microsoft</owners>
99
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
1010
<projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
11-
<icon>packageIcon.png</icon>
1211
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1312
<description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
1413
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

‎src/Installers/Windows/TargetingPack/TargetingPack.wixproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
<ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\TargetingPack\TargetingPackPackage.nuspec</ToolsetInstallerNuspecFile>
2424
</PropertyGroup>
2525

26-
<ItemGroup>
27-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
28-
</ItemGroup>
29-
3026
<ItemGroup>
3127
<WixExtension Include="WixDependencyExtension">
3228
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>

‎src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<owners>Microsoft</owners>
99
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
1010
<projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
11-
<icon>packageIcon.png</icon>
1211
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1312
<description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
1413
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

‎src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<ItemGroup>
2020
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2121
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
22-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2322
</ItemGroup>
2423

2524
</Project>

‎src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<icon>packageIcon.png</icon>
65
</metadata>
76

87
<files>
8+
$CommonFileElements$
99
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
1010
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11-
<file src="$PackageIcon$" target="" />
1211
</files>
1312
</package>

‎src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<ItemGroup>
2525
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2626
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
27-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2827
</ItemGroup>
2928

3029
</Project>

‎src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<icon>packageIcon.png</icon>
65
</metadata>
76

87
<files>
8+
$CommonFileElements$
99
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
1010
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11-
<file src="$PackageIcon$" target="" />
1211
</files>
1312
</package>

‎src/ProjectTemplates/TemplateProjects.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@
2121
<None Include="content/**" />
2222
</ItemGroup>
2323

24-
<ItemGroup>
25-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
26-
</ItemGroup>
27-
2824
</Project>

0 commit comments

Comments
 (0)