From e2703411de80dd8531c425992a1b1c4a14ddd307 Mon Sep 17 00:00:00 2001 From: rvuistin Date: Tue, 10 Oct 2023 01:00:07 +0000 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20files=20with=20dotn?= =?UTF-8?q?et-file=20sync=20#=20devlooped/oss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Honor the PackReadme=false property https://github.com/devlooped/oss/commit/1bf1eac - Append missing trailing path to directory for icon/readme https://github.com/devlooped/oss/commit/5cec43d - Update dependabot.yml with some default groupings https://github.com/devlooped/oss/commit/cba10bb - Add System.IdentityModel group https://github.com/devlooped/oss/commit/e7d18ae - Add MS.IdentityModel to identity group https://github.com/devlooped/oss/commit/14d1868 - Exclude System.IdentityModel from System group https://github.com/devlooped/oss/commit/35ca3f3 - Add .sass-cache to ignores https://github.com/devlooped/oss/commit/d65f9c7 - Move .sass-cache down alongside other jekyll folders https://github.com/devlooped/oss/commit/551d4e0 - Ignore azure functions local settings https://github.com/devlooped/oss/commit/4bd7025 --- .github/dependabot.yml | 31 +++++++++++++++++++++++++++++++ .gitignore | 2 ++ .netconfig | 16 ++++++++-------- src/Directory.Build.props | 4 ++-- src/Directory.Build.targets | 6 +++--- 5 files changed, 46 insertions(+), 13 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f551596..ed06dbe 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,3 +7,34 @@ updates: directory: / schedule: interval: daily + groups: + Azure: + patterns: + - "Azure*" + - "Microsoft.Azure*" + Identity: + patterns: + - "System.IdentityModel*" + - "Microsoft.IdentityModel*" + System: + patterns: + - "System*" + exclude-patterns: + - "System.IdentityModel*" + Extensions: + patterns: + - "Microsoft.Extensions*" + Web: + patterns: + - "Microsoft.AspNetCore*" + Tests: + patterns: + - "Microsoft.NET.Tests*" + - "xunit*" + - "coverlet*" + ThisAssembly: + patterns: + - "ThisAssembly*" + ProtoBuf: + patterns: + - "protobuf-*" diff --git a/.gitignore b/.gitignore index 0c18de7..a438e35 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ TestResults .vs .vscode .idea +local.settings.json *.suo *.sdf @@ -31,5 +32,6 @@ node_modules _site .jekyll-metadata .jekyll-cache +.sass-cache Gemfile.lock package-lock.json diff --git a/.netconfig b/.netconfig index 9e30a9e..ac5ee4d 100644 --- a/.netconfig +++ b/.netconfig @@ -22,8 +22,8 @@ weak [file ".github/dependabot.yml"] url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml - sha = 4f070a477b4162a280f02722ae666376ae4fcc71 - etag = 35f2134fff3b0235ff8dac8618a76198c8ef533ad2f29628bbb435cd1134d638 + sha = 35ca3f3405452465058d89005f8a88a65847c377 + etag = f8080f8f04d87529e90d9a66751d304a7141196fb9734aa2d110784e52e66898 weak [file ".github/workflows/build.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml @@ -32,8 +32,8 @@ weak [file ".gitignore"] url = https://github.com/devlooped/oss/blob/main/.gitignore - sha = b87a8a795a4c2b6830602225c066c11108552a99 - etag = 96e0860052044780f1fc9e3bdfbee09d82d5dddb8b1217d67460fc7330a64dd8 + sha = 4bd702593c10df189cd4a0f6e6fb72e55de02198 + etag = f11dcc8c057bd2f526aa9c7090c9568d1656fafaaedc6719da42a00283018ffa weak [file "Directory.Build.rsp"] url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp @@ -52,13 +52,13 @@ weak [file "src/Directory.Build.props"] url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props - sha = 6ae80a175a8f926ac5d9ffb0f6afd55d85cc9320 - etag = 69d4b16c14d5047b3ed812dbf556b0b8d77deb86f73af04b9bd3640220056fa8 + sha = 1bf1eacc7ac3920d52c8e7045bfa34abc7c05302 + etag = e9fd8ef4740d5559fa495580b04ec3437b99edbfb8452813907337f9374c1282 weak [file "src/Directory.Build.targets"] url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets - sha = 1514d15399a7d545ad92a0e9d57dc8295fdd6af8 - etag = 428f80b0786ff17b836c7a5b0640948724855d17933e958642b22849ac00dadb + sha = 1bf1eacc7ac3920d52c8e7045bfa34abc7c05302 + etag = 7cb1421f00d9f6f4c00f0ca98e485dcadb927cfa6b3f0b5d4fb212525d2ce9c0 weak [file ".github/workflows/changelog.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 6b9a668..4527560 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -26,10 +26,10 @@ icon.png - readme.md + readme.md icon.png - readme.md + readme.md true true diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 5bd4019..0cb1e4e 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -35,16 +35,16 @@ + Condition="'$(PackReadme)' != 'false' and '$(PackageReadmeFile)' != ''" /> + Condition="Exists('$(MSBuildThisFileDirectory)icon.png') and !Exists('$(MSBuildProjectDirectory)\icon.png')" /> + Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildThisFileDirectory)readme.md') and !Exists('$(MSBuildProjectDirectory)\readme.md')" />