Skip to content

Commit 6658cdb

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Support using current Version from CVM devlooped/oss@2fff747 - Make sure the feed url is available to msbuild devlooped/oss@931da83 - Allow workflow to work cross-org devlooped/oss@af171b7 - Add explicit write permissions from caller workflow devlooped/oss@8fa147d
1 parent c1a3766 commit 6658cdb

File tree

7 files changed

+47
-12
lines changed

7 files changed

+47
-12
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ env:
2828
GH_TOKEN: ${{ secrets.GH_TOKEN }}
2929
MSBUILDTERMINALLOGGER: auto
3030
Configuration: ${{ github.event.inputs.configuration || 'Release' }}
31+
SLEET_FEED_URL: ${{ vars.SLEET_FEED_URL }}
3132

3233
defaults:
3334
run:
@@ -104,6 +105,14 @@ jobs:
104105
submodules: recursive
105106
fetch-depth: 0
106107

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

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

Lines changed: 7 additions & 0 deletions
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

Lines changed: 6 additions & 1 deletion
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 }}

.github/workflows/publish.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ env:
1515
VersionLabel: ${{ github.ref }}
1616
GH_TOKEN: ${{ secrets.GH_TOKEN }}
1717
MSBUILDTERMINALLOGGER: auto
18-
18+
SLEET_FEED_URL: ${{ vars.SLEET_FEED_URL }}
19+
1920
jobs:
2021
publish:
2122
runs-on: ${{ vars.PUBLISH_AGENT || 'ubuntu-latest' }}

.netconfig

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
weak
3838
[file ".github/workflows/build.yml"]
3939
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
40-
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
41-
etag = 0a4b3f0a875cd8c9434742b4046558aecf610d3fa3d490cfd2099266e95e9195
40+
sha = 931da830a361d69b419887a0edbb424517ca75fc
41+
etag = ea785d08ab67abc57629649b0a418a515dc58248de12668f3616908873f8ecc6
4242
weak
4343
[file ".github/workflows/changelog.config"]
4444
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.config
@@ -57,8 +57,8 @@
5757
weak
5858
[file ".github/workflows/dotnet-file.yml"]
5959
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
60-
sha = 59aaf432369b5ea597831d4feec5a6ac4024c2e3
61-
etag = 1374e3f8c9b7af69c443605c03f7262300dcb7d783738d9eb9fe84268ed2d10c
60+
sha = 8fa147d4799d73819040736c399d0b1db2c2d86c
61+
etag = 1ca805a23656e99c03f9d478dba8ccef6e571f5de2ac0e9bb7e3c5216c99a694
6262
weak
6363
[file ".github/workflows/includes.yml"]
6464
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
@@ -67,8 +67,8 @@
6767
weak
6868
[file ".github/workflows/publish.yml"]
6969
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
70-
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
71-
etag = 2f64f75ad01f735fd05290370fb8a826111ac8dd7e74ce04226bb627a54a62ba
70+
sha = 931da830a361d69b419887a0edbb424517ca75fc
71+
etag = 62a13b8b34b1b265cdc045bf7ea001dee7bdc184cba7abfea5fe77283cf419a6
7272
weak
7373
[file ".gitignore"]
7474
url = https://github.com/devlooped/oss/blob/main/.gitignore
@@ -92,8 +92,8 @@
9292
weak
9393
[file "src/Directory.Build.props"]
9494
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
95-
sha = b76de49afb376aa48eb172963ed70663b59b31d3
96-
etag = c8b56f3860cc7ccb8773b7bd6189f5c7a6e3a2c27e9104c1ee201fbdc5af9873
95+
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
96+
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
9797
weak
9898
[file "src/Directory.Build.targets"]
9999
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
@@ -107,8 +107,8 @@
107107
weak
108108
[file ".github/workflows/dotnet-file-core.yml"]
109109
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml
110-
sha = 875284ba5d565f529aba2f5d24ab8ed27c1d1c79
111-
etag = 8de1d974bf73b1945b5c8be684c3a0b7364114a0d795c9d68837aed9b3aff331
110+
sha = af171b7a87382ee665ba6fbaeb5f38a3551e1c23
111+
etag = 5ce370f52933ab2a4cd50f2b410e842fc5eab23088db2bf98b6c4d4ccdc9022b
112112
weak
113113
[file ".github/workflows/triage.yml"]
114114
url = https://github.com/devlooped/oss/blob/main/.github/workflows/triage.yml

readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ is saved unless a node was cleaned.
9292
[![Vincent Limo](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/v-limo.png "Vincent Limo")](https://github.com/v-limo)
9393
[![Jordan S. Jones](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jordansjones.png "Jordan S. Jones")](https://github.com/jordansjones)
9494
[![domischell](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/DominicSchell.png "domischell")](https://github.com/DominicSchell)
95+
[![Joseph Kingry](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jkingry.png "Joseph Kingry")](https://github.com/jkingry)
9596

9697

9798
<!-- sponsors.md -->

src/Directory.Build.props

Lines changed: 12 additions & 0 deletions
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)