From 4dae3bbf12e6818e83374b9862805590f0f80e30 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Thu, 10 Dec 2020 17:35:47 +0000 Subject: [PATCH 1/4] Update .NET Core branding to .NET Per the branding that .NET 5.0 is the next release after .NET Core 3.1. --- ci/{dotnet-core-desktop.yml => dotnet-desktop.yml} | 0 ci/{dotnet-core.yml => dotnet.yml} | 4 ++-- ci/properties/dotnet-core.properties.json | 6 ------ ...sktop.properties.json => dotnet-desktop.properties.json} | 6 +++--- ci/properties/dotnet.properties.json | 6 ++++++ icons/dotnetcore.svg | 1 - 6 files changed, 11 insertions(+), 12 deletions(-) rename ci/{dotnet-core-desktop.yml => dotnet-desktop.yml} (100%) rename ci/{dotnet-core.yml => dotnet.yml} (91%) delete mode 100644 ci/properties/dotnet-core.properties.json rename ci/properties/{dotnet-core-desktop.properties.json => dotnet-desktop.properties.json} (56%) create mode 100644 ci/properties/dotnet.properties.json delete mode 100644 icons/dotnetcore.svg 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 91% rename from ci/dotnet-core.yml rename to ci/dotnet.yml index 9ee1a7d..4cb32c0 100644 --- a/ci/dotnet-core.yml +++ b/ci/dotnet.yml @@ -1,4 +1,4 @@ -name: .NET Core +name: .NET on: push: @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup .NET Core + - name: Setup .NET uses: actions/setup-dotnet@v1 with: dotnet-version: 3.1.301 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 @@ - \ No newline at end of file From b05136d6b3e487fb91fce91c0f3267de1a532efe Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Thu, 10 Dec 2020 17:41:44 +0000 Subject: [PATCH 2/4] Nit: Title restore step with "restore" This is more like how folks generally refer to it in .NET-land. --- ci/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/dotnet.yml b/ci/dotnet.yml index 4cb32c0..354d2dc 100644 --- a/ci/dotnet.yml +++ b/ci/dotnet.yml @@ -17,7 +17,7 @@ jobs: 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 From 0c4ccab691ac8790d8682218a943e8ffacc8cf97 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Thu, 10 Dec 2020 17:44:30 +0000 Subject: [PATCH 3/4] Don't specify configuration for dotnet build Since `dotnet test` below didn't specify the Release configuration, it used the default configuration (generally Debug). --- ci/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/dotnet.yml b/ci/dotnet.yml index 354d2dc..198096c 100644 --- a/ci/dotnet.yml +++ b/ci/dotnet.yml @@ -20,6 +20,6 @@ jobs: - 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 From 2c1a53ec9376a511d56922f740749cafaeb92f84 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Thu, 10 Dec 2020 17:42:57 +0000 Subject: [PATCH 4/4] Don't build when running tests If the workflow is going to split restore, build, and test into separate steps, each should use the result of the prior. Build was invoked with `--no-restore` but test was restoring, building, and then testing. --- ci/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/dotnet.yml b/ci/dotnet.yml index 198096c..aa0a093 100644 --- a/ci/dotnet.yml +++ b/ci/dotnet.yml @@ -22,4 +22,4 @@ jobs: - name: Build run: dotnet build --no-restore - name: Test - run: dotnet test --no-restore --verbosity normal + run: dotnet test --no-build --verbosity normal