diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
deleted file mode 100644
index 848b7f5..0000000
--- a/.github/workflows/prerelease.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Prerelease
-
-on:
-  push:
-    branches:
-      - prerelease
-  pull_request:
-    branches: [ prerelease ]
-
-jobs:
-  build:
-
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 8.0.x
-    - name: Install NUnit.ConsoleRunner
-      run: nuget install NUnit.ConsoleRunner -Version 3.17.0 -DirectDownload -OutputDirectory .       
-    - name: Install dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release --no-restore /p:version=2.0.${{ github.run_number }}-prerelease
-    - name: Tests
-      run: ./NUnit.ConsoleRunner.3.17.0/tools/nunit3-console.exe  "Sharp7.Rx.Tests\bin\Release\net8.0\Sharp7.Rx.Tests.dll"
-    - name: NugetPublish
-      run: dotnet nuget push Sharp7.Rx\bin\Release\Sharp7.Rx.2.0.${{ github.run_number }}-prerelease.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_DEPLOY_KEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b1b8025..2685dcb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,42 +1,37 @@
-name: Release
+name: Release
 
 on:
   push:
     branches:
       - master
+      - prerelease
   pull_request:
     branches: [ master ]
 
+
 jobs:
   build:
 
     runs-on: windows-latest
+    env:
+      version: 2.0.${{ github.run_number }}${{ github.ref == 'refs/heads/master' && '' || 'prerelease' }}
 
     steps:
     - uses: actions/checkout@v2
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 8.0.x
     - name: Install NUnit.ConsoleRunner
-      run: nuget install NUnit.ConsoleRunner -Version 3.13.0 -DirectDownload -OutputDirectory .       
+      run: nuget install NUnit.ConsoleRunner -Version 3.17.0 -DirectDownload -OutputDirectory .
+    - name: Install dependencies
+      run: dotnet restore
     - name: Install dependencies
       run: dotnet restore
     - name: Build
-      run: dotnet build --configuration Release --no-restore /p:version=1.1.${{ github.run_number }}
+      run: dotnet build --configuration Release --no-restore /p:version=${{ env.version }}
     - name: Tests
-      run: ./NUnit.ConsoleRunner.3.13.0/tools/nunit3-console.exe  "Sharp7.Rx.Tests\bin\Release\net461\Sharp7.Rx.Tests.dll"
+      run: ./NUnit.ConsoleRunner.3.17.0/tools/nunit3-console.exe  "Sharp7.Rx.Tests\bin\Release\net8.0\Sharp7.Rx.Tests.dll"
     - name: NugetPublish
-      run: dotnet nuget push Sharp7.Rx\bin\Release\Sharp7.Rx.1.1.${{ github.run_number }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_DEPLOY_KEY }}
-      if: github.event_name != 'pull_request'
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: 1.1.${{ github.run_number }}
-        release_name: 1.1.${{ github.run_number }}
-        draft: false
-        prerelease: true
-      if: github.event_name != 'pull_request'
\ No newline at end of file
+      if: github.event_name == 'push'
+      run: dotnet nuget push Sharp7.Rx\bin\Release\Sharp7.Rx.2.0.${{ env.version }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_DEPLOY_KEY }}
diff --git a/Sharp7.Rx.sln b/Sharp7.Rx.sln
index 033c14e..e211d65 100644
--- a/Sharp7.Rx.sln
+++ b/Sharp7.Rx.sln
@@ -1,11 +1,23 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2041
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34728.123
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sharp7.Rx", "Sharp7.Rx\Sharp7.Rx.csproj", "{690A7E0E-BE95-49AC-AF2F-7FEA2F63204A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharp7.Rx.Tests", "Sharp7.Rx.Tests\Sharp7.Rx.Tests.csproj", "{1BDD07D2-6540-4ACF-81E7-98300421073B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sharp7.Rx.Tests", "Sharp7.Rx.Tests\Sharp7.Rx.Tests.csproj", "{1BDD07D2-6540-4ACF-81E7-98300421073B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{3A9DEBA7-8F53-4554-869C-7C99F0A4932E}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.gitignore = .gitignore
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflow", "Workflow", "{1CFDA2EA-49CF-4B96-A9C9-B12B21B3D78E}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\release.yml = .github\workflows\release.yml
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,6 +37,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{1CFDA2EA-49CF-4B96-A9C9-B12B21B3D78E} = {3A9DEBA7-8F53-4554-869C-7C99F0A4932E}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {ABA1FD47-15EE-4588-9BA7-0116C635BFC4}
 	EndGlobalSection