Skip to content

Commit 92b258f

Browse files
devlooped-botkzu
authored andcommitted
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Consider either None or Content for OSMF license patching devlooped/oss@083a37b
1 parent 4172f65 commit 92b258f

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

.netconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@
113113
weak
114114
[file "src/Directory.Build.targets"]
115115
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
116-
sha = 4b84c540df6f37c30fb38df7947d79871c34f036
116+
sha = 083a37bd9307ec820bac6ee3c7384083151d36d8
117117

118-
etag = 09ce6b3f9521f8eedc44b77e7b7eaf90bf5df36e1ffb7f78ca27658812180977
118+
etag = 907682e5632a2ba430357e6e042a4ca33cb8c94a3a215d3091aa03f5958a4877
119119
weak
120120
[file "src/Sample/MinimalApi/Ipsum.cs"]
121121
url = https://github.com/devlooped/catbag/blob/main/System/Ipsum.cs

src/Directory.Build.targets

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174

175175
<Target Name="UpdatePackageMetadata"
176176
BeforeTargets="PrepareForBuild;GenerateMSBuildEditorConfigFileShouldRun;GetAssemblyVersion;GetPackageMetadata;GenerateNuspec;Pack"
177-
DependsOnTargets="EnsureProjectInformation"
177+
DependsOnTargets="EnsureProjectInformation;UpdatePackageLicense"
178178
Condition="'$(SourceControlInformationFeatureSupported)' == 'true' And
179179
'$(IsPackable)' == 'true'">
180180
<PropertyGroup>
@@ -184,15 +184,16 @@
184184
</PropertyGroup>
185185
</Target>
186186

187-
<Target Name="UpdatePackageLicense" BeforeTargets="GetPackageMetadata;GenerateNuspec;Pack" Condition="'$(IsPackable)' == 'true'">
188-
<!-- If project has a None item with PackagePath=OSMFEULA.txt -->
189-
<PropertyGroup Condition="@(None -> WithMetadataValue('PackagePath', 'OSMFEULA.txt')) != ''">
187+
<Target Name="UpdatePackageLicense">
188+
<!-- If project has a None/Content item with PackagePath=OSMFEULA.txt -->
189+
<PropertyGroup Condition="@(None -> WithMetadataValue('PackagePath', 'OSMFEULA.txt')) != '' or @(Content -> WithMetadataValue('PackagePath', 'OSMFEULA.txt')) != ''">
190190
<PackageLicenseExpression></PackageLicenseExpression>
191191
<PackageLicenseFile>OSMFEULA.txt</PackageLicenseFile>
192192
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
193193
</PropertyGroup>
194194
</Target>
195195

196+
196197
<!-- Import before UsingTask because first to declare tasks wins -->
197198
<Import Project="Directory.targets" Condition="Exists('Directory.targets')"/>
198199
<Import Project="Directory.targets.user" Condition="Exists('Directory.targets.user')" />

0 commit comments

Comments
 (0)