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

Commit 539b5a3

Browse files
committed
Enabled AppVeyor to push artifacts to GitHub release pages.
+ some whitespace tidyup
1 parent ddbc15a commit 539b5a3

File tree

4 files changed

+50
-49
lines changed

4 files changed

+50
-49
lines changed

appveyor.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ artifacts:
1414
- path: artifacts\*.zip
1515

1616
#deploy:
17-
# # MyGet Deployment for builds & releases
17+
# # MyGet Deployment for builds & releases
1818
# - provider: NuGet
1919
# server: https://www.myget.org/F/name/
2020
# symbol_server: https://nuget.symbolsource.org/MyGet/name
@@ -23,19 +23,19 @@ artifacts:
2323
# artifact: /.*\.nupkg/
2424
# on:
2525
# branch: develop
26-
#
27-
# # GitHub Deployment for releases
28-
# - provider: GitHub
29-
# auth_token:
30-
# secure:
31-
# artifact: /.*\.zip/ # upload all Zip packages to release assets
32-
# draft: false
33-
# prerelease: false
34-
# on:
35-
# branch: master
36-
# appveyor_repo_tag: true # deploy on tag push only
37-
#
38-
# # NuGet Deployment for releases
26+
27+
# GitHub Deployment for releases
28+
- provider: GitHub
29+
auth_token:
30+
secure: pEozEGTqJutQwOidJU6BTB+Ix0NV4vrUnomhfeqheVz4RNwfxjEYLoqR4XabhlPz
31+
artifact: /.*\.zip/ # upload all Zip packages to release assets
32+
draft: false
33+
prerelease: false
34+
on:
35+
branch: master
36+
appveyor_repo_tag: true # deploy on tag push only
37+
38+
# # NuGet Deployment for releases
3939
# - provider: NuGet
4040
# server:
4141
# api_key:

build/package.proj

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- SHARED PROPERTIES -->
1818
<PropertyGroup>
19-
<ProjectName>Our.Umbraco.DocTypeGridEditor</ProjectName>
19+
<ProjectName>Our.Umbraco.DocTypeGridEditor</ProjectName>
2020
<PackageName>Doc Type Grid Editor</PackageName>
2121
<MinUmbracoVersion>7.2.0</MinUmbracoVersion>
2222
<Readme>Doc Type Grid Editor is an advanced grid editor for the new Umbraco v7.2 Grid</Readme>
@@ -30,7 +30,7 @@
3030
<!-- NUGET ONLY PROPERTIES -->
3131
<PropertyGroup>
3232
<PackageId>Our.Umbraco.DocTypeGridEditor</PackageId>
33-
<NuGetPackageName>Umbraco Doc Type Grid Editor</NuGetPackageName>
33+
<NuGetPackageName>Umbraco Doc Type Grid Editor</NuGetPackageName>
3434
<Copyright>Copyright &#169; 2015 Matt Brailsford, Lee Kelleher</Copyright>
3535
<Owners>Matt Brailsford, Lee Kelleher</Owners>
3636
<IconUrl>https://our.umbraco.org/media/wiki/145708/635623742802070736_dtgepng.png</IconUrl>
@@ -46,28 +46,28 @@
4646
<Choose>
4747
<When Condition="$(APPVEYOR_BUILD_NUMBER) != '' And $(APPVEYOR_REPO_TAG) != 'true' ">
4848
<PropertyGroup>
49-
<Release>false</Release>
49+
<Release>false</Release>
5050
</PropertyGroup>
5151
</When>
5252
<Otherwise>
5353
<PropertyGroup>
54-
<Release>true</Release>
54+
<Release>true</Release>
5555
</PropertyGroup>
5656
</Otherwise>
5757
</Choose>
5858

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>
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>
7171

7272
<!-- PATHS -->
7373
<PropertyGroup>
@@ -81,8 +81,8 @@
8181

8282
<!-- TARGETS -->
8383
<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)">
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)">
8686
<Output TaskParameter="ProductVersion" PropertyName="ProductVersion"/>
8787
</GetProductVersion>
8888
</Target>
@@ -109,28 +109,28 @@
109109
AssemblyInformationalVersion="$(ProductVersion)"/>
110110
</Target>
111111

112-
<!-- COMPILE -->
113-
<Target Name="Compile" DependsOnTargets="UpdateAssemblyInfo">
114-
<MSBuild Projects="$(CoreProjectDir)\$(ProjectName).csproj" Properties="Configuration=$(BuildConfig)"/>
115-
</Target>
112+
<!-- COMPILE -->
113+
<Target Name="Compile" DependsOnTargets="UpdateAssemblyInfo">
114+
<MSBuild Projects="$(CoreProjectDir)\$(ProjectName).csproj" Properties="Configuration=$(BuildConfig)"/>
115+
</Target>
116116

117117
<!-- PREPARE FILES -->
118118
<Target Name="PrepareFiles" DependsOnTargets="Compile">
119119
<ItemGroup>
120120
<BinFiles Include="$(CoreProjectDir)\bin\$(BuildConfig)\$(ProjectName).dll" />
121121
<PdbFiles Include="$(CoreProjectDir)\bin\$(BuildConfig)\$(ProjectName).pdb" />
122122
<SrcFiles Include="$(CoreProjectDir)\**\*.cs" Exclude="$(CoreProjectDir)\obj\**"/>
123-
<PluginFiles Include="$(CoreProjectDir)\Web\UI\**\*.*" />
124-
<PackageFile Include="$(MSBuildProjectDirectory)\package.xml" />
123+
<PluginFiles Include="$(CoreProjectDir)\Web\UI\**\*.*" />
124+
<PackageFile Include="$(MSBuildProjectDirectory)\package.xml" />
125125
<NuSpecFile Include="$(MSBuildProjectDirectory)\package.nuspec" />
126126
</ItemGroup>
127127
<Copy SourceFiles="@(BinFiles)" DestinationFolder="$(BuildUmbDir)\bin" />
128128
<Copy SourceFiles="@(PackageFile)" DestinationFolder="$(BuildUmbDir)" />
129129
<Copy SourceFiles="@(BinFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net45" />
130130
<Copy SourceFiles="@(PdbFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net45" />
131-
<Copy SourceFiles="@(PluginFiles)" DestinationFiles="@(PluginFiles->'$(BuildUmbDir)\%(RecursiveDir)%(Filename)%(Extension)')" />
132-
<Copy SourceFiles="@(PluginFiles)" DestinationFiles="@(PluginFiles->'$(BuildNuGetDir)\Content\%(RecursiveDir)%(Filename)%(Extension)')" />
133-
<Copy SourceFiles="@(SrcFiles)" DestinationFiles="@(SrcFiles->'$(BuildNuGetDir)\src\%(RecursiveDir)%(Filename)%(Extension)')" />
131+
<Copy SourceFiles="@(PluginFiles)" DestinationFiles="@(PluginFiles->'$(BuildUmbDir)\%(RecursiveDir)%(Filename)%(Extension)')" />
132+
<Copy SourceFiles="@(PluginFiles)" DestinationFiles="@(PluginFiles->'$(BuildNuGetDir)\Content\%(RecursiveDir)%(Filename)%(Extension)')" />
133+
<Copy SourceFiles="@(SrcFiles)" DestinationFiles="@(SrcFiles->'$(BuildNuGetDir)\src\%(RecursiveDir)%(Filename)%(Extension)')" />
134134
<Copy SourceFiles="@(NuSpecFile)" DestinationFolder="$(BuildNuGetDir)" />
135135
</Target>
136136

build/package.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@
2727
<Languages />
2828
<DataTypes />
2929

30-
<Actions>
31-
<Action runat="install" undo="true" alias="AddObjectToJsonArray"
32-
keyProperty="alias"
33-
sourceFile="~/App_Plugins/DocTypeGridEditor/Config/grid.editors.config.js"
34-
targetFile="~/Config/grid.editors.config.js" />
35-
</Actions>
30+
<Actions>
31+
<Action runat="install" undo="true" alias="AddObjectToJsonArray"
32+
keyProperty="alias"
33+
sourceFile="~/App_Plugins/DocTypeGridEditor/Config/grid.editors.config.js"
34+
targetFile="~/Config/grid.editors.config.js" />
35+
</Actions>
36+
3637
<control />
3738

3839
<files />

src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/package.manifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
'~/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.services.js',
55
'~/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.controllers.js'
66
],
7-
"css": [
7+
"css": [
88
'~/App_Plugins/DocTypeGridEditor/Css/doctypegrideditor.css'
9-
]
9+
]
1010
}

0 commit comments

Comments
 (0)