Skip to content

Commit 1dbe67c

Browse files
committed
Update to XSharp 2.8
Correction in Dotnetzip NuGet package support
1 parent 639bf85 commit 1dbe67c

File tree

7 files changed

+9
-13
lines changed

7 files changed

+9
-13
lines changed

FabTools/FabTools/Error.prg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ METHOD _Break( )
2222
//s
2323
//
2424
IF CanBreak()
25-
_Break( SELF )
25+
XSharp.RT.Functions._Break( SELF )
2626
ENDIF
2727

2828
RETURN self
@@ -54,7 +54,7 @@ METHOD Raise( cbBlock )
5454
LOCAL oErrorHandler AS USUAL
5555
// Inside a SEQUENCE ?
5656
IF CanBreak()
57-
_Break(SELF )
57+
XSharp.RT.Functions._Break(SELF )
5858
ELSE
5959
// Do we have a specified error handler ?
6060
IF IsNil( cbBlock )

FabTools/FabZip/FabZip.xsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<RootNamespace>FabZip</RootNamespace>
1414
<AssemblyName>FabZip</AssemblyName>
1515
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
16-
<XSharpProjectversion>2.3.0.0</XSharpProjectversion>
16+
<XSharpProjectversion>2.8.0.11</XSharpProjectversion>
1717
<StartupObject />
1818
<ApplicationIcon />
1919
<VulcanCompatibleResources>False</VulcanCompatibleResources>

FabTools/FabZipVo/FabZipVo.xsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<VulcanCompatibleResources>False</VulcanCompatibleResources>
3636
<NoWin32Manifest>False</NoWin32Manifest>
3737
<TargetFrameworkProfile />
38-
<XSharpProjectversion>2.3.1.0</XSharpProjectversion>
38+
<XSharpProjectversion>2.8.0.11</XSharpProjectversion>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" Label="Configuration">
4141
<PlatformTarget>AnyCPU</PlatformTarget>

FabTools/FabZipVo/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="DotNetZip" version="1.13.6" targetFramework="net452" />
3+
<package id="DotNetZip" version="1.13.6" targetFramework="net46" />
44
</packages>

FabTools/FabZip_Test/FabZip_Test.xsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<RootNamespace>FabZip_Test</RootNamespace>
1414
<AssemblyName>FabZip_Test</AssemblyName>
1515
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
16-
<XSharpProjectversion>2.3.0.0</XSharpProjectversion>
16+
<XSharpProjectversion>2.8.0.11</XSharpProjectversion>
1717
<StartupObject />
1818
<ApplicationIcon />
1919
<VulcanCompatibleResources>False</VulcanCompatibleResources>

FabTools/FabZip_Test/Form1.prg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11

22
USING System.Windows.Forms
3+
Using Ionic.Zip
4+
35

46
USING FabZip
57
USING FabZip.WinForms

FabTools/NewZipApp/NewZipApp.xsproj

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<RootNamespace>NewZipApp</RootNamespace>
1414
<AssemblyName>NewZipApp</AssemblyName>
1515
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
16-
<XSharpProjectversion>2.3.0.0</XSharpProjectversion>
16+
<XSharpProjectversion>2.8.0.11</XSharpProjectversion>
1717
<StartupObject />
1818
<ApplicationIcon />
1919
<VulcanCompatibleResources>False</VulcanCompatibleResources>
@@ -68,12 +68,6 @@
6868
<Private>True</Private>
6969
<HintPath>..\packages\DotNetZip.1.13.6\lib\net40\DotNetZip.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Ionic.Zip, Version=1.9.5.2, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c">
72-
<Name>Ionic.Zip</Name>
73-
<AssemblyName>Ionic.Zip.dll</AssemblyName>
74-
<HintPath>Debug\Ionic.Zip.dll</HintPath>
75-
<Private>True</Private>
76-
</Reference>
7771
<Reference Include="System" />
7872
<Reference Include="System.Core">
7973
<RequiredTargetFramework>3.5</RequiredTargetFramework>

0 commit comments

Comments
 (0)