Skip to content

Commit

Permalink
Fixes #238 by updating to newest ControlzEx version and also updates …
Browse files Browse the repository at this point in the history
…copyright and nuget informations
  • Loading branch information
batzen committed Jan 6, 2016
1 parent 89925a7 commit 3669c1a
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
- [#235](../../issues/235) - Items of invisble tab are shown
- [#236](../../issues/236) - Window size is wrong when window is maximized, backstage is closed and window should be restored to normal size
- [#237](../../issues/237) - Ribbon Buttons with large text cut off a few pixels
- [#238](../../issues/238) - New WindowChrome does not work correctly on Windows 7
- OpenBackstage command was not acting on the correct backstage in a multiple backstage scenario (thanks to @maurosampietro)

- ### Enhancements
Expand Down
8 changes: 4 additions & 4 deletions Fluent.Ribbon.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<version>$Version$</version>
<title>Fluent Ribbon Control Suite</title>
<summary>Fluent Ribbon Control Suite is a library that implements an Office-like Ribbon for WPF.</summary>
<description>Fluent Ribbon Control Suite is a library that implements an Office-like user interface for the Windows Presentation Foundation (WPF). It provides well-customized controls such as RibbonTabControl, Backstage, Gallery, QuickAccessToolbar, ScreenTip and so on. It is bundled with the most up-to-date Office 2010, Office 2013 and Windows 8 styles.</description>
<description>Fluent Ribbon Control Suite is a library that implements an Office-like user interface for the Windows Presentation Foundation (WPF). It provides controls such as RibbonTabControl, Backstage, Gallery, QuickAccessToolbar, ScreenTip and so on. It is bundled with Office 2010, Office 2013 and Windows 8 themes.</description>
<releaseNotes>You can read the changelog at: https://github.com/fluentribbon/Fluent.Ribbon/blob/master/Changelog.md</releaseNotes>
<authors>daVinci,SableRaven,batzen,LastElb,firehirsch</authors>
<authors>batzen</authors>
<licenseUrl>https://github.com/fluentribbon/Fluent.Ribbon/blob/master/License.txt</licenseUrl>
<projectUrl>https://github.com/fluentribbon/Fluent.Ribbon</projectUrl>
<iconUrl>https://raw.githubusercontent.com/fluentribbon/Fluent.Ribbon/master/Images/Logo/Logo_32x32.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>ribbon fluent ribbonwindow office2010 office2013 windows8 backstage</tags>
<tags>ribbon fluent ribbon ribbonwindow office2010 office2013 windows8 backstage</tags>
<dependencies>
<dependency id="ControlzEx" version="2.0.0-dev021" />
<dependency id="ControlzEx" version="2.0.0-dev023" />
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions Fluent.Ribbon/Fluent.Ribbon.NET 4.0.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ControlzEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=f08b075e934b7045, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.2.0.0-dev021\lib\net40\ControlzEx.dll</HintPath>
<HintPath>..\packages\ControlzEx.2.0.0-dev023\lib\net40\ControlzEx.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.2.0.0-dev021\lib\net40\System.Windows.Interactivity.dll</HintPath>
<HintPath>..\packages\ControlzEx.2.0.0-dev023\lib\net40\System.Windows.Interactivity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xaml" />
Expand Down
4 changes: 2 additions & 2 deletions Fluent.Ribbon/Fluent.Ribbon.NET 4.5.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ControlzEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=f08b075e934b7045, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.2.0.0-dev021\lib\net45\ControlzEx.dll</HintPath>
<HintPath>..\packages\ControlzEx.2.0.0-dev023\lib\net45\ControlzEx.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.2.0.0-dev021\lib\net45\System.Windows.Interactivity.dll</HintPath>
<HintPath>..\packages\ControlzEx.2.0.0-dev023\lib\net45\System.Windows.Interactivity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xaml" />
Expand Down
2 changes: 1 addition & 1 deletion Fluent.Ribbon/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ControlzEx" version="2.0.0-dev021" />
<package id="ControlzEx" version="2.0.0-dev023" />
</packages>
2 changes: 1 addition & 1 deletion Shared/GlobalAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#endif
[assembly: AssemblyCompany("https://github.com/fluentribbon/Fluent.Ribbon")]
[assembly: AssemblyProduct("Fluent Ribbon Control Suite")]
[assembly: AssemblyCopyright("Copyright © 2009 - 2015 Degtyarev Daniel, Rikker Serg, Bastian Schmidt")]
[assembly: AssemblyCopyright("Copyright © 2012 - 2016 Bastian Schmidt; Copyright © 2009 - 2012 Degtyarev Daniel, Rikker Serg")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down

0 comments on commit 3669c1a

Please sign in to comment.