Skip to content

Commit 123763b

Browse files
devlooped-botkzu
authored andcommitted
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Support using current Version from CVM devlooped/oss@2fff747
1 parent fe59a02 commit 123763b

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

.netconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
weak
7676
[file "src/Directory.Build.props"]
7777
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
78-
sha = b76de49afb376aa48eb172963ed70663b59b31d3
79-
etag = c8b56f3860cc7ccb8773b7bd6189f5c7a6e3a2c27e9104c1ee201fbdc5af9873
78+
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
79+
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
8080
weak
8181
[file "src/Directory.Build.targets"]
8282
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)