From a53bec55adbb3b5bb488460426542f42eaadaec6 Mon Sep 17 00:00:00 2001 From: Sophie <29382425+sophietheking@users.noreply.github.com> Date: Tue, 19 Nov 2024 20:01:21 +0100 Subject: [PATCH 1/4] Dependabot supports .NET SDK updates [GA] (#53007) Co-authored-by: Kevin Heis --- data/features/dependabot-dotnet-sdk.yml | 5 +++++ data/reusables/dependabot/supported-package-managers.md | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 data/features/dependabot-dotnet-sdk.yml diff --git a/data/features/dependabot-dotnet-sdk.yml b/data/features/dependabot-dotnet-sdk.yml new file mode 100644 index 000000000000..b9015c1ffc73 --- /dev/null +++ b/data/features/dependabot-dotnet-sdk.yml @@ -0,0 +1,5 @@ +# Reference: issue #4982 +versions: + fpt: '*' + ghec: '*' + ghes: '>=3.16' diff --git a/data/reusables/dependabot/supported-package-managers.md b/data/reusables/dependabot/supported-package-managers.md index 10eb9d356bea..02ee125ad55a 100644 --- a/data/reusables/dependabot/supported-package-managers.md +++ b/data/reusables/dependabot/supported-package-managers.md @@ -8,6 +8,9 @@ Composer | `composer` | v1, v2 | {% octicon "check" aria-l | {% endif %} | | {% ifversion dependabot-version-updates-enhanced-docker-support %} | [Docker](#docker){% else %}Docker{% endif %} | `docker` | v1 | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Not applicable | +| {% ifversion dependabot-dotnet-sdk %} | +.NET SDK | `dotnet-sdk` | >=.NET Core 3.1 | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | Not applicable | Not applicable | Not applicable | +| {% endif %} | Hex | `mix` | v1 | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | elm-package | `elm` | v0.19 | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | git submodule | `gitsubmodule` | Not applicable | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Not applicable | From eef38a554fe0ad0ac7b1aeb28e4f6ba57984708c Mon Sep 17 00:00:00 2001 From: Ashley Date: Tue, 19 Nov 2024 14:07:12 -0500 Subject: [PATCH 2/4] updated search bar for copilot landing page (#53180) --- src/landings/components/CategoryLanding.tsx | 8 ++++---- .../components/CookBookArticleCard.tsx | 6 +++--- src/landings/components/CookBookFilter.tsx | 20 ++++++++----------- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/landings/components/CategoryLanding.tsx b/src/landings/components/CategoryLanding.tsx index 07e294ed6de9..21522a196d65 100644 --- a/src/landings/components/CategoryLanding.tsx +++ b/src/landings/components/CategoryLanding.tsx @@ -86,14 +86,14 @@ export const CategoryLanding = () => {

Spotlight

- - - + + +
-
+

Explore {searchResults.length} prompt articles

diff --git a/src/landings/components/CookBookArticleCard.tsx b/src/landings/components/CookBookArticleCard.tsx index 6e6e67e4ece3..7a1ea99fc6c4 100644 --- a/src/landings/components/CookBookArticleCard.tsx +++ b/src/landings/components/CookBookArticleCard.tsx @@ -96,9 +96,9 @@ export const CookBookArticleCard = ({ /> )}
- -

{title}

- +

+ {title} +

{description}
{tags.map((tag, index) => ( diff --git a/src/landings/components/CookBookFilter.tsx b/src/landings/components/CookBookFilter.tsx index 160a11f3a625..50f40184ccd2 100644 --- a/src/landings/components/CookBookFilter.tsx +++ b/src/landings/components/CookBookFilter.tsx @@ -54,13 +54,13 @@ export const CookBookFilter = ({ }, [isSearchOpen]) return ( - <> -
+
+
e.preventDefault()}>
- + - + -
- +
) } From fc9d914b1621ab932c779e66e22ffc641383dc51 Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Tue, 19 Nov 2024 12:18:29 -0800 Subject: [PATCH 3/4] Tone down message about restoring deleted assets and features (#53188) --- src/assets/scripts/deleted-assets-pr-comment.ts | 6 +++--- src/data-directory/scripts/deleted-features-pr-comment.ts | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/assets/scripts/deleted-assets-pr-comment.ts b/src/assets/scripts/deleted-assets-pr-comment.ts index 561fb461b0c6..99c3f39a3d2a 100755 --- a/src/assets/scripts/deleted-assets-pr-comment.ts +++ b/src/assets/scripts/deleted-assets-pr-comment.ts @@ -60,11 +60,11 @@ async function main({ owner, repo, baseSHA, headSHA }: MainArgs) { return '' } - let markdown = '⚠️ 🙀 **You deleted some assets** 🙀 ⚠️\n\n' + let markdown = '**Please restore deleted assets**\n\n' markdown += - "Even if you don't reference these assets anymore, as of this branch, you should not delete them.\n" + "Even if you don't reference these assets anymore, as of this branch, please do not delete them.\n" markdown += 'They might still be referenced in translated content.\n' - markdown += 'The weekly "Delete orphaned assets" workflow will worry about cleaning those up.\n\n' + markdown += 'The weekly "Delete orphaned assets" workflow will clean those up.\n\n' markdown += '**To *undo* these removals run this command:**\n\n' markdown += ` \`\`\`sh diff --git a/src/data-directory/scripts/deleted-features-pr-comment.ts b/src/data-directory/scripts/deleted-features-pr-comment.ts index 5155b76594d4..271e9ebbcfc1 100644 --- a/src/data-directory/scripts/deleted-features-pr-comment.ts +++ b/src/data-directory/scripts/deleted-features-pr-comment.ts @@ -78,12 +78,11 @@ async function main(owner: string, repo: string, baseSHA: string, headSHA: strin return '' } - let markdown = '⚠️ 🙀 **You deleted some features** 🙀 ⚠️\n\n' + let markdown = '**Please restore deleted features**\n\n' markdown += - "Even if you don't reference these features anymore, as of this branch, you should not delete them.\n" + "Even if you don't reference these features anymore, as of this branch, please do not delete them.\n" markdown += 'They might still be referenced in translated content.\n' - markdown += - 'The weekly "Delete orphaned features" workflow will worry about cleaning those up.\n\n' + markdown += 'The weekly "Delete orphaned features" workflow will clean those up.\n\n' markdown += '**To *undo* these removals run this command:**\n\n' markdown += ` \`\`\`sh From a20ff89e7efc32a97844e17dfb61ecca76f25f4a Mon Sep 17 00:00:00 2001 From: Ashley Date: Tue, 19 Nov 2024 15:21:40 -0500 Subject: [PATCH 4/4] fixed copilot landing page button wrap (#53193) --- src/landings/components/CookBookFilter.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/landings/components/CookBookFilter.tsx b/src/landings/components/CookBookFilter.tsx index 50f40184ccd2..82b09c8c0d0d 100644 --- a/src/landings/components/CookBookFilter.tsx +++ b/src/landings/components/CookBookFilter.tsx @@ -71,7 +71,7 @@ export const CookBookFilter = ({ />
-
+