From d570ba389f861c964aa69d179a8303068ce59b41 Mon Sep 17 00:00:00 2001 From: Yauheni Pakala Date: Sat, 3 Dec 2022 00:28:55 +0200 Subject: [PATCH 1/5] Revert preview pipeline --- .github/workflows/release-preview.yml | 49 +++++++++++++++++++++++++++ .github/workflows/release.yml | 1 - 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/release-preview.yml diff --git a/.github/workflows/release-preview.yml b/.github/workflows/release-preview.yml new file mode 100644 index 0000000..bd87838 --- /dev/null +++ b/.github/workflows/release-preview.yml @@ -0,0 +1,49 @@ +on: + push: + tags: + - "v[0-9]+.[0-9]+.[0-9]+-preview[0-9]+" +env: + DOTNET_NOLOGO: true + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_CLI_TELEMETRY_OPTOUT: true +jobs: + build: + runs-on: ubuntu-latest + timeout-minutes: 10 + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Set VERSION variable from tag + run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV + - name: Pack + run: | + dotnet pack src \ + -p:PackageVersion="${VERSION}" \ + --configuration Release \ + --verbosity normal \ + --output . + - name: Upload Artifact + uses: actions/upload-artifact@v3 + with: + name: nupkg + path: | + *.nupkg + *.snupkg + + deploy-github: + needs: build + runs-on: ubuntu-latest + steps: + - name: Download Artifact + uses: actions/download-artifact@v1 + with: + name: nupkg + - name: Push to GitHub + run: | + dotnet nuget push ./nupkg/* \ + --source ${FEED_URL} \ + --api-key ${FEED_KEY} \ + --skip-duplicate + env: + FEED_URL: https://nuget.pkg.github.com/wcoder/index.json \ + FEED_KEY: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93bb1c1..bfb502f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,6 @@ on: push: tags: - "v[0-9]+.[0-9]+.[0-9]+" - - "v[0-9]+.[0-9]+.[0-9]+-preview[0-9]+" env: DOTNET_NOLOGO: true DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true From 28820529e19e9a7bbff7f86e45b3d8a1a61b693d Mon Sep 17 00:00:00 2001 From: Yauheni Pakala Date: Sat, 3 Dec 2022 00:33:38 +0200 Subject: [PATCH 2/5] Exclude symbols from preview push --- .github/workflows/release-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-preview.yml b/.github/workflows/release-preview.yml index bd87838..7095352 100644 --- a/.github/workflows/release-preview.yml +++ b/.github/workflows/release-preview.yml @@ -40,7 +40,7 @@ jobs: name: nupkg - name: Push to GitHub run: | - dotnet nuget push ./nupkg/* \ + dotnet nuget push ./nupkg/*.nupkg \ --source ${FEED_URL} \ --api-key ${FEED_KEY} \ --skip-duplicate From 2de8f2af20619bcf7b32dc8c08de43648eee5822 Mon Sep 17 00:00:00 2001 From: Yauheni Pakala Date: Sat, 3 Dec 2022 00:38:16 +0200 Subject: [PATCH 3/5] Exclude symbols from preview push --- .github/workflows/release-preview.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-preview.yml b/.github/workflows/release-preview.yml index 7095352..a396191 100644 --- a/.github/workflows/release-preview.yml +++ b/.github/workflows/release-preview.yml @@ -43,6 +43,7 @@ jobs: dotnet nuget push ./nupkg/*.nupkg \ --source ${FEED_URL} \ --api-key ${FEED_KEY} \ + --no-symbols \ --skip-duplicate env: FEED_URL: https://nuget.pkg.github.com/wcoder/index.json \ From f6613295cbd0456c5b9c6d5985e4065b9ac86155 Mon Sep 17 00:00:00 2001 From: Yauheni Pakala Date: Sat, 3 Dec 2022 00:51:52 +0200 Subject: [PATCH 4/5] Fix preview pipeline --- .github/workflows/release-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-preview.yml b/.github/workflows/release-preview.yml index a396191..e7c5e8c 100644 --- a/.github/workflows/release-preview.yml +++ b/.github/workflows/release-preview.yml @@ -43,7 +43,7 @@ jobs: dotnet nuget push ./nupkg/*.nupkg \ --source ${FEED_URL} \ --api-key ${FEED_KEY} \ - --no-symbols \ + --no-symbols true \ --skip-duplicate env: FEED_URL: https://nuget.pkg.github.com/wcoder/index.json \ From d49aa19b29a14cf4f1f6eb46995ac9de542164b0 Mon Sep 17 00:00:00 2001 From: ldv Date: Mon, 29 Jan 2024 22:12:41 +0300 Subject: [PATCH 5/5] Fix missing using on console application and path to book file. Fix book Annotation and Language options. --- samples/FBLibrary.Sample.ConsoleApp/Program.cs | 6 ++++-- src/HeaderItems/ItemTitleInfo.cs | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/samples/FBLibrary.Sample.ConsoleApp/Program.cs b/samples/FBLibrary.Sample.ConsoleApp/Program.cs index 119cebc..253e7ed 100644 --- a/samples/FBLibrary.Sample.ConsoleApp/Program.cs +++ b/samples/FBLibrary.Sample.ConsoleApp/Program.cs @@ -1,10 +1,12 @@ -using System.Drawing; +using System; +using System.Drawing; using System.Drawing.Imaging; +using System.IO; using System.Xml; using FB2Library; using FB2Library.Elements; -var filePath = Path.Combine("..", "..", "..", "..", "files", "test.fb2"); +var filePath = Path.Combine("..", "..", "..", "..", "..", "files", "test.fb2"); await using var fileStream = new FileStream(filePath, FileMode.Open); var readerSettings = new XmlReaderSettings diff --git a/src/HeaderItems/ItemTitleInfo.cs b/src/HeaderItems/ItemTitleInfo.cs index 30e4e93..8fa27d9 100644 --- a/src/HeaderItems/ItemTitleInfo.cs +++ b/src/HeaderItems/ItemTitleInfo.cs @@ -56,7 +56,7 @@ public class ItemTitleInfo : ItemInfoBase /// /// Book's annotation /// - public AnnotationItem Annotation { set; private get; } + public AnnotationItem Annotation { get; private set; } /// /// Book date , can be a range like 1990-1991 @@ -66,7 +66,7 @@ public class ItemTitleInfo : ItemInfoBase /// /// Book's language /// - public string Language { set; private get; } + public string Language { get; private set; } public CoverPage Cover { get; private set; } @@ -204,7 +204,7 @@ public void Load(XElement xTitleInfo) } else { - Debug.WriteLine("Language not specified in title section"); + Debug.WriteLine("Language not specified in title section"); } // Load source language