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

uComponents 6.1.1 release #38

Merged
leekelleher merged 6 commits into from
Feb 26, 2016
Merged

uComponents 6.1.1 release #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e845fdb
Fixes typo, raised in #37
leekelleher Nov 21, 2015
79c8504
Fixed the assembly version number issue - Closes #36
leekelleher Nov 21, 2015
e4fbc7b
Disabling AppVeyor running unit-tests (until I figure out what the co…
leekelleher Nov 21, 2015
1cf41b8
Commented out the unit-tests for AppVeyor.
leekelleher Nov 21, 2015
7e027e6
StripLineBreaksTest unit-test is breaking on AppVeyor.
leekelleher Nov 21, 2015
bba5760
Added badges to README.
leekelleher Nov 21, 2015
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
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License

Copyright © 2010-14 The Umbraco Community
Copyright © 2010-2015 The Umbraco Community

This software consists of voluntary contributions made by [many
individuals](https://github.com/uComponents/uComponents/graphs/contributors) For exact
Expand Down
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# uComponents

[![Build status](https://img.shields.io/appveyor/ci/leekelleher/ucomponents.svg)](https://ci.appveyor.com/project/leekelleher/ucomponents)
[![NuGet release](https://img.shields.io/nuget/v/uComponents.svg)](https://www.nuget.org/packages/uComponents)
[![Our Umbraco project page](https://img.shields.io/badge/our-umbraco-orange.svg)](https://our.umbraco.org/projects/backoffice-extensions/ucomponents)


[uComponents](http://our.umbraco.org/projects/backoffice-extensions/ucomponents) is an open and collaborative project for creating components for Umbraco (from v4.5 to v6.x) including data types, XSLT extensions, controls and more.

Containing over 30 data-types, 10 XSLT extension libraries, keyboard short-cuts, drag-n-drop functionality, as well as some great developer utilities - uComponents is one of the must-have packages for any (v4.5 to v6.x) Umbraco-powered website!
Expand Down
50 changes: 50 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# version format
version: 6.1.1.{build}

# UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
# example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
init:
- set UMBRACO_PACKAGE_PRERELEASE_SUFFIX=

build_script:
- build-appveyor.cmd

test:
assemblies:
- 'uComponents.Core.UnitTests.dll'

artifacts:
- path: artifacts\*.nupkg
- path: artifacts\*.zip

deploy:
# MyGet Deployment for builds & releases
- provider: NuGet
server: https://www.myget.org/F/ucomponents/
symbol_server: https://nuget.symbolsource.org/MyGet/ucomponents
api_key:
secure: Q1/4K8VSwr7BjwmKDTef8y5lOc7S+jK9ELuWy67y6OVRpjxmnF9M3Gfs1kT+ir8x
artifact: /.*\.nupkg/
on:
branch: develop

# GitHub Deployment for releases
- provider: GitHub
auth_token:
secure: pEozEGTqJutQwOidJU6BTB+Ix0NV4vrUnomhfeqheVz4RNwfxjEYLoqR4XabhlPz
artifact: /.*\.zip/ # upload all Zip packages to release assets
draft: false
prerelease: false
on:
branch: master
appveyor_repo_tag: true # deploy on tag push only

# NuGet Deployment for releases
- provider: NuGet
server:
api_key:
secure: CGzDKxw4QI/z2VSe9ceiYlIabqGXHolgBgVNWWZjVAJ2V5WLF11IFdlp9r5Qp+Sw
artifact: /.*\.nupkg/
on:
branch: master
appveyor_repo_tag: true
7 changes: 7 additions & 0 deletions build-appveyor.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ECHO APPVEYOR_REPO_BRANCH: %APPVEYOR_REPO_BRANCH%
ECHO APPVEYOR_REPO_TAG: %APPVEYOR_REPO_TAG%
ECHO APPVEYOR_BUILD_NUMBER : %APPVEYOR_BUILD_NUMBER%
ECHO APPVEYOR_BUILD_VERSION : %APPVEYOR_BUILD_VERSION%

CALL src\.nuget\NuGet.exe restore src\uComponents.sln
CALL "%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe" package\package.proj
20 changes: 18 additions & 2 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
:: Build the package zip
C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild.exe /m /t:Package /p:"Configuration=Release";"MinUmbracoVersion=6.1.0";"PackageVersion=6.1.0-build";"BuildInParallel=true" package\package.proj
ECHO off

SET /P APPVEYOR_BUILD_NUMBER=Please enter a build number (e.g. 134):
SET /P PACKAGE_VERISON=Please enter your package version (e.g. 1.0.5):
SET /P UMBRACO_PACKAGE_PRERELEASE_SUFFIX=Please enter your package release suffix or leave empty (e.g. beta):

SET /P APPVEYOR_REPO_TAG=If you want to simulate a GitHub tag for a release (e.g. true):

if "%APPVEYOR_BUILD_NUMBER%" == "" (
SET APPVEYOR_BUILD_NUMBER=100
)
if "%PACKAGE_VERISON%" == "" (
SET PACKAGE_VERISON=0.1.0
)

SET APPVEYOR_BUILD_VERSION=%PACKAGE_VERISON%.%APPVEYOR_BUILD_NUMBER%

build-appveyor.cmd

@IF %ERRORLEVEL% NEQ 0 GOTO err
@EXIT /B 0
Expand Down
6 changes: 3 additions & 3 deletions package/package.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
<title>uComponents</title>
<authors>Lee Kelleher,Hendy Racher,Ove Andersen,James Diacono,Shannon Deminick</authors>
<owners>The Umbraco Community</owners>
<licenseUrl>https://github.com/uComponents/uComponents/blob/master/LICENSE.md</licenseUrl>
<licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
<projectUrl>http://ucomponents.org</projectUrl>
<iconUrl>http://ucomponents.org/apple-touch-icon-114x114-precomposed.png</iconUrl>
<iconUrl>https://raw.githubusercontent.com/uComponents/ucomponents.github.com/master/apple-touch-icon-114x114-precomposed.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<summary>uComponents is a collaborative project for creating components for Umbraco including data types, XSLT extensions, controls and more.</summary>
<description>
<![CDATA[uComponents is a collaborative project for creating components for Umbraco including data types, XSLT extensions, controls and more.

Containing over 30 data types, 10 XSLT extension libraries, keyboard short-cuts, drag-n-drop functionality, as well as great developer utilities - uComponents is one of the must-have packages for any Umbraco-powered website!]]>
</description>
<copyright>Copyright &#169; 2013 The Umbraco Community</copyright>
<copyright>Copyright &#169; 2010-2015 The Umbraco Community</copyright>
<tags>umbraco</tags>
<dependencies>
<dependency id="UmbracoCms.Core" version="6.1.0" />
Expand Down
96 changes: 81 additions & 15 deletions package/package.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Package" ToolsVersion="4.0">

<!-- IMPORTS -->
<PropertyGroup>
<RootDir>$(MSBuildProjectDirectory)\..</RootDir>
Expand All @@ -9,26 +9,90 @@
<MSBuildUmbracoTasksPath>$(MSBuildCustomTasksPath)</MSBuildUmbracoTasksPath>
<MSBuildNuGetTasksPath>$(MSBuildCustomTasksPath)</MSBuildNuGetTasksPath>
</PropertyGroup>

<Import Project="$(MSBuildCustomTasksPath)\MSBuild.Community.Tasks.Targets" />
<Import Project="$(MSBuildCustomTasksPath)\MSBuild.Umbraco.Tasks.Targets" />
<Import Project="$(MSBuildCustomTasksPath)\MSBuild.NuGet.Tasks.Targets" />
<Import Project="$(MSBuildCustomTasksPath)\AppVeyorUmbraco.Targets" />

<!-- PROPERTIES -->
<PropertyGroup>
<BuildConfig>Release</BuildConfig>
<MinUmbracoVersion>6.2.5</MinUmbracoVersion>

<SrcDir>$(RootDir)\src</SrcDir>
<BuildDir>$(MSBuildProjectDirectory)\_build</BuildDir>
<BuildUmbDir>$(BuildDir)\_umbraco</BuildUmbDir>
<BuildNuGetDir>$(BuildDir)\_nuget</BuildNuGetDir>
<ArtifactsDir>$(RootDir)\artifacts</ArtifactsDir>
</PropertyGroup>

<!-- APPVEYOR PROPERTIES -->
<PropertyGroup>
<FileVersion>$(APPVEYOR_BUILD_VERSION)</FileVersion>
</PropertyGroup>
<Choose>
<When Condition="$(APPVEYOR_BUILD_NUMBER) != '' And $(APPVEYOR_REPO_TAG) != 'true' ">
<PropertyGroup>
<Release>false</Release>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<Release>true</Release>
</PropertyGroup>
</Otherwise>
</Choose>

<Choose>
<When Condition="$(Release) == 'false' And $(UMBRACO_PACKAGE_PRERELEASE_SUFFIX) == 'rtm'">
<PropertyGroup>
<AbortBuild>true</AbortBuild>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<AbortBuild>false</AbortBuild>
</PropertyGroup>
</Otherwise>
</Choose>

<!-- TARGETS -->
<Target Name="Build">
<MSBuild Projects="$(SrcDir)\uComponents.sln" Properties="Configuration = $(Configuration)" Targets="Rebuild"/>
<Target Name="GetProductVersion">
<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'" />
<GetProductVersion BuildVersion="$(APPVEYOR_BUILD_VERSION)" BuildSuffix="$(UMBRACO_PACKAGE_PRERELEASE_SUFFIX)" Release="$(Release)">
<Output TaskParameter="ProductVersion" PropertyName="ProductVersion"/>
</GetProductVersion>
</Target>

<!-- CLEAN -->
<Target Name="Clean" DependsOnTargets="GetProductVersion">
<RemoveDir Directories="$(BuildDir)" Condition="Exists('$(BuildDir)')" />
<RemoveDir Directories="$(ArtifactsDir)" Condition="Exists('$(ArtifactsDir)')" />
<MakeDir Directories="$(BuildDir)" />
<MakeDir Directories="$(BuildUmbDir)" />
<MakeDir Directories="$(BuildNuGetDir)" />
<MakeDir Directories="$(ArtifactsDir)" />
</Target>

<!-- UPDATE PROJECT ASSEMBLEY VERSION -->
<Target Name="UpdateAssemblyInfo" DependsOnTargets="Clean">
<ItemGroup>
<VersionMajor Include="$(ProductVersion.Split('.')[0])" />
<VersionMinor Include="$(ProductVersion.Split('.')[1])" />
</ItemGroup>
<AssemblyInfo CodeLanguage="CS"
OutputFile="$(SrcDir)\uComponents.Core\Properties\VersionInfo.cs"
AssemblyVersion="@(VersionMajor).@(VersionMinor).*"
AssemblyInformationalVersion="$(ProductVersion)"/>
</Target>

<Target Name="Compile" DependsOnTargets="UpdateAssemblyInfo">
<MSBuild Projects="$(SrcDir)\uComponents.sln" Properties="Configuration = $(BuildConfig)" />
</Target>

<!-- PREPARE FILES -->
<Target Name="PrepareFiles" DependsOnTargets="Build">
<Target Name="PrepareFiles" DependsOnTargets="Compile">
<ItemGroup>
<BinFiles Include="$(SrcDir)\uComponents.Core\bin\Release\uComponents.Core.dll" />
<BinFiles Include="$(SrcDir)\uComponents.Controls\bin\Release\uComponents.Controls.dll" />
Expand Down Expand Up @@ -74,12 +138,12 @@
<MSBuild.Umbraco.Tasks.TimestampOffset Files="@(BinFiles)" Offset="-11" />
<!-- COPY FOR UMBRACO PACKAGE -->
<Copy SourceFiles="@(BinFiles)" DestinationFolder="$(BuildUmbDir)\bin" />
<Copy SourceFiles="@(DebugFiles)" DestinationFolder="$(BuildUmbDir)\bin" Condition="$(PackageVersion.EndsWith('-build'))" />
<Copy SourceFiles="@(DebugFiles)" DestinationFolder="$(BuildUmbDir)\bin" Condition="$(ProductVersion.Contains('-build'))" />
<Copy SourceFiles="@(PluginFiles)" DestinationFolder="$(BuildUmbDir)\umbraco\plugins\uComponents" />
<Copy SourceFiles="@(PackageFile)" DestinationFolder="$(BuildUmbDir)" />
<!-- COPY FOR NUGET PACKAGE -->
<Copy SourceFiles="@(BinFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net40" />
<Copy SourceFiles="@(DebugFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net40" Condition="$(PackageVersion.EndsWith('-build'))" />
<Copy SourceFiles="@(DebugFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net40" Condition="$(ProductVersion.Contains('-build'))" />
<Copy SourceFiles="@(XmlFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net40" />
<Copy SourceFiles="@(PluginFiles)" DestinationFolder="$(BuildNuGetDir)\content\umbraco\plugins\uComponents" />
<Copy SourceFiles="@(NuSpecFile)" DestinationFolder="$(BuildNuGetDir)" />
Expand All @@ -93,7 +157,7 @@
<MSBuild.Umbraco.Tasks.ManifestUpdate ManifestFile="$(BuildUmbDir)\package.xml"
WorkingDirectory="$(BuildUmbDir)"
MinimumRequiredUmbracoVersion="$(MinUmbracoVersion)"
PackageVersion="$(PackageVersion)"
PackageVersion="$(ProductVersion)"
Readme="$([System.IO.File]::ReadAllText(package.txt))"
Files="@(ManifestFiles)" />
</Target>
Expand All @@ -106,7 +170,7 @@
<MSBuild.NuGet.Tasks.ManifestUpdate
ManifestFile="$(BuildNuGetDir)\package.nuspec"
WorkingDirectory="$(BuildNuGetDir)"
Version="$(PackageVersion)"
Version="$(ProductVersion)"
Files="@(ManifestFiles)" />
</Target>

Expand All @@ -116,19 +180,21 @@
<PackageFiles Include="$(BuildUmbDir)\**\*.*" />
</ItemGroup>

<Message Text="Package version: $(PackageVersion)" />
<Message Text="Package version: $(ProductVersion)" />
<Message Text="Minimum Umbraco version: $(MinUmbracoVersion)" />

<MSBuild.Umbraco.Tasks.Package ManifestFile="$(BuildUmbDir)\package.xml"
WorkingDirectory="$(BuildUmbDir)"
OutputDirectory="$(RootDir)"
OutputDirectory="$(ArtifactsDir)"
Files="@(PackageFiles)" />
<MSBuild.NuGet.Tasks.Pack NuGetExePath="$(SrcDir)\.nuget\NuGet.exe"
ManifestFile="$(BuildNuGetDir)\package.nuspec"
BasePath="$(BuildNuGetDir)"
OutputDirectory="$(RootDir)"
Verbosity="normal" />

Version="$(ProductVersion)"
OutputDirectory="$(ArtifactsDir)"
Verbosity="normal"
Symbols="true" />

<RemoveDir Directories="$(BuildDir)" Condition="Exists('$(BuildDir)')" />
<Delete Files="$(SrcDir)\uComponents.sln.cache" />
</Target>
Expand Down
6 changes: 3 additions & 3 deletions src/.nuget/NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
</configuration>
Binary file modified src/.nuget/NuGet.exe
View file
Open in desktop
Binary file not shown.
Loading