Skip to content

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

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

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2aee3e2
Switch to embedded PackageIcon
wtgodbe Sep 23, 2019
9734482
Merge branches
wtgodbe Sep 24, 2019
6b1fdb9
Update to GA SDK
wtgodbe Sep 24, 2019
83b434d
Fixup build errors
pranavkm Sep 25, 2019
f925f13
Remove empty lines
pranavkm 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
7 changes: 6 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,14 @@
<PropertyGroup Label="Package and Assembly Metadata">
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<Product>Microsoft ASP.NET Core</Product>
<PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
<PackageIcon>packageIcon.png</PackageIcon>
<PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
</PropertyGroup>

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

<PropertyGroup Label="Warning Suppressions">
<!--
Suppress warnings about assembly conflicts. This happens for assemblies that ship in VS so it's irrelevant.
Expand Down
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.1.11",
Expand All @@ -15,7 +15,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/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@

<ItemGroup>
<NuspecProperty Include="outputPath=$(OutputPath)\sdk-output" />
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>
</Target>
</Project>
2 changes: 2 additions & 0 deletions src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
$CommonMetadataElements$
<icon>packageIcon.png</icon>
</metadata>

<files>
Expand All @@ -10,6 +11,7 @@
<file src="buildMultiTargeting\**" target="buildMultiTargeting" />
<file src="_._" target="lib\netstandard2.0\_._" />

<file src="$PackageIcon$" target="" />
<file src="$outputPath$\**" target="\" />
</files>
</package>