diff --git a/.github/workflows/pkgrelease.yml b/.github/workflows/pkgrelease.yml
index 373d465..9f0db8c 100644
--- a/.github/workflows/pkgrelease.yml
+++ b/.github/workflows/pkgrelease.yml
@@ -1,24 +1,24 @@
name: Publish Nuget Package
on:
- push:
- branches:
- - "releases/**"
+ push:
+ branches:
+ - "releases/**"
jobs:
- publish:
- name: Package Release
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - name: Setup dotnet
- uses: actions/setup-dotnet@v1
- with:
- dotnet-version: "6.0.x"
- - name: Install dependencies
- 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 Sixam.CST.*.nupkg -k $NUGET_KEY -s $NUGET_API
+ publish:
+ name: Package Release
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: "6.0.x"
+ - name: Install dependencies
+ 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
diff --git a/Sixam.CST.Tests/Sixam.CST.Tests.csproj b/CSTNet.Tests/CSTNet.Tests.csproj
similarity index 91%
rename from Sixam.CST.Tests/Sixam.CST.Tests.csproj
rename to CSTNet.Tests/CSTNet.Tests.csproj
index ce0ea3b..a15dfbb 100644
--- a/Sixam.CST.Tests/Sixam.CST.Tests.csproj
+++ b/CSTNet.Tests/CSTNet.Tests.csproj
@@ -5,6 +5,7 @@
enable
enable
false
+ Sixam.CST.Tests
@@ -21,7 +22,7 @@
-
+
diff --git a/Sixam.CST.Tests/GlobalUsings.cs b/CSTNet.Tests/GlobalUsings.cs
similarity index 58%
rename from Sixam.CST.Tests/GlobalUsings.cs
rename to CSTNet.Tests/GlobalUsings.cs
index cacb05a..7552fd0 100644
--- a/Sixam.CST.Tests/GlobalUsings.cs
+++ b/CSTNet.Tests/GlobalUsings.cs
@@ -1,3 +1,3 @@
-// This project is licensed under the MIT license.
+// This project is licensed under the BSD 3-Clause license.
// See the LICENSE file in the project root for more information.
global using Xunit;
\ No newline at end of file
diff --git a/Sixam.CST.Tests/MultilineTests.cs b/CSTNet.Tests/MultilineTests.cs
similarity index 94%
rename from Sixam.CST.Tests/MultilineTests.cs
rename to CSTNet.Tests/MultilineTests.cs
index 55e4de0..ec564e4 100644
--- a/Sixam.CST.Tests/MultilineTests.cs
+++ b/CSTNet.Tests/MultilineTests.cs
@@ -1,7 +1,7 @@
-// This project is licensed under the MIT license.
+// This project is licensed under the BSD 3-Clause license.
// See the LICENSE file in the project root for more information.
-namespace Sixam.CST.Tests;
+namespace CSTNet.Tests;
public class MultilineTests
{
diff --git a/Sixam.CST.Tests/SingleLineTests.cs b/CSTNet.Tests/SingleLineTests.cs
similarity index 94%
rename from Sixam.CST.Tests/SingleLineTests.cs
rename to CSTNet.Tests/SingleLineTests.cs
index 3e33aaa..1288d4d 100644
--- a/Sixam.CST.Tests/SingleLineTests.cs
+++ b/CSTNet.Tests/SingleLineTests.cs
@@ -1,7 +1,7 @@
-// This project is licensed under the MIT license.
+// This project is licensed under the BSD 3-Clause license.
// See the LICENSE file in the project root for more information.
-namespace Sixam.CST.Tests;
+namespace CSTNet.Tests;
public class SingleLineTests
{
diff --git a/Sixam.CST.Tests/uitext/lorem.dir/_101_v1.cst b/CSTNet.Tests/uitext/lorem.dir/_101_v1.cst
similarity index 100%
rename from Sixam.CST.Tests/uitext/lorem.dir/_101_v1.cst
rename to CSTNet.Tests/uitext/lorem.dir/_101_v1.cst
diff --git a/Sixam.CST.Tests/uitext/lorem.dir/_102_v2.cst b/CSTNet.Tests/uitext/lorem.dir/_102_v2.cst
similarity index 100%
rename from Sixam.CST.Tests/uitext/lorem.dir/_102_v2.cst
rename to CSTNet.Tests/uitext/lorem.dir/_102_v2.cst
diff --git a/Sixam.CST.sln b/CSTNet.sln
similarity index 82%
rename from Sixam.CST.sln
rename to CSTNet.sln
index 1ffbbed..a57ac6e 100644
--- a/Sixam.CST.sln
+++ b/CSTNet.sln
@@ -8,13 +8,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
changelog.md = changelog.md
README.md = README.md
- Sixam.CST.sln.licenseheader = Sixam.CST.sln.licenseheader
+ CSTNet.sln.licenseheader = CSTNet.sln.licenseheader
usage.md = usage.md
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sixam.CST", "Sixam.CST\Sixam.CST.csproj", "{C5372E74-D1DF-4D15-B597-D1F517ECD0D8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSTNet", "CSTNet\CSTNet.csproj", "{C5372E74-D1DF-4D15-B597-D1F517ECD0D8}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sixam.CST.Tests", "Sixam.CST.Tests\Sixam.CST.Tests.csproj", "{01A1A8E9-D83E-4877-8AEB-2FD0A298F049}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSTNet.Tests", "CSTNet.Tests\CSTNet.Tests.csproj", "{01A1A8E9-D83E-4877-8AEB-2FD0A298F049}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Sixam.CST.sln.licenseheader b/CSTNet.sln.licenseheader
similarity index 100%
rename from Sixam.CST.sln.licenseheader
rename to CSTNet.sln.licenseheader
diff --git a/Sixam.CST/Sixam.CST.csproj b/CSTNet/CSTNet.csproj
similarity index 93%
rename from Sixam.CST/Sixam.CST.csproj
rename to CSTNet/CSTNet.csproj
index 6f26ba6..3751e5d 100644
--- a/Sixam.CST/Sixam.CST.csproj
+++ b/CSTNet/CSTNet.csproj
@@ -13,6 +13,7 @@
https://github.com/sixamsoft/cst-dotnet
MIT
+ Sixam.CST
diff --git a/Sixam.CST/CaretSeparatedText.cs b/CSTNet/CaretSeparatedText.cs
similarity index 96%
rename from Sixam.CST/CaretSeparatedText.cs
rename to CSTNet/CaretSeparatedText.cs
index 2fc61ce..82c1f34 100644
--- a/Sixam.CST/CaretSeparatedText.cs
+++ b/CSTNet/CaretSeparatedText.cs
@@ -1,7 +1,7 @@
-// This project is licensed under the MIT license.
+// This project is licensed under the BSD 3-Clause license.
// See the LICENSE file in the project root for more information.
-namespace Sixam.CST;
+namespace CSTNet;
public class CaretSeparatedText
{
diff --git a/Sixam.CST/UIText.cs b/CSTNet/UIText.cs
similarity index 94%
rename from Sixam.CST/UIText.cs
rename to CSTNet/UIText.cs
index 0a483be..29f8437 100644
--- a/Sixam.CST/UIText.cs
+++ b/CSTNet/UIText.cs
@@ -1,7 +1,7 @@
-// This project is licensed under the MIT license.
+// This project is licensed under the BSD 3-Clause license.
// See the LICENSE file in the project root for more information.
-namespace Sixam.CST;
+namespace CSTNet;
public class UIText
{
diff --git a/changelog.md b/changelog.md
index 3f8a169..eda581c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,10 +1,10 @@
# Change Log
-## 1.2.100
+## 1.1.100
-This version removes support for .NET Standard 2.0 in favor of .NET 6 and brings with it (much needed) quality of life changes to the project. Apart from the removal of the ``CSTNet`` namespace, nothing has changed to the API itself and you can continue to use to 1.1.100 on all platforms where .NET Standard 2.0 is [supported](https://dotnet.microsoft.com/platform/dotnet-standard).
+This version removes support for .NET Standard 2.0 in favor of .NET 6 and brings with it (much needed) quality of life changes to the project. Apart from that, nothing has changed to the API itself and you can continue to use to 1.1.100 on all platforms where .NET Standard 2.0 is [supported](https://dotnet.microsoft.com/platform/dotnet-standard).
-From 1.2 onward, Sixam.CST will only target LTS releases. This is why .NET 5 was skipped, despite the initial platform unification.
+From 1.1 onward, CSTNet will only target LTS releases. This is why .NET 5 was skipped, despite the initial platform unification.
### Project Changes
@@ -12,13 +12,7 @@ With the move to .NET 6.0, this version brings with it a lot of quality of life
### Nullable Reference Types
-The only significant architectural change that was finally enabled with this release is [nullable reference types](https://docs.microsoft.com/en-us/dotnet/csharp/whats-new/tutorials/nullable-reference-types). This feature was introduced in .NET Core 3.0 and .NET Standard 2.1, respectfully, but not the .NET Framework. Nullable values are already taken care of by the library. The reason why I never switched to 2.1 before was because the Sims community has historically targeted the .NET Framework, and that doesn't support 2.1.
-
-## 1.1.100
-
-- Switched to Sixam.CST namespace and marked CSTNet namespace as obsolete.
-- Performance improvements.
-- Patch numbers are now in the triple digits.
+The only significant architectural change that was finally enabled with this release is [nullable reference types](https://docs.microsoft.com/en-us/dotnet/csharp/whats-new/tutorials/nullable-reference-types). This feature was introduced in .NET Core 3.0 and .NET Standard 2.1, respectfully, but not the .NET Framework. Nullable values are already taken care of by the library but this ensures that it will be enforced. The reason why I never switched to 2.1 before was because the Sims community has historically targeted the .NET Framework, and that doesn't support anything after 3.0.
### UIText class
@@ -26,7 +20,7 @@ The UIText class allows for travseing in ``//.dir`` directo
## 1.0.3
-- Backport switch to Sixam.CST namespace
+- Backport switch to CSTNet namespace
- Internal improvements.
## 1.0.2
@@ -42,10 +36,6 @@ Despite only being a point release, this includes a major refinement to the norm
The normalizing algorithm has been rewritten to be more efficient and hopefully more reliable. The new algorithm de-constructs each line after converting it to the system's native line ending. Then it searches for the key and returns value. The rewrite also normalizes line endings to match the system's within the entry itself before returning the final output. This should make things more stable and predictable.
-### CSTNet compatibility
-
-For point releases (such as this), Sixam.CST will remain under the CSTNet namespace for compatibility reasons. CSTNet will be moved to Sixam.CST namespace starting with 1.1.
-
### Known issues
- Skipping comments is still a little buggy.