Skip to content

Commit d03eca3

Browse files
committed
Made some corrections due to incorrect References versions
1 parent 1dbe67c commit d03eca3

File tree

8 files changed

+21
-15
lines changed

8 files changed

+21
-15
lines changed

FabTools/FabPaintLib/FabPaintLib.xsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@
9999
<Private>False</Private>
100100
<SpecificVersion>False</SpecificVersion>
101101
</Reference>
102-
<Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
102+
<Reference Include="System.Drawing">
103103
<Name>System.Drawing</Name>
104104
<AssemblyName>System.Drawing.dll</AssemblyName>
105105
</Reference>
106-
<Reference Include="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
106+
<Reference Include="System.Windows.Forms">
107107
<Name>System.Windows.Forms</Name>
108108
<AssemblyName>System.Windows.Forms.dll</AssemblyName>
109109
</Reference>

FabTools/FabPaintLib_Control/FabPaintLib_Control.xsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@
9292
<Private>False</Private>
9393
<SpecificVersion>False</SpecificVersion>
9494
</Reference>
95-
<Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
95+
<Reference Include="System.Drawing">
9696
<Name>System.Drawing</Name>
9797
<AssemblyName>System.Drawing.dll</AssemblyName>
9898
</Reference>
99-
<Reference Include="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
99+
<Reference Include="System.Windows.Forms">
100100
<Name>System.Windows.Forms</Name>
101101
<AssemblyName>System.Windows.Forms.dll</AssemblyName>
102102
</Reference>

FabTools/FabPaintLib_Test/FabPaintLib_Test.xsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<Private>False</Private>
9797
<SpecificVersion>False</SpecificVersion>
9898
</Reference>
99-
<Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
99+
<Reference Include="System.Drawing">
100100
<Name>System.Drawing</Name>
101101
<AssemblyName>System.Drawing.dll</AssemblyName>
102102
</Reference>

FabTools/FabPaintLib_Test/Menu ImgView.prg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ CONSTRUCTOR( oOwner )
9999
HyperLabel{ #ImgViewShellMenu_Image , "&Image" , , } , SELF:Handle() , 2)
100100

101101
SELF:RegisterItem(IDM_ImgViewShellMenu_Image_Copy_ID, ;
102-
HyperLabel{ #ImgCopy , "&Copy" , , } , GetSubMenu( SELF:Handle() , 2 ) , 0)
102+
HyperLabel{ #ImgCopy , "&Copy" , , } , VOWin32APILibrary.Functions.GetSubMenu( SELF:Handle() , 2 ) , 0)
103103

104104
SELF:RegisterItem(IDM_ImgViewShellMenu_Image_Copy_No_Change_ID, ;
105105
HyperLabel{ #ImgCopy0 , "No Change" , , })
@@ -114,7 +114,7 @@ CONSTRUCTOR( oOwner )
114114
HyperLabel{ #ImgCopy32 , "32 bpp" , , })
115115

116116
SELF:RegisterItem(IDM_ImgViewShellMenu_Image_Resize_ID, ;
117-
HyperLabel{ #ImgViewShellMenu_Image_Resize , "&Resize" , , } , GetSubMenu( SELF:Handle() , 2 ) , 1)
117+
HyperLabel{ #ImgViewShellMenu_Image_Resize , "&Resize" , , } , VOWin32APILibrary.Functions.GetSubMenu( SELF:Handle() , 2 ) , 1)
118118

119119
SELF:RegisterItem(IDM_ImgViewShellMenu_Image_Resize_Bilinear_ID, ;
120120
HyperLabel{ #ImgRBili , "Bilinear" , , })

FabTools/FabTwainTest/Twain Menu.prg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CONSTRUCTOR(oOwner)
3131
HyperLabel{#Dummy_Zoom_In, ;
3232
"Zoom In", ;
3333
, ;
34-
,},GetSubMenu(self:Handle( ),0),0)
34+
,},VOWin32APILibrary.Functions.GetSubMenu(SELF:Handle( ),0),0)
3535
self:RegisterItem(IDM_TwainContext_Dummy_Zoom_In__1_f2_1_ID, ;
3636
HyperLabel{#Dummy_Zoom_In__1_f2_1, ;
3737
"1 / 1", ;
@@ -61,7 +61,7 @@ CONSTRUCTOR(oOwner)
6161
HyperLabel{#Dummy_Zoom_Out, ;
6262
"Zoom Out", ;
6363
, ;
64-
,},GetSubMenu(self:Handle( ),0),1)
64+
,},VOWin32APILibrary.Functions.GetSubMenu(self:Handle( ),0),1)
6565
self:RegisterItem(IDM_TwainContext_Dummy_Zoom_Out__1_f2_1_ID, ;
6666
HyperLabel{#Dummy_Zoom_Out__1_f2_1, ;
6767
"1 / 1", ;

FabTools/FabZipVo/FabZipVo.xsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<XSharpProjectversion>2.8.0.11</XSharpProjectversion>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" Label="Configuration">
41-
<PlatformTarget>AnyCPU</PlatformTarget>
41+
<PlatformTarget>x86</PlatformTarget>
4242
<EmitDebugInformation>true</EmitDebugInformation>
4343
<DebugType>full</DebugType>
4444
<Optimize>false</Optimize>

FabTools/Fab_Zip_1_52j_Test/Fab_Zip_1_52j_Test.xsproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<VO7>true</VO7>
3131
<VO8>true</VO8>
3232
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
33-
<XSharpProjectversion>2.3.0.0</XSharpProjectversion>
33+
<XSharpProjectversion>2.8.0.11</XSharpProjectversion>
3434
<StartupObject />
3535
<ApplicationIcon />
3636
<VulcanCompatibleResources>False</VulcanCompatibleResources>
@@ -78,11 +78,12 @@
7878
<RegisterForComInterop>False</RegisterForComInterop>
7979
</PropertyGroup>
8080
<ItemGroup>
81-
<Reference Include="Ionic.Zip, Version=1.9.5.2, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c">
82-
<Name>Ionic.Zip</Name>
83-
<AssemblyName>Ionic.Zip.dll</AssemblyName>
84-
<HintPath>Debug\Ionic.Zip.dll</HintPath>
81+
<Reference Include="DotNetZip, Version=1.13.6.0, Culture=neutral, PublicKeyToken=6583c7c814667745">
82+
<Name>DotNetZip</Name>
83+
<AssemblyName>DotNetZip.dll</AssemblyName>
84+
<SpecificVersion>False</SpecificVersion>
8585
<Private>True</Private>
86+
<HintPath>..\packages\DotNetZip.1.13.6\lib\net40\DotNetZip.dll</HintPath>
8687
</Reference>
8788
<Reference Include="System">
8889
<Private>False</Private>
@@ -237,6 +238,7 @@
237238
<VOBinary Include="Test Window.FabZipTest1.vnfrm">
238239
<DependentUpon>Test Window.prg</DependentUpon>
239240
</VOBinary>
241+
<None Include="packages.config" />
240242
<None Include="Resources\CDROM.ICO" />
241243
<None Include="Resources\CLOSE.ICO" />
242244
<None Include="Resources\DISKET.ICO" />
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="DotNetZip" version="1.13.6" targetFramework="net46" />
4+
</packages>

0 commit comments

Comments
 (0)