diff --git a/ci/dotnet-core-desktop.yml b/ci/dotnet-desktop.yml
similarity index 100%
rename from ci/dotnet-core-desktop.yml
rename to ci/dotnet-desktop.yml
diff --git a/ci/dotnet-core.yml b/ci/dotnet.yml
similarity index 62%
rename from ci/dotnet-core.yml
rename to ci/dotnet.yml
index 9ee1a7d..aa0a093 100644
--- a/ci/dotnet-core.yml
+++ b/ci/dotnet.yml
@@ -1,4 +1,4 @@
-name: .NET Core
+name: .NET
 
 on:
   push:
@@ -13,13 +13,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 3.1.301
-    - name: Install dependencies
+    - name: Restore dependencies
       run: dotnet restore
     - name: Build
-      run: dotnet build --configuration Release --no-restore
+      run: dotnet build --no-restore
     - name: Test
-      run: dotnet test --no-restore --verbosity normal
+      run: dotnet test --no-build --verbosity normal
diff --git a/ci/properties/dotnet-core.properties.json b/ci/properties/dotnet-core.properties.json
deleted file mode 100644
index 3386a3d..0000000
--- a/ci/properties/dotnet-core.properties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "name": ".NET Core",
-    "description": "Build and test a .NET Core or ASP.NET Core project.",
-    "iconName": "dotnetcore",
-    "categories": ["C#", "F#", "Visual Basic", "ASP", "ASP.NET", ".NET"]
-}
diff --git a/ci/properties/dotnet-core-desktop.properties.json b/ci/properties/dotnet-desktop.properties.json
similarity index 56%
rename from ci/properties/dotnet-core-desktop.properties.json
rename to ci/properties/dotnet-desktop.properties.json
index 9b2aa35..f6e1cb8 100644
--- a/ci/properties/dotnet-core-desktop.properties.json
+++ b/ci/properties/dotnet-desktop.properties.json
@@ -1,6 +1,6 @@
 {
-    "name": ".NET Core Desktop",
-    "description": "Build, test, sign and publish a desktop application built on .NET Core.",
-    "iconName": "dotnetcore",
+    "name": ".NET Desktop",
+    "description": "Build, test, sign and publish a desktop application built on .NET.",
+    "iconName": "dotnet",
     "categories": ["C#", "Visual Basic", "WPF", ".NET"]
 }
\ No newline at end of file
diff --git a/ci/properties/dotnet.properties.json b/ci/properties/dotnet.properties.json
new file mode 100644
index 0000000..b3feafb
--- /dev/null
+++ b/ci/properties/dotnet.properties.json
@@ -0,0 +1,6 @@
+{
+    "name": ".NET",
+    "description": "Build and test a .NET or ASP.NET Core project.",
+    "iconName": "dotnet",
+    "categories": ["C#", "F#", "Visual Basic", "ASP", "ASP.NET", ".NET"]
+}
diff --git a/icons/dotnetcore.svg b/icons/dotnetcore.svg
deleted file mode 100644
index 6d31060..0000000
--- a/icons/dotnetcore.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="none" height="48" width="48" xmlns="http://www.w3.org/2000/svg"><path d="M24 48c13.255 0 24-10.745 24-24S37.255 0 24 0 0 10.745 0 24s10.745 24 24 24z" fill="#5c2d91"/><g fill="#fff"><path d="M7.923 6.657a23.67 23.67 0 1033.42 33.42z" opacity=".1"/><path d="M6.133 27.554a.999.999 0 01-.74-.31 1.02 1.02 0 01-.303-.74 1.036 1.036 0 01.303-.74.991.991 0 01.74-.318 1.013 1.013 0 01.74.318 1.028 1.028 0 01.31.74 1.013 1.013 0 01-.31.74 1.02 1.02 0 01-.74.31zM20.83 27.369h-1.937l-6.931-10.755a4.438 4.438 0 01-.43-.844h-.059c.066.615.09 1.232.074 1.85v9.749H9.972V13.884h2.049l6.746 10.563c.28.44.463.74.547.903h.037a14.26 14.26 0 01-.096-1.983v-9.483h1.576zM31.497 27.369H24.33V13.884h6.835v1.428h-5.222v4.482h4.867v1.42h-4.867v4.676h5.563zM42.082 15.312h-3.92v12.057h-1.576V15.312H32.71v-1.428h9.372z"/></g><path d="M19.98 36.541a3.647 3.647 0 01-1.716.363 2.766 2.766 0 01-2.123-.85 3.151 3.151 0 01-.799-2.22 3.3 3.3 0 01.895-2.411 3.048 3.048 0 012.278-.918c.506-.017 1.01.071 1.48.26v.739a2.959 2.959 0 00-1.48-.37 2.263 2.263 0 00-1.738.74c-.461.525-.7 1.21-.666 1.908a2.567 2.567 0 00.622 1.813 2.116 2.116 0 001.634.673 3.062 3.062 0 001.62-.415zM23.005 36.904a2.056 2.056 0 01-1.575-.658 2.3 2.3 0 01-.585-1.65 2.397 2.397 0 01.614-1.746 2.22 2.22 0 011.65-.628 1.99 1.99 0 011.546.613c.393.474.591 1.08.555 1.694a2.382 2.382 0 01-.6 1.702 2.1 2.1 0 01-1.605.673zm.052-4.046a1.354 1.354 0 00-1.08.466 1.916 1.916 0 00-.4 1.287c-.025.45.117.892.4 1.242a1.369 1.369 0 001.08.46 1.302 1.302 0 001.058-.445c.269-.367.4-.818.37-1.272.029-.457-.102-.91-.37-1.28a1.294 1.294 0 00-1.058-.458zM28.664 33.08a.873.873 0 00-.54-.141.91.91 0 00-.74.429c-.22.349-.326.757-.303 1.169V36.8h-.74v-4.438h.74v.925c.081-.286.243-.543.466-.74.193-.167.44-.26.695-.259.143-.006.286.014.422.06zM32.999 34.766h-3.13c-.02.414.114.82.378 1.14a1.376 1.376 0 001.05.399 2.22 2.22 0 001.376-.496v.666c-.457.301-.999.449-1.546.421a1.879 1.879 0 01-1.48-.606 2.478 2.478 0 01-.54-1.701 2.426 2.426 0 01.585-1.687 1.886 1.886 0 011.48-.65 1.672 1.672 0 011.346.561c.34.45.509 1.006.473 1.568zm-.74-.599a1.48 1.48 0 00-.296-.954 1.013 1.013 0 00-.813-.34 1.147 1.147 0 00-.851.362 1.635 1.635 0 00-.437.94z" fill="#f2f2f2"/></svg>
\ No newline at end of file