Merge branch 'main' into main

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

ci/properties/dotnet-core.properties.json

@@ -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"]
-}

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"]
 }

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"]
+}