Skip to content

Commit 0f5c3c3

Browse files
JeavonJeavon
committed
Adding IconUrl to package.xml for Umbraco v7.5 local package installer
1 parent 3838c15 commit 0f5c3c3

File tree

3 files changed

+199
-197
lines changed

3 files changed

+199
-197
lines changed

‎build/UmbracoFileSystemProviders.Azure.proj‎

Lines changed: 172 additions & 171 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,103 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Package">
33

4-
<!-- IMPORTS -->
5-
<PropertyGroup>
6-
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\tools\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
7-
<MSBuildUmbracoTasksPath>$(MSBuildProjectDirectory)\tools\MSBuildUmbracoTasks</MSBuildUmbracoTasksPath>
8-
<MSBuildNugetTasksPath>$(MSBuildProjectDirectory)\tools\MSBuildNugetTasks</MSBuildNugetTasksPath>
9-
<AppVeyorUmbracoPath>$(MSBuildProjectDirectory)\tools\AppVeyorUmbraco</AppVeyorUmbracoPath>
10-
</PropertyGroup>
11-
12-
<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" />
13-
<Import Project="$(MSBuildUmbracoTasksPath)\MSBuild.Umbraco.Tasks.Targets" />
14-
<Import Project="$(MSBuildNugetTasksPath)\MSBuild.NuGet.Tasks.Targets" />
15-
<Import Project="$(AppVeyorUmbracoPath)\AppVeyorUmbraco.Targets" />
16-
17-
<!-- SHARED PROPERTIES -->
18-
<PropertyGroup>
19-
<PackageName>UmbracoFileSystemProviders.Azure</PackageName>
20-
<MinUmbracoVersion>7.1.9</MinUmbracoVersion>
21-
<Readme>An Azure Blob Storage IFileSystem provider for Umbraco.</Readme>
22-
<AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold</AuthorName>
23-
<AuthorUrl>https://github.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure/graphs/contributors</AuthorUrl>
24-
<PackageLicenseName>Apache 2.0 license</PackageLicenseName>
25-
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
26-
<ProjectUrl>https://github.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure</ProjectUrl>
27-
</PropertyGroup>
28-
29-
<!-- NUGET ONLY PROPERTIES -->
30-
<PropertyGroup>
31-
<PackageId>UmbracoFileSystemProviders.Azure</PackageId>
32-
<Copyright>Copyright &#169; James Jackson-South and contributors.</Copyright>
33-
<Owners>James Jackson-South</Owners>
34-
<Description>An Azure Blob Storage IFileSystem provider for Umbraco 6.25+. Used to offload static files in the media section to the cloud.</Description>
35-
<IconUrl>https://raw.githubusercontent.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure/develop/build/assets/logo/azure-logo-128.png</IconUrl>
36-
<Tags>umbraco azure media blob imageprocessor</Tags>
37-
<Language>en-GB</Language>
38-
<RequireLicenseAcceptance>false</RequireLicenseAcceptance>
39-
</PropertyGroup>
40-
41-
<!-- APPVEYOR PROPERTIES -->
42-
<PropertyGroup>
43-
<FileVersion>$(APPVEYOR_BUILD_VERSION)</FileVersion>
44-
</PropertyGroup>
45-
<Choose>
46-
<When Condition="$(APPVEYOR_BUILD_NUMBER) != '' And $(APPVEYOR_REPO_TAG) != 'true' ">
47-
<PropertyGroup>
48-
<Release>false</Release>
49-
</PropertyGroup>
50-
</When>
51-
<Otherwise>
52-
<PropertyGroup>
53-
<Release>true</Release>
54-
</PropertyGroup>
55-
</Otherwise>
56-
</Choose>
57-
58-
<Choose>
59-
<When Condition="$(Release) == 'false' And $(UMBRACO_PACKAGE_PRERELEASE_SUFFIX) == 'rtm'">
60-
<PropertyGroup>
61-
<AbortBuild>true</AbortBuild>
62-
</PropertyGroup>
63-
</When>
64-
<Otherwise>
65-
<PropertyGroup>
66-
<AbortBuild>false</AbortBuild>
67-
</PropertyGroup>
68-
</Otherwise>
69-
</Choose>
70-
71-
<!-- PATHS -->
72-
<PropertyGroup>
73-
<BuildConfig>Release</BuildConfig>
74-
<RootDir>$(MSBuildProjectDirectory)\..</RootDir>
75-
<BuildDir>$(MSBuildProjectDirectory)\_core</BuildDir>
76-
<BuildUmbDir>$(BuildDir)\_umbraco</BuildUmbDir>
77-
<BuildNuGetDir>$(BuildDir)\_nuget</BuildNuGetDir>
78-
<ArtifactsDir>$(RootDir)\artifacts</ArtifactsDir>
79-
<ProjectDir>$(RootDir)\src\UmbracoFileSystemProviders.Azure</ProjectDir>
4+
<!-- IMPORTS -->
5+
<PropertyGroup>
6+
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\tools\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
7+
<MSBuildUmbracoTasksPath>$(MSBuildProjectDirectory)\tools\MSBuildUmbracoTasks</MSBuildUmbracoTasksPath>
8+
<MSBuildNugetTasksPath>$(MSBuildProjectDirectory)\tools\MSBuildNugetTasks</MSBuildNugetTasksPath>
9+
<AppVeyorUmbracoPath>$(MSBuildProjectDirectory)\tools\AppVeyorUmbraco</AppVeyorUmbracoPath>
10+
</PropertyGroup>
11+
12+
<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" />
13+
<Import Project="$(MSBuildUmbracoTasksPath)\MSBuild.Umbraco.Tasks.Targets" />
14+
<Import Project="$(MSBuildNugetTasksPath)\MSBuild.NuGet.Tasks.Targets" />
15+
<Import Project="$(AppVeyorUmbracoPath)\AppVeyorUmbraco.Targets" />
16+
17+
<!-- SHARED PROPERTIES -->
18+
<PropertyGroup>
19+
<PackageName>UmbracoFileSystemProviders.Azure</PackageName>
20+
<MinUmbracoVersion>7.1.9</MinUmbracoVersion>
21+
<Readme>An Azure Blob Storage IFileSystem provider for Umbraco.</Readme>
22+
<AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold</AuthorName>
23+
<AuthorUrl>https://github.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure/graphs/contributors</AuthorUrl>
24+
<PackageLicenseName>Apache 2.0 license</PackageLicenseName>
25+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
26+
<ProjectUrl>https://github.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure</ProjectUrl>
27+
</PropertyGroup>
28+
29+
<!-- NUGET ONLY PROPERTIES -->
30+
<PropertyGroup>
31+
<PackageId>UmbracoFileSystemProviders.Azure</PackageId>
32+
<Copyright>Copyright &#169; James Jackson-South and contributors.</Copyright>
33+
<Owners>James Jackson-South</Owners>
34+
<Description>An Azure Blob Storage IFileSystem provider for Umbraco 6.25+. Used to offload static files in the media section to the cloud.</Description>
35+
<IconUrl>https://raw.githubusercontent.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure/develop/build/assets/logo/azure-logo-128.png</IconUrl>
36+
<Tags>umbraco azure media blob imageprocessor</Tags>
37+
<Language>en-GB</Language>
38+
<RequireLicenseAcceptance>false</RequireLicenseAcceptance>
39+
</PropertyGroup>
40+
41+
<!-- APPVEYOR PROPERTIES -->
42+
<PropertyGroup>
43+
<FileVersion>$(APPVEYOR_BUILD_VERSION)</FileVersion>
44+
</PropertyGroup>
45+
<Choose>
46+
<When Condition="$(APPVEYOR_BUILD_NUMBER) != '' And $(APPVEYOR_REPO_TAG) != 'true' ">
47+
<PropertyGroup>
48+
<Release>false</Release>
49+
</PropertyGroup>
50+
</When>
51+
<Otherwise>
52+
<PropertyGroup>
53+
<Release>true</Release>
54+
</PropertyGroup>
55+
</Otherwise>
56+
</Choose>
57+
58+
<Choose>
59+
<When Condition="$(Release) == 'false' And $(UMBRACO_PACKAGE_PRERELEASE_SUFFIX) == 'rtm'">
60+
<PropertyGroup>
61+
<AbortBuild>true</AbortBuild>
62+
</PropertyGroup>
63+
</When>
64+
<Otherwise>
65+
<PropertyGroup>
66+
<AbortBuild>false</AbortBuild>
67+
</PropertyGroup>
68+
</Otherwise>
69+
</Choose>
70+
71+
<!-- PATHS -->
72+
<PropertyGroup>
73+
<BuildConfig>Release</BuildConfig>
74+
<RootDir>$(MSBuildProjectDirectory)\..</RootDir>
75+
<BuildDir>$(MSBuildProjectDirectory)\_core</BuildDir>
76+
<BuildUmbDir>$(BuildDir)\_umbraco</BuildUmbDir>
77+
<BuildNuGetDir>$(BuildDir)\_nuget</BuildNuGetDir>
78+
<ArtifactsDir>$(RootDir)\artifacts</ArtifactsDir>
79+
<ProjectDir>$(RootDir)\src\UmbracoFileSystemProviders.Azure</ProjectDir>
8080
<InstallerProjectDir>$(RootDir)\src\UmbracoFileSystemProviders.Azure.Installer</InstallerProjectDir>
8181
<TestsProjectDir>$(RootDir)\src\UmbracoFileSystemProviders.Azure.Tests</TestsProjectDir>
82-
</PropertyGroup>
83-
84-
<!-- TARGETS -->
85-
<Target Name="GetProductVersion">
86-
<Error Condition="$(AbortBuild) == 'true'" Text="Aborting the build as the UMBRACO_PACKAGE_PRERELEASE_SUFFIX suffix is set 'rtm' but APPVEYOR_REPO_TAG is not 'true'" />
87-
<GetProductVersion BuildVersion="$(APPVEYOR_BUILD_VERSION)" BuildSuffix="$(UMBRACO_PACKAGE_PRERELEASE_SUFFIX)" Release="$(Release)">
88-
<Output TaskParameter="ProductVersion" PropertyName="ProductVersion"/>
89-
</GetProductVersion>
90-
</Target>
91-
92-
<!-- CLEAN -->
93-
<Target Name="Clean" DependsOnTargets="GetProductVersion">
94-
<RemoveDir Directories="$(BuildDir)" Condition="Exists('$(BuildDir)')" />
95-
<RemoveDir Directories="$(ArtifactsDir)" Condition="Exists('$(ArtifactsDir)')" />
96-
<MakeDir Directories="$(BuildDir)" />
97-
<MakeDir Directories="$(BuildUmbDir)" />
98-
<MakeDir Directories="$(BuildNuGetDir)" />
99-
<MakeDir Directories="$(ArtifactsDir)" />
100-
</Target>
82+
</PropertyGroup>
83+
84+
<!-- TARGETS -->
85+
<Target Name="GetProductVersion">
86+
<Error Condition="$(AbortBuild) == 'true'" Text="Aborting the build as the UMBRACO_PACKAGE_PRERELEASE_SUFFIX suffix is set 'rtm' but APPVEYOR_REPO_TAG is not 'true'" />
87+
<GetProductVersion BuildVersion="$(APPVEYOR_BUILD_VERSION)" BuildSuffix="$(UMBRACO_PACKAGE_PRERELEASE_SUFFIX)" Release="$(Release)">
88+
<Output TaskParameter="ProductVersion" PropertyName="ProductVersion"/>
89+
</GetProductVersion>
90+
</Target>
91+
92+
<!-- CLEAN -->
93+
<Target Name="Clean" DependsOnTargets="GetProductVersion">
94+
<RemoveDir Directories="$(BuildDir)" Condition="Exists('$(BuildDir)')" />
95+
<RemoveDir Directories="$(ArtifactsDir)" Condition="Exists('$(ArtifactsDir)')" />
96+
<MakeDir Directories="$(BuildDir)" />
97+
<MakeDir Directories="$(BuildUmbDir)" />
98+
<MakeDir Directories="$(BuildNuGetDir)" />
99+
<MakeDir Directories="$(ArtifactsDir)" />
100+
</Target>
101101

102102
<!-- UPDATE PROJECT ASSEMBLEY VERSION -->
103103
<Target Name="UpdateAssemblyInfo" DependsOnTargets="Clean">
@@ -110,16 +110,16 @@
110110
<FileUpdate Encoding="ASCII" Files="$(InstallerProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyInformationalVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyInformationalVersion(&quot;$(ProductVersion)&quot;)]" />
111111
</Target>
112112

113-
<!-- COMPILE -->
114-
<Target Name="Compile" DependsOnTargets="UpdateAssemblyInfo">
115-
<MSBuild Projects="$(ProjectDir)\UmbracoFileSystemProviders.Azure.csproj" Properties="Configuration=$(BuildConfig)" />
113+
<!-- COMPILE -->
114+
<Target Name="Compile" DependsOnTargets="UpdateAssemblyInfo">
115+
<MSBuild Projects="$(ProjectDir)\UmbracoFileSystemProviders.Azure.csproj" Properties="Configuration=$(BuildConfig)" />
116116
<MSBuild Projects="$(TestsProjectDir)\UmbracoFileSystemProviders.Azure.Tests.csproj" Properties="Configuration=$(BuildConfig)" />
117117
<MSBuild Projects="$(InstallerProjectDir)\UmbracoFileSystemProviders.Azure.Installer.csproj" Properties="Configuration=$(BuildConfig)" />
118-
</Target>
118+
</Target>
119119

120-
<!-- PREPARE FILES -->
121-
<Target Name="PrepareFiles" DependsOnTargets="Compile">
122-
<ItemGroup>
120+
<!-- PREPARE FILES -->
121+
<Target Name="PrepareFiles" DependsOnTargets="Compile">
122+
<ItemGroup>
123123
<!-- Shared -->
124124
<BinFiles Include="$(ProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.dll" />
125125
<PdbFiles Include="$(ProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.pdb" />
@@ -142,7 +142,7 @@
142142

143143
<!-- NuGet specific -->
144144
<SrcFiles Include="$(ProjectDir)\**\*.cs" Exclude="$(ProjectDir)\obj\**"/>
145-
<NuSpecFile Include="$(MSBuildProjectDirectory)\package.nuspec" />
145+
<NuSpecFile Include="$(MSBuildProjectDirectory)\package.nuspec" />
146146
</ItemGroup>
147147

148148
<!-- Umbraco -->
@@ -162,79 +162,80 @@
162162

163163
<!--NuGet -->
164164
<Copy SourceFiles="@(BinFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net45" />
165-
<Copy SourceFiles="@(PdbFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net45" />
165+
<Copy SourceFiles="@(PdbFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net45" />
166166
<Copy SourceFiles="@(WebConfigXDTFiles)" DestinationFolder="$(BuildNuGetDir)\Content" />
167167
<Copy SourceFiles="@(FileSystemProvidersConfigXDTInstallFile)" DestinationFolder="$(BuildNuGetDir)\Content\Config" />
168168
<Copy SourceFiles="@(SrcFiles)" DestinationFiles="@(SrcFiles->'$(BuildNuGetDir)\src\%(RecursiveDir)%(Filename)%(Extension)')" />
169169
<Copy SourceFiles="@(NuSpecFile)" DestinationFolder="$(BuildNuGetDir)" />
170170
</Target>
171171

172-
<!-- MANIFEST UMBRACO -->
173-
<Target Name="ManifestUmbraco" DependsOnTargets="PrepareFiles">
174-
<ItemGroup>
175-
<ManifestFiles Include="$(BuildUmbDir)\**\*" Exclude="$(BuildUmbDir)\package.xml" />
176-
</ItemGroup>
177-
<ManifestUpdate
178-
ManifestFile="$(BuildUmbDir)\package.xml"
179-
WorkingDirectory="$(BuildUmbDir)"
180-
MinimumRequiredUmbracoVersion="$(MinUmbracoVersion)"
181-
PackageName="$(PackageName)"
182-
PackageVersion="$(ProductVersion)"
183-
AuthorName="$(AuthorName)"
184-
AuthorUrl="$(AuthorUrl)"
185-
Readme="$(Readme)"
186-
PackageLicenseName="$(PackageLicenseName)"
187-
PackageLicenseUrl="$(PackageLicenseUrl)"
188-
PackageUrl="$(ProjectUrl)"
189-
Files="@(ManifestFiles)" />
190-
</Target>
191-
192-
<!-- MANIFEST FOR NUGET PACKAGE -->
193-
<Target Name="ManifestNuGet" DependsOnTargets="PrepareFiles">
194-
<ItemGroup>
195-
<ManifestFiles Include="$(BuildNuGetDir)\**\*" Exclude="$(BuildNuGetDir)\package.nuspec" />
196-
</ItemGroup>
197-
<MSBuild.NuGet.Tasks.ManifestUpdate
198-
ManifestFile="$(BuildNuGetDir)\package.nuspec"
199-
WorkingDirectory="$(BuildNuGetDir)"
200-
Title="$(PackageName)"
201-
Description="$(Description)"
202-
Summary="$(Readme)"
203-
Version="$(ProductVersion)"
204-
MinimumRequiredUmbracoVersion ="$(MinUmbracoVersion)"
205-
Authors="$(AuthorName)"
206-
Owners="$(Owners)"
207-
Copyright="$(Copyright)"
208-
LicenseUrl="$(PackageLicenseUrl)"
209-
ProjectUrl="$(ProjectUrl)"
210-
Id="$(PackageId)"
211-
IconUrl="$(IconUrl)"
212-
Language="$(Language)"
213-
RequireLicenseAcceptance="$(RequireLicenseAcceptance)"
214-
Tags="$(Tags)"
215-
Files="@(ManifestFiles)" />
216-
</Target>
217-
218-
<!-- PACKAGE -->
219-
<Target Name="Package" DependsOnTargets="ManifestUmbraco; ManifestNuGet">
220-
<ItemGroup>
221-
<PackageFiles Include="$(BuildUmbDir)\**\*.*" />
222-
</ItemGroup>
223-
224-
<Package ManifestFile="$(BuildUmbDir)\package.xml"
225-
WorkingDirectory="$(BuildUmbDir)"
226-
OutputDirectory="$(ArtifactsDir)"
227-
Files="@(PackageFiles)" />
228-
229-
<MSBuild.NuGet.Tasks.Pack NuGetExePath="$(RootDir)\build\tools\NuGet.exe"
230-
ManifestFile="$(BuildNuGetDir)\package.nuspec"
231-
BasePath="$(BuildNuGetDir)"
232-
Version="$(ProductVersion)"
233-
OutputDirectory="$(ArtifactsDir)"
234-
Symbols="true" />
235-
236-
<RemoveDir Directories="$(BuildDir)" Condition="Exists('$(BuildDir)')" />
237-
238-
</Target>
172+
<!-- MANIFEST UMBRACO -->
173+
<Target Name="ManifestUmbraco" DependsOnTargets="PrepareFiles">
174+
<ItemGroup>
175+
<ManifestFiles Include="$(BuildUmbDir)\**\*" Exclude="$(BuildUmbDir)\package.xml" />
176+
</ItemGroup>
177+
<ManifestUpdate
178+
ManifestFile="$(BuildUmbDir)\package.xml"
179+
WorkingDirectory="$(BuildUmbDir)"
180+
MinimumRequiredUmbracoVersion="$(MinUmbracoVersion)"
181+
PackageName="$(PackageName)"
182+
PackageVersion="$(ProductVersion)"
183+
AuthorName="$(AuthorName)"
184+
AuthorUrl="$(AuthorUrl)"
185+
IconUrl="$(IconUrl)"
186+
Readme="$(Readme)"
187+
PackageLicenseName="$(PackageLicenseName)"
188+
PackageLicenseUrl="$(PackageLicenseUrl)"
189+
PackageUrl="$(ProjectUrl)"
190+
Files="@(ManifestFiles)" />
191+
</Target>
192+
193+
<!-- MANIFEST FOR NUGET PACKAGE -->
194+
<Target Name="ManifestNuGet" DependsOnTargets="PrepareFiles">
195+
<ItemGroup>
196+
<ManifestFiles Include="$(BuildNuGetDir)\**\*" Exclude="$(BuildNuGetDir)\package.nuspec" />
197+
</ItemGroup>
198+
<MSBuild.NuGet.Tasks.ManifestUpdate
199+
ManifestFile="$(BuildNuGetDir)\package.nuspec"
200+
WorkingDirectory="$(BuildNuGetDir)"
201+
Title="$(PackageName)"
202+
Description="$(Description)"
203+
Summary="$(Readme)"
204+
Version="$(ProductVersion)"
205+
MinimumRequiredUmbracoVersion ="$(MinUmbracoVersion)"
206+
Authors="$(AuthorName)"
207+
Owners="$(Owners)"
208+
Copyright="$(Copyright)"
209+
LicenseUrl="$(PackageLicenseUrl)"
210+
ProjectUrl="$(ProjectUrl)"
211+
Id="$(PackageId)"
212+
IconUrl="$(IconUrl)"
213+
Language="$(Language)"
214+
RequireLicenseAcceptance="$(RequireLicenseAcceptance)"
215+
Tags="$(Tags)"
216+
Files="@(ManifestFiles)" />
217+
</Target>
218+
219+
<!-- PACKAGE -->
220+
<Target Name="Package" DependsOnTargets="ManifestUmbraco; ManifestNuGet">
221+
<ItemGroup>
222+
<PackageFiles Include="$(BuildUmbDir)\**\*.*" />
223+
</ItemGroup>
224+
225+
<Package ManifestFile="$(BuildUmbDir)\package.xml"
226+
WorkingDirectory="$(BuildUmbDir)"
227+
OutputDirectory="$(ArtifactsDir)"
228+
Files="@(PackageFiles)" />
229+
230+
<MSBuild.NuGet.Tasks.Pack NuGetExePath="$(RootDir)\build\tools\NuGet.exe"
231+
ManifestFile="$(BuildNuGetDir)\package.nuspec"
232+
BasePath="$(BuildNuGetDir)"
233+
Version="$(ProductVersion)"
234+
OutputDirectory="$(ArtifactsDir)"
235+
Symbols="true" />
236+
237+
<!--<RemoveDir Directories="$(BuildDir)" Condition="Exists('$(BuildDir)')" />-->
238+
239+
</Target>
239240

240241
</Project>

0 commit comments

Comments
 (0)