Skip to content

Commit 434b3dd

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Fix PackageId default from Pack SDK devlooped/oss@6e24389 - Fix empty default path for NuGet SDK targets devlooped/oss@c679525 - Add '/mcps' to .gitignore devlooped/oss@c1d29fb
1 parent a70f2a8 commit 434b3dd

5 files changed

Lines changed: 27 additions & 7 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ TestResults
77
results
88
BenchmarkDotNet.Artifacts
99
/app
10+
/mcps
1011
.vs
1112
.vscode
1213
.genaiscript

.netconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434

3535
[file ".gitignore"]
3636
url = https://github.com/devlooped/oss/blob/main/.gitignore
37-
etag = 09b499201361a59fad0036e925f4008cdd7bdc6723ba37ff18cc509e6024b2bf
37+
etag = f502a2be3b4155fd86675ef45a4364e598979738128a612deb7db59074f93a51
3838
weak
39-
sha = c76f0cc3e225e39e79420587d94852e12cdcb32a
39+
sha = c1d29fbde52b1505288e3392e7f5fdcb2299f322
4040

4141
[file "Directory.Build.rsp"]
4242
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -56,15 +56,15 @@
5656
sha = 0683ee777d7d878d4bf013d7deea352685135a05
5757
[file "src/Directory.Build.props"]
5858
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
59-
etag = b2b90c6d617db9712cc8be2031b767d3ba951015717984f52b4872cc39f93e72
59+
etag = f1d6384abf18d8d891ce5e835a10c73fe029c42151374be96d7e4af43d189c65
6060
weak
61-
sha = a1f5d11d1821959a141567ed24f9ea43205edd13
61+
sha = 6e2438919e108aeb75106dc0737c45f5e55d5f42
6262

6363
[file "src/Directory.Build.targets"]
6464
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
65-
etag = 907682e5632a2ba430357e6e042a4ca33cb8c94a3a215d3091aa03f5958a4877
65+
etag = cb83faed0cc8b930a7b6bdc61bea03a54059858cf04353e55fee94d9e3ae0fad
6666
weak
67-
sha = 083a37bd9307ec820bac6ee3c7384083151d36d8
67+
sha = c67952501337303eda0fb8b340cb7606666abd8f
6868

6969
[file "src/kzu.snk"]
7070
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,6 @@ prefix to add or remove workloads respectively, for example.
390390
<!-- sponsors.md -->
391391
[![Clarius Org](https://avatars.githubusercontent.com/u/71888636?v=4&s=39 "Clarius Org")](https://github.com/clarius)
392392
[![MFB Technologies, Inc.](https://avatars.githubusercontent.com/u/87181630?v=4&s=39 "MFB Technologies, Inc.")](https://github.com/MFB-Technologies-Inc)
393-
[![Khamza Davletov](https://avatars.githubusercontent.com/u/13615108?u=11b0038e255cdf9d1940fbb9ae9d1d57115697ab&v=4&s=39 "Khamza Davletov")](https://github.com/khamza85)
394393
[![SandRock](https://avatars.githubusercontent.com/u/321868?u=99e50a714276c43ae820632f1da88cb71632ec97&v=4&s=39 "SandRock")](https://github.com/sandrock)
395394
[![DRIVE.NET, Inc.](https://avatars.githubusercontent.com/u/15047123?v=4&s=39 "DRIVE.NET, Inc.")](https://github.com/drivenet)
396395
[![Keith Pickford](https://avatars.githubusercontent.com/u/16598898?u=64416b80caf7092a885f60bb31612270bffc9598&v=4&s=39 "Keith Pickford")](https://github.com/Keflon)
@@ -415,6 +414,7 @@ prefix to add or remove workloads respectively, for example.
415414
[![Seika Logiciel](https://avatars.githubusercontent.com/u/2564602?v=4&s=39 "Seika Logiciel")](https://github.com/SeikaLogiciel)
416415
[![Andrew Grant](https://avatars.githubusercontent.com/devlooped-user?s=39 "Andrew Grant")](https://github.com/wizardness)
417416
[![eska-gmbh](https://avatars.githubusercontent.com/devlooped-team?s=39 "eska-gmbh")](https://github.com/eska-gmbh)
417+
[![Geodata AS](https://avatars.githubusercontent.com/u/5946299?v=4&s=39 "Geodata AS")](https://github.com/geodata-no)
418418

419419

420420
<!-- 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)