Skip to content

Commit bcabc45

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss
1 parent 7e9f49e commit bcabc45

5 files changed

Lines changed: 25 additions & 3 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ pack
66
TestResults
77
results
88
BenchmarkDotNet.Artifacts
9+
mcps
910
/app
11+
/temp
1012
.vs
1113
.vscode
1214
.genaiscript

.netconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
url = https://github.com/devlooped/oss/blob/main/.gitignore
8383
sha = a225b7a9f609f26bcc24e0d84f663387be251a7d
8484

85-
etag = 09b499201361a59fad0036e925f4008cdd7bdc6723ba37ff18cc509e6024b2bf
85+
etag = cdf95c41f5d77e89beb6656b30b72426169a5cfcbb2873705d2557d4eb0c364a
8686
weak
8787
[file "Directory.Build.rsp"]
8888
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -109,13 +109,13 @@
109109
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
110110
sha = dd13ed3334135c30dcb1e3b2295dc7622de298d9
111111

112-
etag = b2b90c6d617db9712cc8be2031b767d3ba951015717984f52b4872cc39f93e72
112+
etag = f1d6384abf18d8d891ce5e835a10c73fe029c42151374be96d7e4af43d189c65
113113
weak
114114
[file "src/Directory.Build.targets"]
115115
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
116116
sha = 083a37bd9307ec820bac6ee3c7384083151d36d8
117117

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

readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,7 @@ OSMF tier. A single fee covers all of [Devlooped packages](https://www.nuget.org
408408
[![Seika Logiciel](https://avatars.githubusercontent.com/u/2564602?v=4&s=39 "Seika Logiciel")](https://github.com/SeikaLogiciel)
409409
[![Andrew Grant](https://avatars.githubusercontent.com/devlooped-user?s=39 "Andrew Grant")](https://github.com/wizardness)
410410
[![eska-gmbh](https://avatars.githubusercontent.com/devlooped-team?s=39 "eska-gmbh")](https://github.com/eska-gmbh)
411+
[![Geodata AS](https://avatars.githubusercontent.com/u/5946299?v=4&s=39 "Geodata AS")](https://github.com/geodata-no)
411412

412413

413414
<!-- sponsors.md -->

src/Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
4848
<!-- See https://learn.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#prunepackagereference-specification -->
4949
<RestoreEnablePackagePruning>true</RestoreEnablePackagePruning>
50+
51+
<!-- Needed to improve nuget default for empty PackageId. Workaround for https://github.com/NuGet/Home/issues/14928 -->
52+
<ImportNuGetBuildTasksPackTargetsFromSdk>false</ImportNuGetBuildTasksPackTargetsFromSdk>
5053
</PropertyGroup>
5154

5255
<PropertyGroup Label="Build">

src/Directory.Build.targets

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,22 @@
3232
<IsPackable Condition="'$(PackageId)' != ''">true</IsPackable>
3333
</PropertyGroup>
3434

35+
<PropertyGroup>
36+
<!-- Save original PackageId to restore post-import -->
37+
<_PackageId>$(PackageId)</_PackageId>
38+
<!-- Since we set ImportNuGetBuildTasksPackTargetsFromSdk=false, the Sdk.targets doesn't even provide the path for this property :/ -->
39+
<NuGetBuildTasksPackTargets Condition="'$(NuGetBuildTasksPackTargets)' == ''">$(MSBuildSDKsPath)\..\NuGet.Build.Tasks.Pack.targets</NuGetBuildTasksPackTargets>
40+
</PropertyGroup>
41+
42+
<Import Project="$(NuGetBuildTasksPackTargets)" Condition="Exists('$(NuGetBuildTasksPackTargets)')"/>
43+
44+
<PropertyGroup>
45+
<!-- Revert the forced PackageId by the NuGet SDK targets for non-packable projects, see https://github.com/NuGet/Home/issues/14928 -->
46+
<PackageId Condition="'$(IsPackable)' == 'false'">$(_PackageId)</PackageId>
47+
<!-- If no PackageId was originally provided, ensure IsPackable is false -->
48+
<IsPackable Condition="'$(_PackageId)' == ''">false</IsPackable>
49+
</PropertyGroup>
50+
3551
<ItemGroup Condition="'$(IsPackable)' == 'true'" Label="NuGet">
3652
<!-- This is compatible with nugetizer and SDK pack -->
3753
<!-- Only difference is we don't copy either to output directory -->

0 commit comments

Comments
 (0)