Skip to content

Commit

Permalink
Merge pull request #506 from telerik/development
Browse files Browse the repository at this point in the history
Merge development into master
  • Loading branch information
polqnaP committed Jan 20, 2022
2 parents a77ec1a + 5f562b3 commit 13a9687
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion BuildTools/BuildNuGet.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SET MSBUILD=%WINDIR%\microsoft.net\framework\v4.0.30319\MSBuild.exe
%MSBUILD% BuildNuget.UWP.proj /property:Version=1.0.2.7
%MSBUILD% BuildNuget.UWP.proj /property:Version=1.0.2.8
2 changes: 1 addition & 1 deletion BuildTools/BuildNuget.UWP.proj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<Target Name="PrepareNugetProperties">

<PropertyGroup>
<Version Condition= " '$(Version)' == '' ">1.0.2.7</Version>
<Version Condition= " '$(Version)' == '' ">1.0.2.8</Version>
<FullPathDeployDirectory>$([System.IO.Path]::GetFullPath('$(DeployDirectory)'))</FullPathDeployDirectory>
<BinariesSubDir>$(BinariesTargetDirectory)</BinariesSubDir>

Expand Down
44 changes: 23 additions & 21 deletions BuildTools/Nuspecs.UWP/Package.UniversalWindowsPlatform.nuspec
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>$Id$</id>
<version>$Version$</version>
<title>$Title$</title>
<authors>Progress</authors>
<owners>Progress</owners>
<projectUrl>http://www.telerik.com/universal-windows-platform-ui</projectUrl>
<licenseUrl>https://github.com/telerik/UI-For-UWP/blob/master/LICENSE.md</licenseUrl>
<iconUrl>http://www.telerik.com/docs/default-source/nuget-feed-product-files/nugeticon_uwp.png?sfvrsn=2</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<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>
<releaseNotes>For full release notes see https://github.com/telerik/UI-For-UWP/releases/tag/1.0.2.7</releaseNotes>
<tags>UWP Windows Telerik Controls XAML C#</tags>
<language>en-US</language>
</metadata>
<files>
<file src="$DeployDirectory$\$BinariesSubDir$\**" target="lib\uap10.0"/>
<file src="$NuspecsDir$\$Id$.targets" target="build\uap10.0"/>
<file src="$NuspecsDir$\VisualStudioToolsManifest.xml" target="tools"/>
<file src="$DeployDirectory$\License.md" target="LicenseAgreements" />
</files>
<metadata>
<id>$Id$</id>
<version>$Version$</version>
<title>$Title$</title>
<authors>Progress</authors>
<owners>Progress</owners>
<projectUrl>http://www.telerik.com/universal-windows-platform-ui</projectUrl>
<license type="file">LicenseAgreements\LICENSE.md</license>
<iconUrl>http://www.telerik.com/docs/default-source/nuget-feed-product-files/nugeticon_uwp.png?sfvrsn=2</iconUrl>
<icon>images\uwp.png</icon>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<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>
<releaseNotes>For full release notes see https://github.com/telerik/UI-For-UWP/releases/tag/1.0.2.8</releaseNotes>
<tags>UWP Windows Telerik Controls XAML C#</tags>
<language>en-US</language>
</metadata>
<files>
<file src="$NuspecsDir$\uwp.png" target="images\" />
<file src="$DeployDirectory$\$BinariesSubDir$\**" target="lib\uap10.0"/>
<file src="$NuspecsDir$\$Id$.targets" target="build\uap10.0"/>
<file src="$NuspecsDir$\VisualStudioToolsManifest.xml" target="tools"/>
<file src="$DeployDirectory$\License.md" target="LicenseAgreements" />
</files>
</package>
Binary file added BuildTools/Nuspecs.UWP/uwp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 13a9687

Please sign in to comment.