Skip to content

Commit 04a11fd

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Honor the PackReadme=false property devlooped/oss@1bf1eac - Fix dependabot group for tests devlooped/oss@49661db - NoTargets/Traversal SDKs now support central package versions too devlooped/oss@afca922 - Enable floating versions for central packages by default devlooped/oss@b1d14c6 - Make sure build runs before pack devlooped/oss@ede013a - Switch to PackOnBuild=true and remove pack step devlooped/oss@6e7a3ab - Ignore azure functions local settings devlooped/oss@4bd7025 - Update .gitignore with BenchmarkDotNet artifacts default path devlooped/oss@e20e906 - Remove whitespace and add results to ignore devlooped/oss@ef852e7
1 parent 2796b73 commit 04a11fd

File tree

10 files changed

+84
-111
lines changed

10 files changed

+84
-111
lines changed

‎.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ updates:
2929
- "Microsoft.AspNetCore*"
3030
Tests:
3131
patterns:
32-
- "Microsoft.NET.Tests*"
32+
- "Microsoft.NET.Test*"
3333
- "xunit*"
3434
- "coverlet*"
3535
ThisAssembly:

‎.github/workflows/build.yml

Lines changed: 51 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,47 +19,75 @@ env:
1919
DOTNET_NOLOGO: true
2020
VersionPrefix: 42.42.${{ github.run_number }}
2121
VersionLabel: ${{ github.ref }}
22-
22+
PackOnBuild: true
23+
GeneratePackageOnBuild: true
24+
2325
defaults:
2426
run:
2527
shell: bash
2628

2729
jobs:
28-
build:
30+
os-matrix:
2931
runs-on: ubuntu-latest
32+
outputs:
33+
matrix: ${{ steps.lookup.outputs.matrix }}
3034
steps:
3135
- name: 🤘 checkout
3236
uses: actions/checkout@v2
33-
34-
- name: 🤖 defaults
35-
uses: devlooped/actions-bot@v1
36-
with:
37-
name: ${{ secrets.BOT_NAME }}
38-
email: ${{ secrets.BOT_EMAIL }}
39-
gh_token: ${{ secrets.GH_TOKEN }}
40-
github_token: ${{ secrets.GITHUB_TOKEN }}
41-
42-
- name: ⏬ download
43-
env:
44-
GCM_CREDENTIAL_STORE: cache
37+
38+
- name: 🔎 lookup
39+
id: lookup
40+
shell: pwsh
4541
run: |
46-
dotnet tool update -g dotnet-gcm
47-
dotnet gcm store --protocol=https --host=github.com --username=$env:GITHUB_ACTOR --password=$env:GH_TOKEN
48-
gh auth status
49-
50-
gh release download --output obj/win-x86_64.zip --clobber -p *CLI*-win-x86_64.zip --repo HandBrake/HandBrake
51-
unzip obj/win-x86_64.zip -d src/handbrake.win/runtime
42+
$path = './.github/workflows/os-matrix.json'
43+
$os = if (test-path $path) { cat $path } else { '["ubuntu-latest"]' }
44+
echo "matrix=$os" >> $env:GITHUB_OUTPUT
45+
46+
build:
47+
needs: os-matrix
48+
name: build-${{ matrix.os }}
49+
runs-on: ${{ matrix.os }}
50+
strategy:
51+
matrix:
52+
os: ${{ fromJSON(needs.os-matrix.outputs.matrix) }}
53+
steps:
54+
- name: 🤘 checkout
55+
uses: actions/checkout@v2
56+
with:
57+
submodules: recursive
58+
fetch-depth: 0
5259

5360
- name: 🙏 build
54-
run: dotnet build -m:1 -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER"
61+
run: dotnet build -m:1
62+
63+
- name: ⚙ GNU grep
64+
if: matrix.os == 'macOS-latest'
65+
run: |
66+
brew install grep
67+
echo 'export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"' >> .bash_profile
5568
56-
- name: 📦 pack
57-
run: dotnet pack -m:1 -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER"
69+
- name: 🧪 test
70+
uses: ./.github/workflows/test
5871

72+
# Only push CI package to sleet feed if building on ubuntu (fastest)
5973
- name: 🚀 sleet
6074
env:
6175
SLEET_CONNECTION: ${{ secrets.SLEET_CONNECTION }}
6276
if: env.SLEET_CONNECTION != ''
6377
run: |
6478
dotnet tool install -g --version 4.0.18 sleet
6579
sleet push bin --config none -f --verbose -p "SLEET_FEED_CONTAINER=nuget" -p "SLEET_FEED_CONNECTIONSTRING=${{ secrets.SLEET_CONNECTION }}" -p "SLEET_FEED_TYPE=azure" || echo "No packages found"
80+
81+
dotnet-format:
82+
runs-on: ubuntu-latest
83+
steps:
84+
- name: 🤘 checkout
85+
uses: actions/checkout@v2
86+
with:
87+
submodules: recursive
88+
fetch-depth: 0
89+
90+
- name: ✓ ensure format
91+
run: |
92+
dotnet format whitespace --verify-no-changes -v:diag --exclude ~/.nuget
93+
dotnet format style --verify-no-changes -v:diag --exclude ~/.nuget

‎.github/workflows/publish.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ on:
1010
env:
1111
DOTNET_NOLOGO: true
1212
Configuration: Release
13-
13+
PackOnBuild: true
14+
GeneratePackageOnBuild: true
15+
1416
jobs:
1517
publish:
1618
runs-on: ubuntu-latest
@@ -27,8 +29,5 @@ jobs:
2729
- name: 🧪 test
2830
uses: ./.github/workflows/test
2931

30-
- name: 📦 pack
31-
run: dotnet pack -m:1 -p:version=${GITHUB_REF#refs/*/v}
32-
3332
- name: 🚀 nuget
3433
run: dotnet nuget push ./bin/**/*.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}} --skip-duplicate

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ obj
44
artifacts
55
pack
66
TestResults
7+
results
8+
BenchmarkDotNet.Artifacts
79
.vs
810
.vscode
911
.idea
12+
local.settings.json
1013

1114
*.suo
1215
*.sdf

‎.netconfig

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
weak
2525
[file ".github/dependabot.yml"]
2626
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
27-
sha = 35ca3f3405452465058d89005f8a88a65847c377
28-
etag = f8080f8f04d87529e90d9a66751d304a7141196fb9734aa2d110784e52e66898
27+
sha = 49661dbf0720cde93eb5569be7523b5912351560
28+
etag = c147ea2f3431ca0338c315c4a45b56ee233c4d30f8d6ab698d0e1980a257fd6a
2929
weak
3030
[file ".github/release.yml"]
3131
url = https://github.com/devlooped/oss/blob/main/.github/release.yml
@@ -34,8 +34,8 @@
3434
weak
3535
[file ".github/workflows/build.yml"]
3636
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
37-
sha = 13d67e2cf3f786c8189364fd29332aaa7dc575dc
38-
etag = c616df0877fba60002ccfc0397e9f731ddb22acbbb195a0598fedd4cac5f3135
37+
sha = 6e7a3ab866a523d036e95066ab63351b63cc8a24
38+
etag = 11c16867077f1d67b23a75e83556d3cd761aa6a69fd6c6bbed7d0f6b202c33da
3939
weak
4040
[file ".github/workflows/changelog.config"]
4141
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.config
@@ -59,8 +59,8 @@
5959
weak
6060
[file ".github/workflows/publish.yml"]
6161
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
62-
sha = d3022567c9ef2bc9461511e53b8abe065afdf03b
63-
etag = 58601b5a71c805647ab26e84053acdfb8d174eaa93330487af8a5503753c5707
62+
sha = 6e7a3ab866a523d036e95066ab63351b63cc8a24
63+
etag = d2ca0380f60f4396fcf250abe334da9a3edeac6612f9d77e5dd8a93d30e46b6c
6464
weak
6565
[file ".github/workflows/sponsor.yml"]
6666
url = https://github.com/devlooped/oss/blob/main/.github/workflows/sponsor.yml
@@ -74,8 +74,8 @@
7474
weak
7575
[file ".gitignore"]
7676
url = https://github.com/devlooped/oss/blob/main/.gitignore
77-
sha = 551d4e0e3979be937fbf7e632dd602ddc84bd043
78-
etag = cb12a3e3e89a15acfb27d3eaace5135a6ec3d3fbd1242e4a8e8f9fa646200e5c
77+
sha = ef852e7d2ec9a845dac272dfc479909c0bc6d9f3
78+
etag = a556d6108892aa8e7e63476f4fad3a898b3ec1deda94332dd4e89d2fb6b555ca
7979
weak
8080
[file "Directory.Build.rsp"]
8181
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -99,13 +99,13 @@
9999
weak
100100
[file "src/Directory.Build.props"]
101101
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
102-
sha = 6ae80a175a8f926ac5d9ffb0f6afd55d85cc9320
103-
etag = 69d4b16c14d5047b3ed812dbf556b0b8d77deb86f73af04b9bd3640220056fa8
102+
sha = b1d14c6379e5820eb2c30e08bedbdf6e9c8e8cb2
103+
etag = 33cd19e0f599f444c320406da3452e9e84d28c3bb13c09e9190d9d2e7f129545
104104
weak
105105
[file "src/Directory.Build.targets"]
106106
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
107-
sha = 5cec43dd514aeb9050ea2ccbc546f7afa428c5b5
108-
etag = 8e0f43f00e0c29b408d4ce5c821b44a9bf7dbc8d4917895cfc39f2964d839bf6
107+
sha = 1bf1eacc7ac3920d52c8e7045bfa34abc7c05302
108+
etag = 7cb1421f00d9f6f4c00f0ca98e485dcadb927cfa6b3f0b5d4fb212525d2ce9c0
109109
weak
110110
[file "src/kzu.snk"]
111111
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk

‎readme.md

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -51,67 +51,38 @@ burn -f "Helvetica" -s 75 -c #FFD300 -b input.mp4 input.srt output.mp4
5151
[![Stephen Shaw](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/decriptor.png "Stephen Shaw")](https://github.com/decriptor)
5252
[![Torutek](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/torutek-gh.png "Torutek")](https://github.com/torutek-gh)
5353
[![DRIVE.NET, Inc.](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/drivenet.png "DRIVE.NET, Inc.")](https://github.com/drivenet)
54-
[![David Kean](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/davkean.png "David Kean")](https://github.com/davkean)
55-
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/chiluap.png "")](https://github.com/chiluap)
5654
[![Daniel Gnägi](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/dgnaegi.png "Daniel Gnägi")](https://github.com/dgnaegi)
5755
[![Ashley Medway](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/AshleyMedway.png "Ashley Medway")](https://github.com/AshleyMedway)
5856
[![Keith Pickford](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Keflon.png "Keith Pickford")](https://github.com/Keflon)
59-
[![bitbonk](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/bitbonk.png "bitbonk")](https://github.com/bitbonk)
6057
[![Thomas Bolon](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/tbolon.png "Thomas Bolon")](https://github.com/tbolon)
61-
[![Yurii Rashkovskii](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/yrashk.png "Yurii Rashkovskii")](https://github.com/yrashk)
6258
[![Kori Francis](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/kfrancis.png "Kori Francis")](https://github.com/kfrancis)
63-
[![Zdenek Havlin](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/wdolek.png "Zdenek Havlin")](https://github.com/wdolek)
6459
[![Sean Killeen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/SeanKilleen.png "Sean Killeen")](https://github.com/SeanKilleen)
6560
[![Toni Wenzel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/twenzel.png "Toni Wenzel")](https://github.com/twenzel)
6661
[![Giorgi Dalakishvili](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Giorgi.png "Giorgi Dalakishvili")](https://github.com/Giorgi)
67-
[![Kelly White](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/mckhendry.png "Kelly White")](https://github.com/mckhendry)
68-
[![Allan Ritchie](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/aritchie.png "Allan Ritchie")](https://github.com/aritchie)
6962
[![Mike James](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/MikeCodesDotNET.png "Mike James")](https://github.com/MikeCodesDotNET)
70-
[![Uno Platform](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/unoplatform.png "Uno Platform")](https://github.com/unoplatform)
7163
[![Dan Siegel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/dansiegel.png "Dan Siegel")](https://github.com/dansiegel)
7264
[![Reuben Swartz](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/rbnswartz.png "Reuben Swartz")](https://github.com/rbnswartz)
73-
[![Jeremy Simmons](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jeremysimmons.png "Jeremy Simmons")](https://github.com/jeremysimmons)
7465
[![Jacob Foshee](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jfoshee.png "Jacob Foshee")](https://github.com/jfoshee)
7566
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Mrxx99.png "")](https://github.com/Mrxx99)
7667
[![Eric Johnson](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/eajhnsn1.png "Eric Johnson")](https://github.com/eajhnsn1)
7768
[![Norman Mackay](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/mackayn.png "Norman Mackay")](https://github.com/mackayn)
7869
[![Certify The Web](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/certifytheweb.png "Certify The Web")](https://github.com/certifytheweb)
79-
[![Taylor Mansfield](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/lavahot.png "Taylor Mansfield")](https://github.com/lavahot)
80-
[![Mårten Rånge](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/mrange.png "Mårten Rånge")](https://github.com/mrange)
81-
[![David Petric](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/davidpetric.png "David Petric")](https://github.com/davidpetric)
82-
[![Rich Lee](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/richlee.png "Rich Lee")](https://github.com/richlee)
83-
[![Danilo das Neves Dantas](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/dannevesdantas.png "Danilo das Neves Dantas")](https://github.com/dannevesdantas)
84-
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/nietras.png "")](https://github.com/nietras)
85-
[![Gary Woodfine](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/garywoodfine.png "Gary Woodfine")](https://github.com/garywoodfine)
86-
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/kristinnstefansson.png "")](https://github.com/kristinnstefansson)
87-
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/DarrenAtConexus.png "")](https://github.com/DarrenAtConexus)
88-
[![Steve Bilogan](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/kazo0.png "Steve Bilogan")](https://github.com/kazo0)
8970
[![Ix Technologies B.V.](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/IxTechnologies.png "Ix Technologies B.V.")](https://github.com/IxTechnologies)
90-
[![New Relic](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/newrelic.png "New Relic")](https://github.com/newrelic)
91-
[![Chris Johnston‮](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Chris-Johnston.png "Chris Johnston‮")](https://github.com/Chris-Johnston)
9271
[![David JENNI](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/davidjenni.png "David JENNI")](https://github.com/davidjenni)
93-
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/ehonda.png "")](https://github.com/ehonda)
9472
[![Jonathan ](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Jonathan-Hickey.png "Jonathan ")](https://github.com/Jonathan-Hickey)
9573
[![Oleg Kyrylchuk](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/okyrylchuk.png "Oleg Kyrylchuk")](https://github.com/okyrylchuk)
96-
[![Juan Blanco](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/juanfranblanco.png "Juan Blanco")](https://github.com/juanfranblanco)
97-
[![LosManos](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/LosManos.png "LosManos")](https://github.com/LosManos)
98-
[![Mariusz Kogut](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/MariuszKogut.png "Mariusz Kogut")](https://github.com/MariuszKogut)
9974
[![Charley Wu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/akunzai.png "Charley Wu")](https://github.com/akunzai)
100-
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/meisenring.png "")](https://github.com/meisenring)
101-
[![Thomas Due](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Tdue21.png "Thomas Due")](https://github.com/Tdue21)
10275
[![Jakob Tikjøb Andersen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jakobt.png "Jakob Tikjøb Andersen")](https://github.com/jakobt)
10376
[![Seann Alexander](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/seanalexander.png "Seann Alexander")](https://github.com/seanalexander)
10477
[![Tino Hager](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/tinohager.png "Tino Hager")](https://github.com/tinohager)
105-
[![Badre BSAILA](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/pedrobsaila.png "Badre BSAILA")](https://github.com/pedrobsaila)
10678
[![Mark Seemann](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/ploeh.png "Mark Seemann")](https://github.com/ploeh)
10779
[![Angelo Belchior](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/angelobelchior.png "Angelo Belchior")](https://github.com/angelobelchior)
108-
[![Tony Qu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/tonyqus.png "Tony Qu")](https://github.com/tonyqus)
109-
[![Daniel May](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/danielrmay.png "Daniel May")](https://github.com/danielrmay)
110-
[![Blauhaus Technology (Pty) Ltd](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/BlauhausTechnology.png "Blauhaus Technology (Pty) Ltd")](https://github.com/BlauhausTechnology)
111-
[![Richard Collette](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/rcollette.png "Richard Collette")](https://github.com/rcollette)
112-
[![Nick Vaughan](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/bngv.png "Nick Vaughan")](https://github.com/bngv)
11380
[![Ken Bonny](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/KenBonny.png "Ken Bonny")](https://github.com/KenBonny)
11481
[![Simon Cropp](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/SimonCropp.png "Simon Cropp")](https://github.com/SimonCropp)
82+
[![agileworks-eu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/agileworks-eu.png "agileworks-eu")](https://github.com/agileworks-eu)
83+
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/sorahex.png "")](https://github.com/sorahex)
84+
[![Zheyu Shen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/arsdragonfly.png "Zheyu Shen")](https://github.com/arsdragonfly)
85+
[![Vezel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/vezel-dev.png "Vezel")](https://github.com/vezel-dev)
11586

11687

11788
<!-- sponsors.md -->

‎src/Directory.Build.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,19 @@
2626

2727
<!-- Pick src-level readme+icon automatically -->
2828
<PackageIcon Condition="Exists('$(MSBuildThisFileDirectory)icon.png')">icon.png</PackageIcon>
29-
<PackageReadmeFile Condition="Exists('$(MSBuildThisFileDirectory)readme.md')">readme.md</PackageReadmeFile>
29+
<PackageReadmeFile Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildThisFileDirectory)readme.md')">readme.md</PackageReadmeFile>
3030
<!-- Pick project-level readme+icon overrides automatically -->
3131
<PackageIcon Condition="Exists('$(MSBuildProjectDirectory)\icon.png')">icon.png</PackageIcon>
32-
<PackageReadmeFile Condition="Exists('$(MSBuildProjectDirectory)\readme.md')">readme.md</PackageReadmeFile>
32+
<PackageReadmeFile Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildProjectDirectory)\readme.md')">readme.md</PackageReadmeFile>
3333

3434
<PublishRepositoryUrl>true</PublishRepositoryUrl>
3535
<GenerateRepositoryUrlAttribute>true</GenerateRepositoryUrlAttribute>
3636

3737
<PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\bin'))</PackageOutputPath>
3838

3939
<!-- Use Directory.Packages.props if possible. NOTE: other MSBuild SDKs (i.e. NoTargets/Traversal) do not support central packages -->
40-
<ManagePackageVersionsCentrally Condition="Exists('$(MSBuildThisFileDirectory)Directory.Packages.props') AND ('$(MSBuildProjectExtension)' == '.csproj' OR '$(MSBuildProjectExtension)' == '.vbproj')">true</ManagePackageVersionsCentrally>
40+
<ManagePackageVersionsCentrally Condition="Exists('$(MSBuildThisFileDirectory)Directory.Packages.props')">true</ManagePackageVersionsCentrally>
41+
<CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
4142

4243
<!-- Ensure MSBuild tooling can access package artifacts always via PKG_[PackageId] -->
4344
<GeneratePathProperty>true</GeneratePathProperty>

‎src/Directory.Build.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<None Update="@(None -> WithMetadataValue('Filename', 'readme'))"
3737
Pack="true" PackagePath="%(Filename)%(Extension)"
38-
Condition="'$(PackageReadmeFile)' != ''" />
38+
Condition="'$(PackReadme)' != 'false' and '$(PackageReadmeFile)' != ''" />
3939

4040
<!-- src-level will need explicit inclusion -->
4141
<None Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png" Visible="false"
@@ -44,7 +44,7 @@
4444

4545
<None Include="$(MSBuildThisFileDirectory)readme.md" Link="readme.md"
4646
Pack="true" PackagePath="%(Filename)%(Extension)"
47-
Condition="Exists('$(MSBuildThisFileDirectory)readme.md') and !Exists('$(MSBuildProjectDirectory)\readme.md')" />
47+
Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildThisFileDirectory)readme.md') and !Exists('$(MSBuildProjectDirectory)\readme.md')" />
4848
</ItemGroup>
4949

5050
<!-- Microsoft.NET.Sdk\targets\Microsoft.NET.DefaultAssemblyInfo.targets does this and is imported

0 commit comments

Comments
 (0)