Merge branch 'master' into cleanup-iks

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, sign 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 }}

ci/properties/dotnet-core-desktop.properties.json

@@ -0,0 +1,6 @@
+{
+    "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"]
+}

ci/properties/wpf-dotnet-core.properties.json

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

ci/rust.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
   build:
 

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,16 +43,21 @@ 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 isBlankTemplate = workflowId === "blank";
+        const partnerWorkflow = workflowProperties.categories === null;
+
+        const enabled =
+          (isBlankTemplate || !partnerWorkflow) &&
+          (await checkWorkflow(workflowFilePath, enabledActions));
+
         const workflowDesc: WorkflowDesc = {
           folder,
           id: workflowId,