Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit d1d777a

Browse files
brettfonosami
authored andcommitted
replace deprecated nuspec iconUrl element with icon
1 parent c82f9f3 commit d1d777a

File tree

7 files changed

+15
-4
lines changed

7 files changed

+15
-4
lines changed

Diff for: .gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ mono/config.make text eol=lf
2626
targets.make text eol=lf
2727

2828
*.bsl linguist-vendored=true
29+
30+
*.png binary

Diff for: fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
<Authors>Microsoft Corporation; F# community contributors</Authors>
1414
<PackageLicenseUrl>https://github.com/fsharp/FSharp.Compiler.Service/blob/master/LICENSE</PackageLicenseUrl>
1515
<PackageProjectUrl>https://github.com/fsharp/FSharp.Compiler.Service</PackageProjectUrl>
16-
<PackageIconUrl>https://raw.github.com/fsharp/FSharp.Compiler.Service/master/misc/logo.png</PackageIconUrl>
16+
<PackageIcon>logo.png</PackageIcon>
1717
<PackageTags>F#, compiler, msbuild</PackageTags>
1818
</PropertyGroup>
1919
<ItemGroup>
20+
<None Include="$(MSBuildThisFileDirectory)..\misc\logo.png" Pack="true" Visible="false" PackagePath="" />
2021
<Compile Include="$(FSharpSourcesRoot)\fsharp\LegacyMSBuildReferenceResolver.fs">
2122
<Link>Service/MSBuildReferenceResolver.fs</Link>
2223
</Compile>

Diff for: fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
<Authors>Microsoft Corporation; F# community contributors</Authors>
1212
<PackageLicenseUrl>https://github.com/fsharp/FSharp.Compiler.Service/blob/master/LICENSE</PackageLicenseUrl>
1313
<PackageProjectUrl>https://github.com/fsharp/FSharp.Compiler.Service</PackageProjectUrl>
14-
<PackageIconUrl>https://raw.github.com/fsharp/FSharp.Compiler.Service/master/misc/logo.png</PackageIconUrl>
14+
<PackageIcon>logo.png</PackageIcon>
1515
<PackageTags>F#, compiler, msbuild</PackageTags>
1616
</PropertyGroup>
1717
<ItemGroup>
18+
<None Include="$(MSBuildThisFileDirectory)..\misc\logo.png" Pack="true" Visible="false" PackagePath="" />
1819
<Compile Include="..\FSharp.Compiler.Service.ProjectCrackerTool\ProjectCrackerOptions.fs">
1920
<Link>ProjectCrackerOptions.fs</Link>
2021
</Compile>

Diff for: fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<Authors>Microsoft Corporation; F# community contributors</Authors>
2626
<PackageLicenseUrl>https://github.com/fsharp/FSharp.Compiler.Service/blob/master/LICENSE</PackageLicenseUrl>
2727
<PackageProjectUrl>https://github.com/fsharp/FSharp.Compiler.Service</PackageProjectUrl>
28-
<PackageIconUrl>https://raw.github.com/fsharp/FSharp.Compiler.Service/master/misc/logo.png</PackageIconUrl>
28+
<PackageIcon>logo.png</PackageIcon>
2929
<PackageTags>F#, fsharp, interactive, compiler, editor</PackageTags>
3030
</PropertyGroup>
3131
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
@@ -38,6 +38,7 @@
3838
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
3939
</PropertyGroup>
4040
<ItemGroup>
41+
<None Include="$(MSBuildThisFileDirectory)..\misc\logo.png" Pack="true" Visible="false" PackagePath="" />
4142
<Compile Include="..\FSharp.Compiler.Service\AssemblyInfo.fs">
4243
<Link>AssemblyInfo/AssemblyInfo.fs</Link>
4344
</Compile>

Diff for: src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<PackageDescription>FSharp.Core redistributables from Visual F# Tools version $(FSPackageMajorVersion) For F# $(FSCoreMajorVersion). Contains code from the F# Software Foundation.</PackageDescription>
1010
</PropertyGroup>
1111

12+
<ItemGroup>
13+
<Content Include="icon.png" CopyToOutputDirectory="PreserveNewest" />
14+
</ItemGroup>
15+
1216
<ItemGroup>
1317
<ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj">
1418
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Diff for: src/fsharp/FSharp.Core.nuget/FSharp.Core.nuspec

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<iconUrl>https://fsharp.org/img/logo.png</iconUrl>
5+
<icon>icon.png</icon>
66
<language>en-US</language>
77
<dependencies>
88
<group targetFramework=".NETStandard2.0" />
99
<group targetFramework="net45" />
1010
</dependencies>
1111
</metadata>
1212
<files>
13+
<file src="FSharp.Core.nuget\$Configuration$\netstandard2.0\icon.png" target="icon.png" />
14+
1315
<file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.dll" target="lib\netstandard2.0" />
1416
<file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.sigdata" target="lib\netstandard2.0" />
1517
<file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.optdata" target="lib\netstandard2.0" />

Diff for: src/fsharp/FSharp.Core.nuget/icon.png

1.54 KB
Loading

0 commit comments

Comments
 (0)