Skip to content

[release/3.0] Switch to embedded package icon #18027

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
wtgodbe merged 7 commits into from
Sep 26, 2019
Merged

[release/3.0] Switch to embedded package icon #18027

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8a6e5cb
Switch to embedded package icon
wtgodbe Sep 20, 2019
0bd8b11
Include package icon in dotnet-ef package
wtgodbe Sep 23, 2019
b10b26d
Add icon metadata to manually generated .nuspecs
wtgodbe Sep 24, 2019
08a6ea8
Update to GA SDK
wtgodbe Sep 24, 2019
c82459f
Include placeholder file for netcoreapp2.1
wtgodbe Sep 25, 2019
478a30f
Remove PackageLicenseUrl
wtgodbe Sep 25, 2019
562c885
Add TFM placeholders, fixup missed .nuspec's
wtgodbe Sep 25, 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: 4 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
<LangVersion>8.0</LangVersion>
<DebugType>portable</DebugType>
<PackageLicenseUrl Condition="'$(PackageLicenseExpression)' == ''">https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt</PackageLicenseUrl>
<PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
<PackageIcon>packageIcon.png</PackageIcon>
<PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
<PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Include="**\*.rd.xml" />
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "3.0.100-preview8-013656",
"dotnet": "3.0.100",
"runtimes": {
"dotnet": [
"2.0.9",
Expand All @@ -9,7 +9,7 @@
}
},
"sdk": {
"version": "3.0.100-preview8-013656"
"version": "3.0.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7"
Expand Down
Binary file added packageIcon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/dotnet-ef/dotnet-ef.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ dotnet ef database update
<NuspecProperty Include="OutputExeSymbol=..\..\artifacts\bin\ef\$(Configuration)\net461\ef.pdb" />
<NuspecProperty Include="OutputX86Exe=..\..\artifacts\bin\ef\x86\$(Configuration)\net461\ef.exe" />
<NuspecProperty Include="OutputX86ExeSymbol=..\..\artifacts\bin\ef\x86\$(Configuration)\net461\ef.pdb" />
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>
</Target>
</Project>
2 changes: 2 additions & 0 deletions src/dotnet-ef/dotnet-ef.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<dependencies>
<group targetFramework=".NETCoreApp2.1" />
</dependencies>
<icon>packageIcon.png</icon>
</metadata>

<files>
Expand All @@ -20,5 +21,6 @@
<file src="$OutputExeSymbol$" target="tools\$targetFramework$\any\tools\net461\any" />
<file src="$OutputX86Exe$" target="tools\$targetFramework$\any\tools\net461\win-x86" />
<file src="$OutputX86ExeSymbol$" target="tools\$targetFramework$\any\tools\net461\win-x86" />
<file src="$PackageIcon$" target="" />
</files>
</package>