Skip to content

Commit f27db5c

Browse files
devlooped-botkzu
authored andcommitted
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Fix PackageId assumption for static web assets devlooped/oss@3a758f4 - Update actions-includes version to v2 devlooped/oss@d571412
1 parent 662e977 commit f27db5c

3 files changed

Lines changed: 13 additions & 6 deletions

File tree

.github/workflows/includes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
token: ${{ env.PR_TOKEN || github.token }}
3333

3434
- name: +Mᐁ includes
35-
uses: devlooped/actions-includes@v1
35+
uses: devlooped/actions-includes@v2
3636

3737
- name: 📝 OSMF EULA
3838
shell: pwsh

.netconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
weak
8585
[file ".github/workflows/includes.yml"]
8686
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
87-
sha = 7c1c6e615b5785e0ac9db33cb17343d6c1de16ff
88-
etag = 5e6a10be141ee629201bfad01eae09b5c36a67f541ec7ab411ae400b5d73de1d
87+
sha = d571412f07b0fb3c40023dc906f64906d7ed2b46
88+
etag = ab627107749577bb619b024aff93027359b66b4c3f5a85a36b235e428387cd17
8989
weak
9090
[file ".github/workflows/publish.yml"]
9191
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
@@ -122,8 +122,8 @@
122122
weak
123123
[file "src/Directory.Build.targets"]
124124
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
125-
sha = dcd5f0a9a00a5b0c23d41a71dcc66ea41dc5f75d
126-
etag = 2cca66d8a1adbae24dc2efee53a55fa09949242eb35b86c5fd66425da18c6107
125+
sha = 3a758f47e8955c15a016b3db08f383781cbdee26
126+
etag = 22005ab28676aa6d790171003057c81fe4ceec01251626385a3dcef3417ae3cd
127127
weak
128128
[file "src/nuget.config"]
129129
url = https://github.com/devlooped/oss/blob/main/src/nuget.config

src/Directory.Build.targets

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,14 @@
3939
<NuGetBuildTasksPackTargets Condition="'$(NuGetBuildTasksPackTargets)' == ''">$(MSBuildSDKsPath)\..\NuGet.Build.Tasks.Pack.targets</NuGetBuildTasksPackTargets>
4040
</PropertyGroup>
4141

42-
<Import Project="$(NuGetBuildTasksPackTargets)" Condition="Exists('$(NuGetBuildTasksPackTargets)')"/>
42+
<Import Project="$(NuGetBuildTasksPackTargets)" Condition="Exists('$(NuGetBuildTasksPackTargets)') And '$(NuGetize)' != 'true'" />
43+
44+
<!-- Fix for hardcoded assumption in SDK: <GenerateStaticWebAssetsManifest Source="$(PackageId)" -->
45+
<Target Name="EnsureStaticWebAssetsSource" BeforeTargets="GenerateStaticWebAssetsManifest">
46+
<PropertyGroup>
47+
<PackageId Condition="'$(PackageId)' == ''">$(MSBuildProjectName)</PackageId>
48+
</PropertyGroup>
49+
</Target>
4350

4451
<PropertyGroup>
4552
<!-- Revert the forced PackageId by the NuGet SDK targets for non-packable projects, see https://github.com/NuGet/Home/issues/14928 -->

0 commit comments

Comments
 (0)