diff --git a/.github/workflows/rapid-cli-ci.yml b/.github/workflows/rapid-cli-ci.yml
index f76d60fa..4b66bb5d 100644
--- a/.github/workflows/rapid-cli-ci.yml
+++ b/.github/workflows/rapid-cli-ci.yml
@@ -16,9 +16,9 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.301
+          dotnet-version: 3.1.402
 
-      - name: Install dependencies
+      - name: Restore
         run: dotnet restore ./tools/rsdl/dotnet/rapid/rapid.csproj
 
       - name: Build
diff --git a/.github/workflows/rapid-cli-release.yml b/.github/workflows/rapid-cli-release.yml
index 983545b1..9095395c 100644
--- a/.github/workflows/rapid-cli-release.yml
+++ b/.github/workflows/rapid-cli-release.yml
@@ -14,16 +14,19 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.301
+          dotnet-version: 3.1.402
 
-      - name: Install dependencies
+      - name: Restore
         run: dotnet restore ./tools/rsdl/dotnet/rapid/rapid.csproj
 
-      - name: Create NuGet Package
-        run: dotnet pack ./tools/rsdl/dotnet/rapid/rapid.csproj -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/oasis-open/odata-rapid/releases/tag/${{ github.event.release.tag_name }}"
+      - name: Build
+        run: dotnet build ./tools/rsdl/dotnet/rapid/rapid.csproj --configuration release --no-restore
+
+      - name: Pack
+        run: dotnet pack ./tools/rsdl/dotnet/rapid/rapid.csproj --configuration release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/oasis-open/odata-rapid/releases/tag/${{ github.event.release.tag_name }}"
         working-directory: ./src
 
-      - name: Archive NuGet Package
+      - name: Publish artifact
         uses: actions/upload-artifact@v2
         with:
           path: ./tools/rsdl/dotnet/rapid/nupkg
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..4dcd3365
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,11 @@
+{
+    "cSpell.words": [
+        "dotnet",
+        "nuget",
+        "nupkg",
+        "rapid",
+        "rsdl",
+        "tools",
+        "tools rsdl dotnet rapid nupkg"
+    ]
+}
\ No newline at end of file