Skip to content

Commit 2aa37f6

Browse files
devlooped-botkzu
authored andcommitted
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Add explicit write permissions from caller workflow devlooped/oss@8fa147d - Support using current Version from CVM devlooped/oss@2fff747
1 parent fb4d8bd commit 2aa37f6

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

.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 }}

.netconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
skip
4242
[file ".github/workflows/dotnet-file.yml"]
4343
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
44-
sha = 59aaf432369b5ea597831d4feec5a6ac4024c2e3
45-
etag = 1374e3f8c9b7af69c443605c03f7262300dcb7d783738d9eb9fe84268ed2d10c
44+
sha = 8fa147d4799d73819040736c399d0b1db2c2d86c
45+
etag = 1ca805a23656e99c03f9d478dba8ccef6e571f5de2ac0e9bb7e3c5216c99a694
4646
weak
4747
[file ".github/workflows/includes.yml"]
4848
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
@@ -77,8 +77,8 @@
7777
weak
7878
[file "src/Directory.Build.props"]
7979
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
80-
sha = b76de49afb376aa48eb172963ed70663b59b31d3
81-
etag = c8b56f3860cc7ccb8773b7bd6189f5c7a6e3a2c27e9104c1ee201fbdc5af9873
80+
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
81+
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
8282
weak
8383
[file "src/Directory.Build.targets"]
8484
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets

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)