Skip to content

Commit 54219b1

Browse files
devlooped-botkzu
authored andcommitted
⬆️ Bump files with dotnet-file sync
# devlooped/oss - If the OSMF eula is present, switch to its license file devlooped/oss@4b84c54
1 parent 17ee06f commit 54219b1

4 files changed

Lines changed: 24 additions & 6 deletions

File tree

.netconfig

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@
105105
weak
106106
[file "src/Directory.Build.props"]
107107
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
108-
sha = 0ff8b7b79a82112678326d1dc5543ed890311366
109-
etag = 3ebde0a8630d526b80f15801179116e17a857ff880a4442e7db7b075efa4fd63
108+
sha = 4b84c540df6f37c30fb38df7947d79871c34f036
109+
etag = bca64456d4e2cd05375a72b6de376b2c51edf6ad49029aa9a729f4a349a54656
110110
weak
111111
[file "src/Directory.Build.targets"]
112112
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
113-
sha = 4339749ef4b8f66def75931df09ef99c149f8421
114-
etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
113+
sha = 4b84c540df6f37c30fb38df7947d79871c34f036
114+
etag = 09ce6b3f9521f8eedc44b77e7b7eaf90bf5df36e1ffb7f78ca27658812180977
115115
weak
116116
[file "src/nuget.config"]
117117
url = https://github.com/devlooped/oss/blob/main/src/nuget.config
@@ -219,4 +219,10 @@
219219
url = https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/any.proto
220220
sha = 97921a5fc1d2685d30fb6e74b283a0a6d81660dc
221221
etag = dcadaf10862661d714d4738a8255af4e80344343b45f1fa53260ff4778e3e88b
222-
weak
222+
weak
223+
[file "readme.tmp.md"]
224+
url = https://github.com/devlooped/oss/blob/main/readme.tmp.md
225+
skip
226+
[file "oss.cs"]
227+
url = https://github.com/devlooped/oss/blob/main/oss.cs
228+
skip

readme.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,6 @@ Uses your own API Key.
459459
[![Keith Pickford](https://avatars.githubusercontent.com/u/16598898?u=64416b80caf7092a885f60bb31612270bffc9598&v=4&s=39 "Keith Pickford")](https://github.com/Keflon)
460460
[![Thomas Bolon](https://avatars.githubusercontent.com/u/127185?u=7f50babfc888675e37feb80851a4e9708f573386&v=4&s=39 "Thomas Bolon")](https://github.com/tbolon)
461461
[![Kori Francis](https://avatars.githubusercontent.com/u/67574?u=3991fb983e1c399edf39aebc00a9f9cd425703bd&v=4&s=39 "Kori Francis")](https://github.com/kfrancis)
462-
[![Uno Platform](https://avatars.githubusercontent.com/u/52228309?v=4&s=39 "Uno Platform")](https://github.com/unoplatform)
463462
[![Reuben Swartz](https://avatars.githubusercontent.com/u/724704?u=2076fe336f9f6ad678009f1595cbea434b0c5a41&v=4&s=39 "Reuben Swartz")](https://github.com/rbnswartz)
464463
[![Jacob Foshee](https://avatars.githubusercontent.com/u/480334?v=4&s=39 "Jacob Foshee")](https://github.com/jfoshee)
465464
[![](https://avatars.githubusercontent.com/u/33566379?u=bf62e2b46435a267fa246a64537870fd2449410f&v=4&s=39 "")](https://github.com/Mrxx99)

src/Directory.Build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@
166166
<Using Include="System.ArgumentNullException" Static="true" />
167167
</ItemGroup>
168168

169+
<ItemGroup Label="OSMF" Condition="Exists('$(MSBuildThisFileDirectory)..\osmfeula.txt')">
170+
<None Include="$(MSBuildThisFileDirectory)..\osmfeula.txt" Link="osmfeula.txt" PackagePath="OSMFEULA.txt" />
171+
</ItemGroup>
172+
169173
<Import Project="Directory.props" Condition="Exists('Directory.props')"/>
170174
<Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
171175

src/Directory.Build.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,15 @@
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')) != ''">
190+
<PackageLicenseExpression></PackageLicenseExpression>
191+
<PackageLicenseFile>OSMFEULA.txt</PackageLicenseFile>
192+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
193+
</PropertyGroup>
194+
</Target>
195+
187196
<!-- Import before UsingTask because first to declare tasks wins -->
188197
<Import Project="Directory.targets" Condition="Exists('Directory.targets')"/>
189198
<Import Project="Directory.targets.user" Condition="Exists('Directory.targets.user')" />

0 commit comments

Comments
 (0)