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

Commit b6b5d57

Browse files
committed
Merge pull request #10 from Jeavon/feature/appveyor-support
Adding AppVeyor Support
2 parents c4b8549 + 20d2551 commit b6b5d57

24 files changed

+387
-122
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ bin/
3838
*/Thumbs.db
3939
*/log.txt
4040
/Assets/
41-
/Build/
4241
*.DS_Store
4342
[Pp]ackages/*/**
43+
artifacts/

Build/package.nuspec

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3+
<metadata>
4+
<id></id>
5+
<version>0.0.0</version>
6+
<title></title>
7+
<authors></authors>
8+
<owners></owners>
9+
<projectUrl></projectUrl>
10+
<iconUrl></iconUrl>
11+
<requireLicenseAcceptance></requireLicenseAcceptance>
12+
<description></description>
13+
<summary></summary>
14+
<copyright></copyright>
15+
<licenseUrl></licenseUrl>
16+
<language></language>
17+
<tags></tags>
18+
<dependencies>
19+
<dependency id="UmbracoCms.Core" version="0.0.0" />
20+
</dependencies>
21+
</metadata>
22+
</package>

Build/package.proj

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Package" ToolsVersion="4.0">
3+
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+
<ProjectName>Our.Umbraco.DocTypeGridEditor</ProjectName>
20+
<PackageName>Doc Type Grid Editor</PackageName>
21+
<MinUmbracoVersion>7.2.0</MinUmbracoVersion>
22+
<Readme>Doc Type Grid Editor is an advanced grid editor for the new Umbraco v7.2 Grid</Readme>
23+
<AuthorName>Matt Brailsford, Lee Kelleher</AuthorName>
24+
<AuthorUrl>https://github.com/leekelleher/umbraco-doc-type-grid-editor/graphs/contributors</AuthorUrl>
25+
<PackageLicenseName>MIT license</PackageLicenseName>
26+
<PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
27+
<ProjectUrl>https://github.com/leekelleher/umbraco-doc-type-grid-editor</ProjectUrl>
28+
</PropertyGroup>
29+
30+
<!-- NUGET ONLY PROPERTIES -->
31+
<PropertyGroup>
32+
<PackageId>Our.Umbraco.DocTypeGridEditor</PackageId>
33+
<NuGetPackageName>Umbraco Doc Type Grid Editor</NuGetPackageName>
34+
<Copyright>Copyright &#169; 2015 Matt Brailsford, Lee Kelleher</Copyright>
35+
<Owners>Matt Brailsford, Lee Kelleher</Owners>
36+
<IconUrl>https://our.umbraco.org/media/wiki/145708/635623742802070736_dtgepng.png</IconUrl>
37+
<Tags>umbraco grid document type editor</Tags>
38+
<Language>en-GB</Language>
39+
<RequireLicenseAcceptance>false</RequireLicenseAcceptance>
40+
</PropertyGroup>
41+
42+
<!-- APPVEYOR PROPERTIES -->
43+
<PropertyGroup>
44+
<FileVersion>$(APPVEYOR_BUILD_VERSION)</FileVersion>
45+
</PropertyGroup>
46+
<Choose>
47+
<When Condition="$(APPVEYOR_BUILD_NUMBER) != '' And $(APPVEYOR_REPO_TAG) != 'true' ">
48+
<PropertyGroup>
49+
<Release>false</Release>
50+
</PropertyGroup>
51+
</When>
52+
<Otherwise>
53+
<PropertyGroup>
54+
<Release>true</Release>
55+
</PropertyGroup>
56+
</Otherwise>
57+
</Choose>
58+
59+
<Choose>
60+
<When Condition="$(Release) == 'false' And $(UMBRACO_PACKAGE_PRERELEASE_SUFFIX) == 'rtm'">
61+
<PropertyGroup>
62+
<AbortBuild>true</AbortBuild>
63+
</PropertyGroup>
64+
</When>
65+
<Otherwise>
66+
<PropertyGroup>
67+
<AbortBuild>false</AbortBuild>
68+
</PropertyGroup>
69+
</Otherwise>
70+
</Choose>
71+
72+
<!-- PATHS -->
73+
<PropertyGroup>
74+
<BuildConfig>Release</BuildConfig>
75+
<RootDir>$(MSBuildProjectDirectory)\..</RootDir>
76+
<BuildUmbDir>$(MSBuildProjectDirectory)\_umbraco</BuildUmbDir>
77+
<BuildNuGetDir>$(MSBuildProjectDirectory)\_nuget</BuildNuGetDir>
78+
<ArtifactsDir>$(RootDir)\artifacts</ArtifactsDir>
79+
<CoreProjectDir>$(RootDir)\Src\$(ProjectName)</CoreProjectDir>
80+
</PropertyGroup>
81+
82+
<!-- TARGETS -->
83+
<Target Name="GetProductVersion">
84+
<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'" />
85+
<GetProductVersion BuildVersion="$(APPVEYOR_BUILD_VERSION)" BuildSuffix="$(UMBRACO_PACKAGE_PRERELEASE_SUFFIX)" Release="$(Release)">
86+
<Output TaskParameter="ProductVersion" PropertyName="ProductVersion"/>
87+
</GetProductVersion>
88+
</Target>
89+
90+
<!-- CLEAN -->
91+
<Target Name="Clean" DependsOnTargets="GetProductVersion">
92+
<RemoveDir Directories="$(BuildUmbDir)" Condition="Exists('$(BuildUmbDir)')" />
93+
<RemoveDir Directories="$(BuildNuGetDir)" Condition="Exists('$(BuildNuGetDir)')" />
94+
<RemoveDir Directories="$(ArtifactsDir)" Condition="Exists('$(ArtifactsDir)')" />
95+
<MakeDir Directories="$(BuildUmbDir)" />
96+
<MakeDir Directories="$(BuildNuGetDir)" />
97+
<MakeDir Directories="$(ArtifactsDir)" />
98+
</Target>
99+
100+
<!-- UPDATE PROJECT ASSEMBLEY VERSION -->
101+
<Target Name="UpdateAssemblyInfo" DependsOnTargets="Clean">
102+
<FileUpdate Encoding="ASCII" Files="$(CoreProjectDir)\Properties\AssemblyInfo.cs" Regex="AssemblyVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyVersion(&quot;$(FileVersion)&quot;)]" />
103+
<FileUpdate Encoding="ASCII" Files="$(CoreProjectDir)\Properties\AssemblyInfo.cs" Regex="AssemblyFileVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyFileVersion(&quot;$(FileVersion)&quot;)]" />
104+
<FileUpdate Encoding="ASCII" Files="$(CoreProjectDir)\Properties\AssemblyInfo.cs" Regex="AssemblyInformationalVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyInformationalVersion(&quot;$(ProductVersion)&quot;)]" />
105+
</Target>
106+
107+
<!-- COMPILE -->
108+
<Target Name="Compile" DependsOnTargets="UpdateAssemblyInfo">
109+
<MSBuild Projects="$(CoreProjectDir)\$(ProjectName).csproj" Properties="Configuration=$(BuildConfig)"/>
110+
</Target>
111+
112+
<!-- PREPARE FILES -->
113+
<Target Name="PrepareFiles" DependsOnTargets="Compile">
114+
<ItemGroup>
115+
<BinFiles Include="$(CoreProjectDir)\bin\$(BuildConfig)\$(ProjectName).dll" />
116+
<PdbFiles Include="$(CoreProjectDir)\bin\$(BuildConfig)\$(ProjectName).pdb" />
117+
<SrcFiles Include="$(CoreProjectDir)\**\*.cs" Exclude="$(CoreProjectDir)\obj\**"/>
118+
<PluginFiles Include="$(CoreProjectDir)\Web\UI\**\*.*" />
119+
<PackageFile Include="$(MSBuildProjectDirectory)\package.xml" />
120+
<NuSpecFile Include="$(MSBuildProjectDirectory)\package.nuspec" />
121+
</ItemGroup>
122+
<Copy SourceFiles="@(BinFiles)" DestinationFolder="$(BuildUmbDir)\bin" />
123+
<Copy SourceFiles="@(PackageFile)" DestinationFolder="$(BuildUmbDir)" />
124+
<Copy SourceFiles="@(BinFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net45" />
125+
<Copy SourceFiles="@(PdbFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net45" />
126+
<Copy SourceFiles="@(PluginFiles)" DestinationFiles="@(PluginFiles->'$(BuildUmbDir)\%(RecursiveDir)%(Filename)%(Extension)')" />
127+
<Copy SourceFiles="@(PluginFiles)" DestinationFiles="@(PluginFiles->'$(BuildNuGetDir)\Content\%(RecursiveDir)%(Filename)%(Extension)')" />
128+
<Copy SourceFiles="@(SrcFiles)" DestinationFiles="@(SrcFiles->'$(BuildNuGetDir)\src\%(RecursiveDir)%(Filename)%(Extension)')" />
129+
<Copy SourceFiles="@(NuSpecFile)" DestinationFolder="$(BuildNuGetDir)" />
130+
</Target>
131+
132+
<!-- MANIFEST UMBRACO -->
133+
<Target Name="ManifestUmbraco" DependsOnTargets="PrepareFiles">
134+
<ItemGroup>
135+
<ManifestFiles Include="$(BuildUmbDir)\**\*" Exclude="$(BuildUmbDir)\package.xml" />
136+
</ItemGroup>
137+
<ManifestUpdate
138+
ManifestFile="$(BuildUmbDir)\package.xml"
139+
WorkingDirectory="$(BuildUmbDir)"
140+
MinimumRequiredUmbracoVersion="$(MinUmbracoVersion)"
141+
PackageName="$(PackageName)"
142+
PackageVersion="$(ProductVersion)"
143+
AuthorName="$(AuthorName)"
144+
AuthorUrl="$(AuthorUrl)"
145+
Readme="$(Readme)"
146+
PackageLicenseName="$(PackageLicenseName)"
147+
PackageLicenseUrl="$(PackageLicenseUrl)"
148+
PackageUrl="$(ProjectUrl)"
149+
Files="@(ManifestFiles)" />
150+
</Target>
151+
152+
<!-- MANIFEST FOR NUGET PACKAGE -->
153+
<Target Name="ManifestNuGet" DependsOnTargets="PrepareFiles">
154+
<ItemGroup>
155+
<ManifestFiles Include="$(BuildNuGetDir)\**\*" Exclude="$(BuildNuGetDir)\package.nuspec" />
156+
</ItemGroup>
157+
<MSBuild.NuGet.Tasks.ManifestUpdate
158+
ManifestFile="$(BuildNuGetDir)\package.nuspec"
159+
WorkingDirectory="$(BuildNuGetDir)"
160+
Title="$(NuGetPackageName)"
161+
Description="$(Readme)"
162+
Summary="$(Readme)"
163+
Version="$(ProductVersion)"
164+
MinimumRequiredUmbracoVersion ="$(MinUmbracoVersion)"
165+
Authors="$(AuthorName)"
166+
Owners="$(Owners)"
167+
Copyright="$(Copyright)"
168+
LicenseUrl="$(PackageLicenseUrl)"
169+
ProjectUrl="$(ProjectUrl)"
170+
Id="$(PackageId)"
171+
IconUrl="$(IconUrl)"
172+
Language="$(Language)"
173+
RequireLicenseAcceptance="$(RequireLicenseAcceptance)"
174+
Tags="$(Tags)"
175+
Files="@(ManifestFiles)" />
176+
</Target>
177+
178+
<!-- PACKAGE -->
179+
<Target Name="Package" DependsOnTargets="ManifestUmbraco; ManifestNuGet">
180+
<ItemGroup>
181+
<PackageFiles Include="$(BuildUmbDir)\**\*.*" />
182+
</ItemGroup>
183+
184+
<Package ManifestFile="$(BuildUmbDir)\Package.xml"
185+
WorkingDirectory="$(BuildUmbDir)"
186+
OutputDirectory="$(ArtifactsDir)"
187+
Files="@(PackageFiles)" />
188+
189+
<!--<MSBuild.NuGet.Tasks.Pack NuGetExePath="$(RootDir)\.nuget\NuGet.exe"
190+
ManifestFile="$(BuildNuGetDir)\package.nuspec"
191+
BasePath="$(BuildNuGetDir)"
192+
Version="$(ProductVersion)"
193+
OutputDirectory="$(ArtifactsDir)"
194+
Symbols="true" />-->
195+
196+
<RemoveDir Directories="$(BuildUmbDir)" Condition="Exists('$(BuildUmbDir)')" />
197+
<RemoveDir Directories="$(BuildNuGetDir)" Condition="Exists('$(BuildNuGetDir)')" />
198+
199+
</Target>
200+
201+
</Project>

Package.xml renamed to Build/package.xml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
<umbPackage>
33
<info>
44
<package>
5-
<name>Doc Type Grid Editor</name>
6-
<version>0.0</version>
7-
<license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license>
8-
<url>http://our.umbraco.org/projects/backoffice-extensions/doc-type-grid-editor</url>
5+
<name></name>
6+
<version>0.0.0</version>
7+
<license url=""></license>
8+
<url></url>
99
<requirements>
10-
<major>7</major>
11-
<minor>2</minor>
10+
<major>0</major>
11+
<minor>0</minor>
1212
<patch>0</patch>
1313
</requirements>
1414
</package>
1515
<author>
16-
<name>Matt Brailsford, Lee Kelleher</name>
17-
<website>http://our.umbraco.org</website>
16+
<name></name>
17+
<website></website>
1818
</author>
1919
<readme><![CDATA[]]></readme>
2020
</info>
@@ -26,14 +26,15 @@
2626
<DictionaryItems />
2727
<Languages />
2828
<DataTypes />
29+
2930
<Actions>
30-
<Action runat="install" undo="true" alias="AddObjectToJsonArray"
31+
<Action runat="install" undo="true" alias="AddObjectToJsonArray"
3132
keyProperty="alias"
3233
sourceFile="~/App_Plugins/DocTypeGridEditor/Config/grid.editors.config.js"
3334
targetFile="~/Config/grid.editors.config.js" />
34-
</Actions>
35-
35+
</Actions>
3636
<control />
37+
3738
<files />
3839

39-
</umbPackage>
40+
</umbPackage>
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<UsingTask
3+
TaskName="GetProductVersion"
4+
TaskFactory="CodeTaskFactory"
5+
AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" >
6+
<ParameterGroup>
7+
<BuildVersion ParameterType="System.String" Required="true" />
8+
<BuildSuffix ParameterType="System.String" Required="false" />
9+
<ProductVersion ParameterType="System.String" Output="true" />
10+
<Release ParameterType="System.String" Required="true" />
11+
</ParameterGroup>
12+
<Task>
13+
<Using Namespace="System"/>
14+
<Using Namespace="System.IO"/>
15+
<Code Type="Fragment" Language="cs">
16+
<![CDATA[
17+
var pos = BuildVersion.LastIndexOf('.');
18+
var len = BuildVersion.Length - pos - 1;
19+
20+
var buildNumberWithZeros = BuildVersion.Substring(pos + 1, len).PadLeft(6, '0');
21+
22+
var baseVersion = BuildVersion.Substring(0, pos);
23+
24+
if ((string.IsNullOrEmpty(BuildSuffix) || BuildSuffix == "rtm") && Release == "true")
25+
{
26+
ProductVersion = baseVersion;
27+
}
28+
else if (string.IsNullOrEmpty(BuildSuffix) && Release == "false")
29+
{
30+
ProductVersion = baseVersion + "-alpha-" + buildNumberWithZeros;
31+
}
32+
else if (!string.IsNullOrEmpty(BuildSuffix) && Release == "true")
33+
{
34+
ProductVersion = baseVersion + "-" + BuildSuffix;
35+
}
36+
else if (!string.IsNullOrEmpty(BuildSuffix) && BuildSuffix != "rtm" && Release == "false")
37+
{
38+
ProductVersion = baseVersion + "-" + BuildSuffix + "-" + buildNumberWithZeros;
39+
}
40+
else
41+
{
42+
ProductVersion = "";
43+
}
44+
//Log.LogError(OutputVer);
45+
]]>
46+
</Code>
47+
</Task>
48+
</UsingTask>
49+
</Project>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<MSBuildNuGetTasksPath Condition="'$(MSBuildNuGetTasksPath)' == ''">$(MSBuildProjectDirectory)\MSBuildTasks</MSBuildNuGetTasksPath>
6+
<MSBuildNuGetTasksLib>$(MSBuildNuGetTasksPath)\MSBuild.NuGet.Tasks.dll</MSBuildNuGetTasksLib>
7+
</PropertyGroup>
8+
9+
<UsingTask AssemblyFile="$(MSBuildNuGetTasksLib)" TaskName="MSBuild.NuGet.Tasks.ManifestUpdate" />
10+
<UsingTask AssemblyFile="$(MSBuildNuGetTasksLib)" TaskName="MSBuild.NuGet.Tasks.Pack" />
11+
12+
</Project>
Binary file not shown.

Tools/MSBuildUmbracoTasks/MSBuild.Umbraco.Tasks.Targets renamed to Build/tools/MSBuildUmbracoTasks/MSBuild.Umbraco.Tasks.Targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44
<PropertyGroup>
5-
<MSBuildUmbracoTasksPath Condition="'$(MSBuildUmbracoTasksPath)' == ''">$(MSBuildProjectDirectory)\MSBuildUmbracoTasks</MSBuildUmbracoTasksPath>
5+
<MSBuildUmbracoTasksPath Condition="'$(MSBuildUmbracoTasksPath)' == ''">$(MSBuildProjectDirectory)\MSBuildTasks</MSBuildUmbracoTasksPath>
66
<MSBuildUmbracoTasksLib>$(MSBuildUmbracoTasksPath)\MSBuild.Umbraco.Tasks.dll</MSBuildUmbracoTasksLib>
77
</PropertyGroup>
88

Binary file not shown.

Our.Umbraco.DocTypeGridEditor.sln

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CEE996
1212
.nuget\NuGet.targets = .nuget\NuGet.targets
1313
EndProjectSection
1414
EndProject
15-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{D588B45D-9E67-4136-8271-2B8724C8165F}"
15+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{D588B45D-9E67-4136-8271-2B8724C8165F}"
1616
ProjectSection(SolutionItems) = preProject
17-
Package.build.cmd = Package.build.cmd
18-
Package.build.xml = Package.build.xml
19-
Package.xml = Package.xml
2017
README.markdown = README.markdown
2118
EndProjectSection
2219
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Package", "Build Package", "{42CE1449-272B-453B-B162-4558FD38BF41}"
21+
ProjectSection(SolutionItems) = preProject
22+
appveyor.yml = appveyor.yml
23+
build-appveyor.cmd = build-appveyor.cmd
24+
build.cmd = build.cmd
25+
Build\package.nuspec = Build\package.nuspec
26+
Build\package.proj = Build\package.proj
27+
Build\package.xml = Build\package.xml
28+
EndProjectSection
29+
EndProject
2330
Global
2431
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2532
Debug|Any CPU = Debug|Any CPU

Package.build.cmd

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)