Skip to content

Commit bc3bd05

Browse files
devlooped-botkzu
authored andcommitted
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Add .NET 9.0 so format can succeed devlooped/oss@ec9d7cd - Add explicit write permissions from caller workflow devlooped/oss@8fa147d - Support using current Version from CVM devlooped/oss@2fff747 - Allow workflow to work cross-org devlooped/oss@af171b7
1 parent 2119f37 commit bc3bd05

File tree

6 files changed

+42
-9
lines changed

6 files changed

+42
-9
lines changed

.github/workflows/build.yml

+8
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@ jobs:
104104
submodules: recursive
105105
fetch-depth: 0
106106

107+
- name: ⚙ dotnet
108+
uses: actions/setup-dotnet@v4
109+
with:
110+
dotnet-version: |
111+
6.x
112+
8.x
113+
9.x
114+
107115
- name: ✓ ensure format
108116
run: |
109117
dotnet format whitespace --verify-no-changes -v:diag --exclude ~/.nuget

.github/workflows/dotnet-file-core.yml

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
name: dotnet-file-core
33
on:
44
workflow_call:
5+
secrets:
6+
BOT_NAME:
7+
required: false
8+
BOT_EMAIL:
9+
required: false
10+
GH_TOKEN:
11+
required: false
512

613
env:
714
DOTNET_NOLOGO: true

.github/workflows/dotnet-file.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,10 @@ env:
1212

1313
jobs:
1414
run:
15+
permissions:
16+
contents: write
1517
uses: devlooped/oss/.github/workflows/dotnet-file-core.yml@main
16-
secrets: inherit
18+
secrets:
19+
BOT_NAME: ${{ secrets.BOT_NAME }}
20+
BOT_EMAIL: ${{ secrets.BOT_EMAIL }}
21+
GH_TOKEN: ${{ secrets.GH_TOKEN }}

.netconfig

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
weak
1111
[file ".github/workflows/dotnet-file.yml"]
1212
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
13-
sha = 59aaf432369b5ea597831d4feec5a6ac4024c2e3
14-
etag = 1374e3f8c9b7af69c443605c03f7262300dcb7d783738d9eb9fe84268ed2d10c
13+
sha = 8fa147d4799d73819040736c399d0b1db2c2d86c
14+
etag = 1ca805a23656e99c03f9d478dba8ccef6e571f5de2ac0e9bb7e3c5216c99a694
1515
weak
1616
[file ".github/FUNDING.yml"]
1717
url = https://github.com/devlooped/.github/blob/main/.github/FUNDING.yml
@@ -45,9 +45,9 @@
4545
weak
4646
[file ".github/workflows/build.yml"]
4747
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
48-
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
48+
sha = ec9d7cdd9c20d9fed7e388bc004af07c16e5a8de
4949

50-
etag = 0a4b3f0a875cd8c9434742b4046558aecf610d3fa3d490cfd2099266e95e9195
50+
etag = 11226bff19119caeca82a2e523712d8d9fc32d978180e3f03241251f5b3f3588
5151
weak
5252
[file ".github/workflows/changelog.config"]
5353
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.config
@@ -95,8 +95,8 @@
9595
skip
9696
[file "src/Directory.Build.props"]
9797
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
98-
sha = b76de49afb376aa48eb172963ed70663b59b31d3
99-
etag = c8b56f3860cc7ccb8773b7bd6189f5c7a6e3a2c27e9104c1ee201fbdc5af9873
98+
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
99+
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
100100
weak
101101
[file "src/Directory.Build.targets"]
102102
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
@@ -117,6 +117,6 @@
117117
weak
118118
[file ".github/workflows/dotnet-file-core.yml"]
119119
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml
120-
sha = 875284ba5d565f529aba2f5d24ab8ed27c1d1c79
121-
etag = 8de1d974bf73b1945b5c8be684c3a0b7364114a0d795c9d68837aed9b3aff331
120+
sha = af171b7a87382ee665ba6fbaeb5f38a3551e1c23
121+
etag = 5ce370f52933ab2a4cd50f2b410e842fc5eab23088db2bf98b6c4d4ccdc9022b
122122
weak

readme.md

+1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ We appreciate deeply any feedback that you may have! Feel free to participate in
140140
[![Vincent Limo](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/v-limo.png "Vincent Limo")](https://github.com/v-limo)
141141
[![Jordan S. Jones](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jordansjones.png "Jordan S. Jones")](https://github.com/jordansjones)
142142
[![domischell](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/DominicSchell.png "domischell")](https://github.com/DominicSchell)
143+
[![Joseph Kingry](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jkingry.png "Joseph Kingry")](https://github.com/jkingry)
143144

144145

145146
<!-- sponsors.md -->

src/Directory.Build.props

+12
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,18 @@
153153
<Import Project="Directory.props" Condition="Exists('Directory.props')"/>
154154
<Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
155155

156+
<!-- If the imported props changed ManagePackageVersionsCentrally, we need to replicate
157+
the Version defaults from Microsoft.NET.DefaultAssemblyInfo.targets since it's too
158+
early here and Directory.Packages.props will be imported right after this time,
159+
meaning dependencies that expect to use the currently building Version would not
160+
get the expected value.
161+
-->
162+
<PropertyGroup Condition="'$(ManagePackageVersionsCentrally)' == 'true' and '$(Version)' == ''">
163+
<VersionPrefix Condition=" '$(VersionPrefix)' == '' ">1.0.0</VersionPrefix>
164+
<Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
165+
<Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
166+
</PropertyGroup>
167+
156168
<!-- Implemented by SDK in .targets, guaranteeing it's overwritten. Added here since we add a DependsOnTargets to it.
157169
Covers backwards compatiblity with non-SDK projects. -->
158170
<Target Name="InitializeSourceControlInformation" />

0 commit comments

Comments
 (0)