From dd7519f49ef5673e46a4eaafa1f862977510b465 Mon Sep 17 00:00:00 2001 From: Edward Skrod Date: Sun, 3 May 2020 07:57:14 -0400 Subject: [PATCH 1/7] Rename the workflow files and properties files from WPF to Desktop. --- ci/{wpf-dotnet-core.yml => dotnet-core-desktop.yml} | 10 +++++----- ci/properties/dotnet-core-desktop.properties.json | 6 ++++++ ci/properties/wpf-dotnet-core.properties.json | 6 ------ 3 files changed, 11 insertions(+), 11 deletions(-) rename ci/{wpf-dotnet-core.yml => dotnet-core-desktop.yml} (94%) create mode 100644 ci/properties/dotnet-core-desktop.properties.json delete mode 100644 ci/properties/wpf-dotnet-core.properties.json diff --git a/ci/wpf-dotnet-core.yml b/ci/dotnet-core-desktop.yml similarity index 94% rename from ci/wpf-dotnet-core.yml rename to ci/dotnet-core-desktop.yml index 80ec3e5..0b9e454 100644 --- a/ci/wpf-dotnet-core.yml +++ b/ci/dotnet-core-desktop.yml @@ -3,9 +3,9 @@ # separate terms of service, privacy policy, and support # documentation. -# This workflow will build, test and package a WPF desktop application +# This workflow will build, test and package a WPF or Windows Forms desktop application # built on .NET Core. -# To learn how to migrate your existing WPF application to .NET Core, +# To learn how to migrate your existing application to .NET Core, # refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework # # To configure this workflow: @@ -36,7 +36,7 @@ # For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications, # refer to https://github.com/microsoft/github-actions-for-desktop-apps -name: WPF .NET Core +name: .NET Core Desktop on: push: @@ -81,8 +81,8 @@ jobs: - name: Execute unit tests run: dotnet test - # Restore the WPF application to populate the obj folder with RuntimeIdentifiers - - name: Restore the WPF application + # Restore the application to populate the obj folder with RuntimeIdentifiers + - name: Restore the application run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration env: Configuration: ${{ matrix.configuration }} diff --git a/ci/properties/dotnet-core-desktop.properties.json b/ci/properties/dotnet-core-desktop.properties.json new file mode 100644 index 0000000..e796c4a --- /dev/null +++ b/ci/properties/dotnet-core-desktop.properties.json @@ -0,0 +1,6 @@ +{ + "name": ".NET Core Desktop", + "description": "Build, test and publish a Wpf or Windows Forms application built on .NET Core.", + "iconName": "dotnetcore", + "categories": ["C#", "Visual Basic", "WPF", ".NET", "WindowsForms"] +} \ No newline at end of file diff --git a/ci/properties/wpf-dotnet-core.properties.json b/ci/properties/wpf-dotnet-core.properties.json deleted file mode 100644 index f43ea35..0000000 --- a/ci/properties/wpf-dotnet-core.properties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "WPF .NET Core", - "description": "Build, test and publish a Wpf application built on .NET Core.", - "iconName": "dotnetcore", - "categories": ["C#", "Visual Basic", "WPF", ".NET"] -} \ No newline at end of file From 6ea0e1fa1691de713c156c6925517d4f2e88d7d1 Mon Sep 17 00:00:00 2001 From: Edward Skrod Date: Sun, 3 May 2020 08:04:10 -0400 Subject: [PATCH 2/7] Reword the description. --- ci/properties/dotnet-core-desktop.properties.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/properties/dotnet-core-desktop.properties.json b/ci/properties/dotnet-core-desktop.properties.json index e796c4a..0299220 100644 --- a/ci/properties/dotnet-core-desktop.properties.json +++ b/ci/properties/dotnet-core-desktop.properties.json @@ -1,6 +1,6 @@ { "name": ".NET Core Desktop", - "description": "Build, test and publish a Wpf or Windows Forms application built on .NET Core.", + "description": "Build, test, sign and publish a desktop application built on .NET Core.", "iconName": "dotnetcore", "categories": ["C#", "Visual Basic", "WPF", ".NET", "WindowsForms"] } \ No newline at end of file From fc935ad05273b7b0a0e889cee47b1807c139f8ac Mon Sep 17 00:00:00 2001 From: Edward Skrod Date: Sun, 3 May 2020 08:12:18 -0400 Subject: [PATCH 3/7] Added 'sign' to the workflow description. --- ci/dotnet-core-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/dotnet-core-desktop.yml b/ci/dotnet-core-desktop.yml index 0b9e454..ed37b70 100644 --- a/ci/dotnet-core-desktop.yml +++ b/ci/dotnet-core-desktop.yml @@ -3,7 +3,7 @@ # separate terms of service, privacy policy, and support # documentation. -# This workflow will build, test and package a WPF or Windows Forms desktop application +# This workflow will build, test, sign and package a WPF or Windows Forms desktop application # built on .NET Core. # To learn how to migrate your existing application to .NET Core, # refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework From 15c78f880211e02929edf5ff0d59c225e9f11c69 Mon Sep 17 00:00:00 2001 From: Christopher Schleiden Date: Thu, 21 May 2020 11:09:51 -0700 Subject: [PATCH 4/7] Do not sync workflows without categories to GHES --- script/sync-ghes/index.ts | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/script/sync-ghes/index.ts b/script/sync-ghes/index.ts index 5390664..78a0dda 100755 --- a/script/sync-ghes/index.ts +++ b/script/sync-ghes/index.ts @@ -11,6 +11,16 @@ interface WorkflowDesc { iconType?: "svg" | "octicon"; } +interface WorkflowProperties { + name: string; + + description: string; + + iconName?: string; + + categories: string[] | null; +} + interface WorkflowsCheckResult { compatibleWorkflows: WorkflowDesc[]; incompatibleWorkflows: WorkflowDesc[]; @@ -33,15 +43,18 @@ async function checkWorkflows( for (const e of dir) { if (e.isFile()) { const workflowFilePath = join(folder, e.name); - const enabled = await checkWorkflow(workflowFilePath, enabledActions); - const workflowId = basename(e.name, extname(e.name)); - const workflowProperties = require(join( + const workflowProperties: WorkflowProperties = require(join( folder, "properties", `${workflowId}.properties.json` )); const iconName: string | undefined = workflowProperties["iconName"]; + const partnerWorkflow = workflowProperties.categories === null; + + const enabled = + !partnerWorkflow && + (await checkWorkflow(workflowFilePath, enabledActions)); const workflowDesc: WorkflowDesc = { folder, From 0ac09546734a9b5eac78e60ccda8dae05f1c7d79 Mon Sep 17 00:00:00 2001 From: Edward Skrod Date: Thu, 21 May 2020 17:33:37 -0400 Subject: [PATCH 5/7] Remove WindowsForms --- ci/properties/dotnet-core-desktop.properties.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/properties/dotnet-core-desktop.properties.json b/ci/properties/dotnet-core-desktop.properties.json index 0299220..9b2aa35 100644 --- a/ci/properties/dotnet-core-desktop.properties.json +++ b/ci/properties/dotnet-core-desktop.properties.json @@ -2,5 +2,5 @@ "name": ".NET Core Desktop", "description": "Build, test, sign and publish a desktop application built on .NET Core.", "iconName": "dotnetcore", - "categories": ["C#", "Visual Basic", "WPF", ".NET", "WindowsForms"] + "categories": ["C#", "Visual Basic", "WPF", ".NET"] } \ No newline at end of file From de4411e09783092951dd168aa2651c251f4eb765 Mon Sep 17 00:00:00 2001 From: Christopher Schleiden Date: Thu, 21 May 2020 14:34:40 -0700 Subject: [PATCH 6/7] Ensure "blank" template is available --- script/sync-ghes/index.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/sync-ghes/index.ts b/script/sync-ghes/index.ts index 78a0dda..ea347cf 100755 --- a/script/sync-ghes/index.ts +++ b/script/sync-ghes/index.ts @@ -50,10 +50,12 @@ async function checkWorkflows( `${workflowId}.properties.json` )); const iconName: string | undefined = workflowProperties["iconName"]; + + const isBlankTemplate = workflowId === "blank"; const partnerWorkflow = workflowProperties.categories === null; const enabled = - !partnerWorkflow && + (isBlankTemplate || !partnerWorkflow) && (await checkWorkflow(workflowFilePath, enabledActions)); const workflowDesc: WorkflowDesc = { From 15d943af34246de3d046937a16740283b10808aa Mon Sep 17 00:00:00 2001 From: Nadav Ivgi Date: Sun, 24 May 2020 08:21:13 +0300 Subject: [PATCH 7/7] Rust: Enable cargo colors for prettier output --- ci/rust.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/rust.yml b/ci/rust.yml index 6738b0b..3c13d1b 100644 --- a/ci/rust.yml +++ b/ci/rust.yml @@ -6,6 +6,9 @@ on: pull_request: branches: [ master ] +env: + CARGO_TERM_COLOR: always + jobs: build: