Update NewZipApp to support RibbonWinForms as NuGet package

X-Sharp · Jan 18, 2022 · 4c31229 · 4c31229
1 parent 3010316
commit 4c31229
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/FabTools/NewZipApp/MainWindow.prg b/FabTools/NewZipApp/MainWindow.prg
@@ -124,15 +124,14 @@ CLASS MainWindow INHERIT System.Windows.Forms.Form
         SELF:ribbonFabZip:OrbImage := ((System.Drawing.Image)(resources:GetObject("ribbonFabZip.OrbImage")))
         // 
         // 
-        // 
-        SELF:ribbonFabZip:QuickAcessToolbar:AltKey := NULL
-        SELF:ribbonFabZip:QuickAcessToolbar:Image := NULL
-        SELF:ribbonFabZip:QuickAcessToolbar:Items:Add(SELF:ribbonButtonHelp)
-        SELF:ribbonFabZip:QuickAcessToolbar:Tag := NULL
-        SELF:ribbonFabZip:QuickAcessToolbar:Text := NULL
-        SELF:ribbonFabZip:QuickAcessToolbar:ToolTip := NULL
-        SELF:ribbonFabZip:QuickAcessToolbar:ToolTipImage := NULL
-        SELF:ribbonFabZip:QuickAcessToolbar:ToolTipTitle := NULL
+        SELF:ribbonFabZip:QuickAccessToolbar:AltKey := NULL
+        SELF:ribbonFabZip:QuickAccessToolbar:Image := NULL
+        SELF:ribbonFabZip:QuickAccessToolbar:Items:Add(SELF:ribbonButtonHelp)
+        SELF:ribbonFabZip:QuickAccessToolbar:Tag := NULL
+        SELF:ribbonFabZip:QuickAccessToolbar:Text := NULL
+        SELF:ribbonFabZip:QuickAccessToolbar:ToolTip := NULL
+        SELF:ribbonFabZip:QuickAccessToolbar:ToolTipImage := NULL
+        SELF:ribbonFabZip:QuickAccessToolbar:ToolTipTitle := NULL
         SELF:ribbonFabZip:Size := System.Drawing.Size{704, 138}
         SELF:ribbonFabZip:TabIndex := 0
         SELF:ribbonFabZip:Tabs:Add(SELF:ribbonTab_FabZip)

diff --git a/FabTools/NewZipApp/NewZipApp.xsproj b/FabTools/NewZipApp/NewZipApp.xsproj
@@ -13,7 +13,7 @@
     <RootNamespace>NewZipApp</RootNamespace>
     <AssemblyName>NewZipApp</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <XSharpProjectversion>2.8.0.11</XSharpProjectversion>
+    <XSharpProjectversion>2.10.0.1</XSharpProjectversion>
     <StartupObject />
     <ApplicationIcon />
     <VulcanCompatibleResources>False</VulcanCompatibleResources>
@@ -75,11 +75,12 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Forms.Ribbon, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <Reference Include="System.Windows.Forms.Ribbon, Version=2.0.0.0, Culture=neutral, PublicKeyToken=928736e248aa81f9">
       <Name>System.Windows.Forms.Ribbon</Name>
       <AssemblyName>System.Windows.Forms.Ribbon.dll</AssemblyName>
-      <HintPath>System.Windows.Forms.Ribbon.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
       <Private>True</Private>
+      <HintPath>..\packages\RibbonWinForms.5.0.1.1\lib\net46\System.Windows.Forms.Ribbon.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="XSharp.Core, Version=2.1.0.0, Culture=neutral, PublicKeyToken=ed555a0467764586">

diff --git a/FabTools/NewZipApp/packages.config b/FabTools/NewZipApp/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.13.6" targetFramework="net46" />
+  <package id="RibbonWinForms" version="5.0.1.1" targetFramework="net46" />
 </packages>