Skip to content

[release/3.1] Update dependencies from 3 repositories #15218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Oct 24, 2019
Merged

[release/3.1] Update dependencies from 3 repositories #15218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1ab68d9
Update dependencies from https://github.com/dotnet/arcade build 20191…
dotnet-maestro[bot] Oct 21, 2019
8bed8f1
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 21, 2019
e9e3665
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 21, 2019
4311093
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 21, 2019
4857488
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 21, 2019
fdc8599
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 22, 2019
3ba6d2d
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 22, 2019
1730979
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 22, 2019
c91e3a6
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 22, 2019
d507f6f
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 22, 2019
445d686
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 22, 2019
9de0a87
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
dotnet-maestro[bot] Oct 22, 2019
341e902
Remove duplicate icon url
pranavkm Oct 23, 2019
bbcc98d
Remove more duplicate icon elements
wtgodbe Oct 23, 2019
f6f80d5
Remove more package icons
pranavkm Oct 23, 2019
4e26fa5
Remove packageIcon
pranavkm Oct 23, 2019
f009289
Update dependencies from https://github.com/aspnet/Blazor build 20191…
dotnet-maestro[bot] Oct 23, 2019
d88bdfb
Undo bad deletion of eng/common file
wtgodbe Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
<!-- Contact email address for NuGet packages and Linux installers. -->
<MaintainerEmail>[email protected]</MaintainerEmail>

<PackageIcon>packageIcon.png</PackageIcon>
<PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
<PackageProjectUrl>https://asp.net</PackageProjectUrl>
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>

Expand All @@ -56,10 +54,6 @@
<DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
</PropertyGroup>

<ItemGroup>
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
</ItemGroup>

<!-- Warnings and errors -->
<PropertyGroup>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
44 changes: 22 additions & 22 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="3.1.0-preview1.19503.1">
<Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="3.1.0-preview2.19523.1">
<Uri>https://github.com/aspnet/Blazor</Uri>
<Sha>bf49a4e1a5401c0e952147f1c7452261a058813d</Sha>
<Sha>1eea415dd9381f7f13585fe3a5c60ce73ce65174</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.1.0-preview2.19518.7">
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
Expand All @@ -29,33 +29,33 @@
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
<Sha>c034007a2d17e04decd619d875307392656ae94f</Sha>
</Dependency>
<Dependency Name="dotnet-ef" Version="3.1.0-preview2.19518.9">
<Dependency Name="dotnet-ef" Version="3.1.0-preview2.19522.3">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0-preview2.19518.9">
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0-preview2.19522.3">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0-preview2.19518.9">
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0-preview2.19522.3">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0-preview2.19518.9">
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0-preview2.19522.3">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0-preview2.19518.9">
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0-preview2.19522.3">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0-preview2.19518.9">
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0-preview2.19522.3">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="3.1.0-preview2.19518.9">
<Dependency Name="Microsoft.EntityFrameworkCore" Version="3.1.0-preview2.19522.3">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>b2fe76ff1eddf36f8a36161f02798f663acf9890</Sha>
<Sha>f325945eb07f7fd72620b02d8ec2be598cc7da8f</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.1.0-preview2.19518.29" CoherentParentDependency="Microsoft.EntityFrameworkCore">
<Uri>https://github.com/aspnet/Extensions</Uri>
Expand Down Expand Up @@ -412,17 +412,17 @@
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>2f68d18ef7139b6c7577038342464479c7d26c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19510.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19517.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f70d1fca3d5d4045be75694006f1bee0e0aec572</Sha>
<Sha>a42a124635ce1a218309ecb31ec59d559cacb886</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19510.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19517.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f70d1fca3d5d4045be75694006f1bee0e0aec572</Sha>
<Sha>a42a124635ce1a218309ecb31ec59d559cacb886</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19510.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19517.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f70d1fca3d5d4045be75694006f1bee0e0aec572</Sha>
<Sha>a42a124635ce1a218309ecb31ec59d559cacb886</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.0-preview2.19518.29" CoherentParentDependency="Microsoft.EntityFrameworkCore">
<Uri>https://github.com/aspnet/Extensions</Uri>
Expand Down
18 changes: 9 additions & 9 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19510.3</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19517.3</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>3.4.0-beta3-19518-02</MicrosoftNetCompilersToolsetPackageVersion>
<!-- Packages from dotnet/core-setup -->
Expand Down Expand Up @@ -96,7 +96,7 @@
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsPackageVersion>3.1.0-preview2.19518.6</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from aspnet/Blazor -->
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.1.0-preview1.19503.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.1.0-preview2.19523.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
<!-- Packages from aspnet/Extensions -->
<InternalAspNetCoreAnalyzersPackageVersion>3.1.0-preview2.19518.29</InternalAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.0-preview2.19518.29</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
Expand Down Expand Up @@ -160,13 +160,13 @@
<MicrosoftJSInteropPackageVersion>3.1.0-preview2.19518.29</MicrosoftJSInteropPackageVersion>
<MonoWebAssemblyInteropPackageVersion>3.1.0-preview2.19518.29</MonoWebAssemblyInteropPackageVersion>
<!-- Packages from aspnet/EntityFrameworkCore -->
<dotnetefPackageVersion>3.1.0-preview2.19518.9</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.1.0-preview2.19518.9</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.1.0-preview2.19518.9</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.1.0-preview2.19518.9</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.1.0-preview2.19518.9</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>3.1.0-preview2.19518.9</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>3.1.0-preview2.19518.9</MicrosoftEntityFrameworkCorePackageVersion>
<dotnetefPackageVersion>3.1.0-preview2.19522.3</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.1.0-preview2.19522.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.1.0-preview2.19522.3</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.1.0-preview2.19522.3</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.1.0-preview2.19522.3</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>3.1.0-preview2.19522.3</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>3.1.0-preview2.19522.3</MicrosoftEntityFrameworkCorePackageVersion>
<!-- Packages from aspnet/AspNetCore-Tooling -->
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.1.0-preview2.19518.7</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
<MicrosoftAspNetCoreRazorLanguagePackageVersion>3.1.0-preview2.19518.7</MicrosoftAspNetCoreRazorLanguagePackageVersion>
Expand Down
8 changes: 4 additions & 4 deletions eng/common/post-build/setup-maestro-vars.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ param(

try {
$Content = Get-Content $ReleaseConfigsPath

$BarId = $Content | Select -Index 0

$Channels = ""
$Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," }

$IsStableBuild = $Content | Select -Index 2

Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId
Expand All @@ -23,4 +23,4 @@ catch {
Write-Host $_.Exception
Write-Host $_.ScriptStackTrace
ExitWithExitCode 1
}
}
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.15.2",
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19510.3",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19510.3"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19517.3",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19517.3"
}
}
Binary file removed packageIcon.png
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<ItemGroup>
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
$CommonMetadataElements$
<icon>packageIcon.png</icon>
</metadata>

<files>
$CommonFileElements$
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
<file src="$PackageIcon$" target="" />
</files>
</package>
1 change: 0 additions & 1 deletion src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<NuspecProperty Include="componentsversion=$(ComponentsPackageVersion)" />
<NuspecProperty Include="razorversion=$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
<NuspecProperty Include="blazormonoversion=$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
<dependencies>
<dependency id="Microsoft.AspNetCore.Blazor.Mono" version="$blazormonoversion$" include="all" />
</dependencies>
<icon>packageIcon.png</icon>
</metadata>
<files>
$CommonFileElements$
<file src="..\..\..\THIRD-PARTY-NOTICES.txt" />
<file src="build\**" target="build" />
<file src="targets\**" target="targets" />
<file src="$publishdir$**\*" target="tools/" />
<file src="..\..\..\Web.JS\dist\$configuration$\blazor.*.js" target="tools/blazor" />
<file src="$PackageIcon$" target="" />
</files>
</package>
1 change: 0 additions & 1 deletion src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<NuspecProperty Include="publishDir=$(PublishDir)" />
<NuspecProperty Include="componentsrootdir=..\..\..\" />
<NuspecProperty Include="blazorversion=$(PackageVersion)" />
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
$CommonMetadataElements$
<icon>packageIcon.png</icon>
</metadata>
<files>
$CommonFileElements$
<file src="build\**" target="build" />
<file src="$publishDir$**\*" target="tools" />
<file src="$componentsrootdir$THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
<file src="$PackageIcon$" target="" />
</files>
</package>
4 changes: 0 additions & 4 deletions src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
</PropertyGroup>

<ItemGroup>
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>

<ItemGroup>
<UpToDateCheckInput Include="content\**\.template.config.src\**\*.*" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
<packageTypes>
<packageType name="Template" />
</packageTypes>
<icon>packageIcon.png</icon>
</metadata>
<files>
$CommonFileElements$
<file
src="content/**"
exclude="**/bin/**;**/obj/**;**/.template.config.src/**;content/Directory.Build.props;content/Directory.Build.targets;"
target="Content" />
<file src="$PackageIcon$" target="" />
</files>
</package>
1 change: 0 additions & 1 deletion src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
<NuspecProperty Condition="'$(DotNetBuildFromSource)' != 'true'" Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" />
<NuspecProperty Include="AssemblyName=$(AssemblyName)" />
<NuspecProperty Include="OutputPath=$(OutputPath)" />
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
</group>
</dependencies>
<icon>packageIcon.png</icon>
</metadata>
<files>
$CommonFileElements$
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
<file src="$PackageIcon$" target="" />
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
</files>
</package>
3 changes: 1 addition & 2 deletions src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
</group>
</dependencies>
<icon>packageIcon.png</icon>
</metadata>
<files>
$CommonFileElements$
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
<file src="$PackageIcon$" target="" />
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
</files>
</package>
4 changes: 0 additions & 4 deletions src/Installers/Windows/SharedFramework/SharedFramework.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
<ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec</ToolsetInstallerNuspecFile>
</PropertyGroup>

<ItemGroup>
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>

<ItemGroup>
<WixExtension Include="WixDependencyExtension">
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
Expand Down
1 change: 0 additions & 1 deletion src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
<projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
<icon>packageIcon.png</icon>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
Expand Down
4 changes: 0 additions & 4 deletions src/Installers/Windows/TargetingPack/TargetingPack.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
<ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\TargetingPack\TargetingPackPackage.nuspec</ToolsetInstallerNuspecFile>
</PropertyGroup>

<ItemGroup>
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>

<ItemGroup>
<WixExtension Include="WixDependencyExtension">
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
Expand Down
1 change: 0 additions & 1 deletion src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
<projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
<icon>packageIcon.png</icon>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
Expand Down
1 change: 0 additions & 1 deletion src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<ItemGroup>
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
$CommonMetadataElements$
<icon>packageIcon.png</icon>
</metadata>

<files>
$CommonFileElements$
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
<file src="$PackageIcon$" target="" />
</files>
</package>
1 change: 0 additions & 1 deletion src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<ItemGroup>
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
$CommonMetadataElements$
<icon>packageIcon.png</icon>
</metadata>

<files>
$CommonFileElements$
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
<file src="$PackageIcon$" target="" />
</files>
</package>
4 changes: 0 additions & 4 deletions src/ProjectTemplates/TemplateProjects.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,4 @@
<None Include="content/**" />
</ItemGroup>

<ItemGroup>
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>

</Project>
Loading