Merge pull request #2 from hkutluay/feature/core-upgrade

Feature/core upgrade
hkutluay · Jan 2, 2021 · 2ef4428 · 2ef4428
2 parents e27d5c6 + 2c06c28
commit 2ef4428
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.100
+        dotnet-version: 5.0.x
     - name: Build with dotnet
       run: dotnet build --configuration Release
     - name: Unit Tests

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 5.0.x
     - name: Build with dotnet
       run: dotnet build --configuration Release
     - name: Test with dotnet

diff --git a/README.md b/README.md
@@ -12,6 +12,24 @@ PM> Install-Package ZipContent.S3
 ```
 
 Sample usage:
+
+```csharp
+string bucket = "test";
+string key = "foo.zip";
+
+IAmazonS3 s3 = new AmazonS3Client();
+
+IPartialFileReader partialReader = new S3PartialFileReader(s3, bucket, key);
+
+IZipContentLister lister = new ZipContentLister(partialReader);
+
+var contentList = await lister.GetContents();
+
+foreach (var content in contentList)
+   Console.WriteLine(item.FullName);
+ ```
+
+Before 1.2.0 version:
 ```csharp
 string bucket = "test";
 string key = "foo.zip";

diff --git a/ZipContent.S3.Test/GivenValidZipFile.cs b/ZipContent.S3.Test/GivenValidZipFile.cs
@@ -7,19 +7,19 @@ namespace ZipContent.S3.Test
     [TestClass]
     public class GivenValidZipFile
     {
-        private readonly IZipContentLister _lister;
-
+
         public GivenValidZipFile()
         {
-            _lister = new ZipContentLister();
+
         }
 
         [TestMethod]
         public async Task ExtractedFileCountShouldMatch()
         {
 
             var partialReader = new S3PartialFileReader(TestContext.GetAmazonS3Client(), "ZipFiles", "foo.zip");
-            var content = await _lister.GetContents(partialReader);
+            var lister = new ZipContentLister(partialReader);
+            var content = await lister.GetContents();
             Assert.AreEqual(content.Count, 1);
         }
 
@@ -28,8 +28,8 @@ public async Task ShouldHaveExpectedFileName()
         {
 
             var partialReader = new S3PartialFileReader(TestContext.GetAmazonS3Client(), "ZipFiles", "foo.zip");
-            var content = await _lister.GetContents(partialReader);
-
+            var lister = new ZipContentLister(partialReader);
+            var content = await lister.GetContents();
             Assert.AreEqual(content[0].FullName, "foo.txt");
         }
     }

diff --git a/ZipContent.S3.Test/ZipContent.S3.Test.csproj b/ZipContent.S3.Test/ZipContent.S3.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/ZipContent.S3/ZipContent.S3.csproj b/ZipContent.S3/ZipContent.S3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;netstandard2.1;netstandard2.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6;netstandard2.1;netstandard2.0;net5.0</TargetFrameworks>
     <Description>S3PartialFileReader for ZipContent.Core
 
 Lists zip file content on AWS S3 without downloading whole document. Supports both zip and zip64 files.</Description>
@@ -10,14 +10,14 @@ Lists zip file content on AWS S3 without downloading whole document. Supports bo
     <RepositoryUrl>https://github.com/hkutluay/ZipContent</RepositoryUrl>
     <PackageTags>zip list content AWS S3</PackageTags>
     <PackageIcon>s3_logo.png</PackageIcon>
-    <Version>1.1.0</Version>
-    <AssemblyVersion>1.1.0.0</AssemblyVersion>
-    <FileVersion>1.1.0.0</FileVersion>
+    <Version>1.2.0</Version>
+    <AssemblyVersion>1.2.0.0</AssemblyVersion>
+    <FileVersion>1.2.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AWSSDK.S3" Version="3.3.110.71" />
-    <PackageReference Include="ZipContent.Core" Version="1.1.1" />
+    <PackageReference Include="ZipContent.Core" Version="1.2.0" />
   </ItemGroup>
 
   <ItemGroup>