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

Commit 13a9687

Browse files
authored
Merge pull request #506 from telerik/development
Merge development into master
2 parents a77ec1a + 5f562b3 commit 13a9687

File tree

4 files changed

+25
-23
lines changed

4 files changed

+25
-23
lines changed

BuildTools/BuildNuGet.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
SET MSBUILD=%WINDIR%\microsoft.net\framework\v4.0.30319\MSBuild.exe
2-
%MSBUILD% BuildNuget.UWP.proj /property:Version=1.0.2.7
2+
%MSBUILD% BuildNuget.UWP.proj /property:Version=1.0.2.8

BuildTools/BuildNuget.UWP.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Target Name="PrepareNugetProperties">
1616

1717
<PropertyGroup>
18-
<Version Condition= " '$(Version)' == '' ">1.0.2.7</Version>
18+
<Version Condition= " '$(Version)' == '' ">1.0.2.8</Version>
1919
<FullPathDeployDirectory>$([System.IO.Path]::GetFullPath('$(DeployDirectory)'))</FullPathDeployDirectory>
2020
<BinariesSubDir>$(BinariesTargetDirectory)</BinariesSubDir>
2121

Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
<?xml version="1.0"?>
22
<package >
3-
<metadata>
4-
<id>$Id$</id>
5-
<version>$Version$</version>
6-
<title>$Title$</title>
7-
<authors>Progress</authors>
8-
<owners>Progress</owners>
9-
<projectUrl>http://www.telerik.com/universal-windows-platform-ui</projectUrl>
10-
<licenseUrl>https://github.com/telerik/UI-For-UWP/blob/master/LICENSE.md</licenseUrl>
11-
<iconUrl>http://www.telerik.com/docs/default-source/nuget-feed-product-files/nugeticon_uwp.png?sfvrsn=2</iconUrl>
12-
<requireLicenseAcceptance>true</requireLicenseAcceptance>
13-
<description>UI for Universal Windows Platform is a toolset for building Universal Windows Platform apps for the Windows Store and the enterprise. The library is designed to offer the same user experience, functionality and behavior on Windows devices of all form factors.</description>
14-
<releaseNotes>For full release notes see https://github.com/telerik/UI-For-UWP/releases/tag/1.0.2.7</releaseNotes>
15-
<tags>UWP Windows Telerik Controls XAML C#</tags>
16-
<language>en-US</language>
17-
</metadata>
18-
<files>
19-
<file src="$DeployDirectory$\$BinariesSubDir$\**" target="lib\uap10.0"/>
20-
<file src="$NuspecsDir$\$Id$.targets" target="build\uap10.0"/>
21-
<file src="$NuspecsDir$\VisualStudioToolsManifest.xml" target="tools"/>
22-
<file src="$DeployDirectory$\License.md" target="LicenseAgreements" />
23-
</files>
3+
<metadata>
4+
<id>$Id$</id>
5+
<version>$Version$</version>
6+
<title>$Title$</title>
7+
<authors>Progress</authors>
8+
<owners>Progress</owners>
9+
<projectUrl>http://www.telerik.com/universal-windows-platform-ui</projectUrl>
10+
<license type="file">LicenseAgreements\LICENSE.md</license>
11+
<iconUrl>http://www.telerik.com/docs/default-source/nuget-feed-product-files/nugeticon_uwp.png?sfvrsn=2</iconUrl>
12+
<icon>images\uwp.png</icon>
13+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
14+
<description>UI for Universal Windows Platform is a toolset for building Universal Windows Platform apps for the Windows Store and the enterprise. The library is designed to offer the same user experience, functionality and behavior on Windows devices of all form factors.</description>
15+
<releaseNotes>For full release notes see https://github.com/telerik/UI-For-UWP/releases/tag/1.0.2.8</releaseNotes>
16+
<tags>UWP Windows Telerik Controls XAML C#</tags>
17+
<language>en-US</language>
18+
</metadata>
19+
<files>
20+
<file src="$NuspecsDir$\uwp.png" target="images\" />
21+
<file src="$DeployDirectory$\$BinariesSubDir$\**" target="lib\uap10.0"/>
22+
<file src="$NuspecsDir$\$Id$.targets" target="build\uap10.0"/>
23+
<file src="$NuspecsDir$\VisualStudioToolsManifest.xml" target="tools"/>
24+
<file src="$DeployDirectory$\License.md" target="LicenseAgreements" />
25+
</files>
2426
</package>

BuildTools/Nuspecs.UWP/uwp.png

1.8 KB
Loading

0 commit comments

Comments
 (0)