From 66ce788578f21be878580928a2b9190987a6e685 Mon Sep 17 00:00:00 2001 From: Tony Bark Date: Wed, 9 Dec 2020 17:22:44 -0500 Subject: [PATCH 1/2] Removed PackageLicenseUrl from metadata --- CSTNet/CSTNet.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/CSTNet/CSTNet.csproj b/CSTNet/CSTNet.csproj index 41eeb6e..85f27ae 100644 --- a/CSTNet/CSTNet.csproj +++ b/CSTNet/CSTNet.csproj @@ -7,7 +7,6 @@ Caret-Separated Text (or CST) is a key-value pair format represented by numbers or words as keys and the value is the string enclosed between carets (^) that contains the contents. CST.NET is a library for prasing the CST format. https://github.com/tonytins/cstnet MIT - https://github.com/tonytins/cstnet/blob/master/LICENSE CST.Net From 6f07905fcffea66ec7c30fc2ff4a506ce3cb6e6f Mon Sep 17 00:00:00 2001 From: Tony Bark Date: Fri, 11 Dec 2020 01:22:09 -0500 Subject: [PATCH 2/2] 1.0.1 merge conflict fixes --- .github/workflows/pkgrelease.yml | 10 +++++----- ...STNet.Tests.csproj => QuickFennec.CST.Tests.csproj} | 2 +- CSTNet.sln | 4 ++-- CSTNet/{CSTNet.csproj => QuickFennec.CST.csproj} | 0 4 files changed, 8 insertions(+), 8 deletions(-) rename CSTNet.Tests/{CSTNet.Tests.csproj => QuickFennec.CST.Tests.csproj} (94%) rename CSTNet/{CSTNet.csproj => QuickFennec.CST.csproj} (100%) diff --git a/.github/workflows/pkgrelease.yml b/.github/workflows/pkgrelease.yml index b7c8fd6..15dfb7f 100644 --- a/.github/workflows/pkgrelease.yml +++ b/.github/workflows/pkgrelease.yml @@ -18,8 +18,8 @@ jobs: run: dotnet restore - name: Package run: dotnet pack --no-restore -o . - - name: Publish to Nuget - env: - NUGET_KEY: ${{ secrets.NUGET_KEY }} - NUGET_API: https://api.nuget.org/v3/index.json - run: dotnet nuget push CSTNet.*.nupkg -k $NUGET_KEY -s $NUGET_API + # - name: Publish to Nuget + # env: + # NUGET_KEY: ${{ secrets.NUGET_KEY }} + # NUGET_API: https://api.nuget.org/v3/index.json + # run: dotnet nuget push CSTNet.*.nupkg -k $NUGET_KEY -s $NUGET_API diff --git a/CSTNet.Tests/CSTNet.Tests.csproj b/CSTNet.Tests/QuickFennec.CST.Tests.csproj similarity index 94% rename from CSTNet.Tests/CSTNet.Tests.csproj rename to CSTNet.Tests/QuickFennec.CST.Tests.csproj index b638f32..c6df1d4 100644 --- a/CSTNet.Tests/CSTNet.Tests.csproj +++ b/CSTNet.Tests/QuickFennec.CST.Tests.csproj @@ -20,7 +20,7 @@ - + diff --git a/CSTNet.sln b/CSTNet.sln index 64af97e..24ca89d 100644 --- a/CSTNet.sln +++ b/CSTNet.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30717.126 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSTNet", "CSTNet\CSTNet.csproj", "{82775826-A366-46F0-A5D2-5BE7658C75E4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuickFennec.CST", "CSTNet\QuickFennec.CST.csproj", "{82775826-A366-46F0-A5D2-5BE7658C75E4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CCFCE2DB-C18F-4D88-B025-19ED62BD2A1D}" ProjectSection(SolutionItems) = preProject @@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSTNet.Tests", "CSTNet.Tests\CSTNet.Tests.csproj", "{B6A98C64-1419-4B9A-99CA-72BB11D29472}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuickFennec.CST.Tests", "CSTNet.Tests\QuickFennec.CST.Tests.csproj", "{B6A98C64-1419-4B9A-99CA-72BB11D29472}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/CSTNet/CSTNet.csproj b/CSTNet/QuickFennec.CST.csproj similarity index 100% rename from CSTNet/CSTNet.csproj rename to CSTNet/QuickFennec.CST.csproj