Skip to content

Commit a9d4fda

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Ensure lf for Scriban templates always devlooped/oss@4a9aa32 - If we provide a docs category, don't exclude docs :) devlooped/oss@0c23e24 - Attempt to get necessary permissions for default token devlooped/oss@85829f2 - Support using current Version from CVM devlooped/oss@2fff747 - Add explicit write permissions from caller workflow devlooped/oss@8fa147d - Update .gitignore to ignore .genaiscript devlooped/oss@e0be248 - Group Spectre.Console updates devlooped/oss@917ff54 - Update typed resgen to opt-in only devlooped/oss@a8b2080
1 parent cdc54b0 commit a9d4fda

File tree

9 files changed

+57
-45
lines changed

9 files changed

+57
-45
lines changed

‎.gitattributes‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
1-
# sln, csproj files (and friends) are always CRLF, even on linux
2-
*.sln text eol=crlf
3-
*.proj text eol=crlf
4-
*.csproj text eol=crlf
1+
# normalize by default
2+
* text=auto encoding=UTF-8
3+
*.sh text eol=lf
4+
*.sbn eol=lf
55

66
# These are windows specific files which we may as well ensure are
77
# always crlf on checkout
88
*.bat text eol=crlf
99
*.cmd text eol=crlf
10-
11-
# Opt in known filetypes to always normalize line endings on checkin
12-
# and always use native endings on checkout
13-
*.c text
14-
*.config text
15-
*.h text
16-
*.cs text
17-
*.md text
18-
*.tt text
19-
*.txt text
20-
21-
# Some must always be checked out as lf so enforce that for those files
22-
# If these are not lf then bash/cygwin on windows will not be able to
23-
# excute the files
24-
*.sh text eol=lf

‎.github/dependabot.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ updates:
3838
ProtoBuf:
3939
patterns:
4040
- "protobuf-*"
41+
Spectre:
42+
patterns:
43+
- "Spectre.Console*"

‎.github/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ changelog:
88
- invalid
99
- wontfix
1010
- need info
11-
- docs
1211
- techdebt
1312
authors:
1413
- devlooped-bot
@@ -24,6 +23,7 @@ changelog:
2423
- title: 📝 Documentation updates
2524
labels:
2625
- docs
26+
- documentation
2727
- title: 🔨 Other
2828
labels:
2929
- '*'

‎.github/workflows/dotnet-file.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,10 @@ env:
1212

1313
jobs:
1414
run:
15+
permissions:
16+
contents: write
1517
uses: devlooped/oss/.github/workflows/dotnet-file-core.yml@main
16-
secrets: inherit
18+
secrets:
19+
BOT_NAME: ${{ secrets.BOT_NAME }}
20+
BOT_EMAIL: ${{ secrets.BOT_EMAIL }}
21+
GH_TOKEN: ${{ secrets.GH_TOKEN }}

‎.github/workflows/includes.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
jobs:
1212
includes:
1313
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
pull-requests: write
1417
steps:
1518
- name: 🤖 defaults
1619
uses: devlooped/actions-bot@v1

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ BenchmarkDotNet.Artifacts
88
/app
99
.vs
1010
.vscode
11+
.genaiscript
1112
.idea
1213
local.settings.json
1314

‎.netconfig‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
weak
2020
[file ".gitattributes"]
2121
url = https://github.com/devlooped/oss/blob/main/.gitattributes
22-
sha = 0683ee777d7d878d4bf013d7deea352685135a05
23-
etag = 7acb32f5fa6d4ccd9c824605a7c2b8538497f0068c165567807d393dcf4d6bb7
22+
sha = 4a9aa321c4982b83c185cf8dffed181ff84667d5
23+
etag = 09cad18280ed04b67f7f87591e5481510df04d44c3403231b8af885664d8fd58
2424
weak
2525
[file ".github/dependabot.yml"]
2626
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
27-
sha = 49661dbf0720cde93eb5569be7523b5912351560
28-
etag = c147ea2f3431ca0338c315c4a45b56ee233c4d30f8d6ab698d0e1980a257fd6a
27+
sha = 917ff5486e25bec90038e7ab6d146fd82c61f846
28+
etag = 50bf50df5a6eeb1705baea50f4c6e06d167a89cb5a590887ff939bd4120bd442
2929
weak
3030
[file ".github/release.yml"]
3131
url = https://github.com/devlooped/oss/blob/main/.github/release.yml
32-
sha = 1afd173fe8f81b510c597737b0d271218e81fa73
33-
etag = 482dc2c892fc7ce0cb3a01eb5d9401bee50ddfb067d8cb85873555ce63cf5438
32+
sha = 0c23e24704625cf75b2cb1fdc566cef7e20af313
33+
etag = 310df162242c95ed19ed12e3c96a65f77e558b46dced676ad5255eb12caafe75
3434
weak
3535
[file ".github/workflows/build.yml"]
3636
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
@@ -47,13 +47,13 @@
4747
weak
4848
[file ".github/workflows/dotnet-file.yml"]
4949
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
50-
sha = 7afe350f7e80a230e922db026d4e1198ba15cae1
51-
etag = 65e9794df6caff779eb989c8f71ddf4d4109b24a75af79e4f8d0fe6ba7bd9702
50+
sha = 8fa147d4799d73819040736c399d0b1db2c2d86c
51+
etag = 1ca805a23656e99c03f9d478dba8ccef6e571f5de2ac0e9bb7e3c5216c99a694
5252
weak
5353
[file ".github/workflows/includes.yml"]
5454
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
55-
sha = d152e7437fd0d6f6d9363d23cb3b78c07335ea49
56-
etag = ec40db34f379d0c6d83b2ec15624f330318a172cc4f85b5417c63e86eaf601df
55+
sha = 85829f2510f335f4a411867f3dbaaa116c3ab3de
56+
etag = 086f6b6316cc6ea7089c0dcc6980be519e6ed6e6201e65042ef41b82634ec0ee
5757
weak
5858
[file ".github/workflows/publish.yml"]
5959
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
@@ -65,8 +65,8 @@
6565
weak
6666
[file ".gitignore"]
6767
url = https://github.com/devlooped/oss/blob/main/.gitignore
68-
sha = 02811fa23b0a102b9b33048335d41e515bf75737
69-
etag = a9c37ae312afac14b78436a7d018af4483d88736b5f780576f2c5a0b3f14998c
68+
sha = e0be248fff1d39133345283b8227372b36574b75
69+
etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
7070
weak
7171
[file "Directory.Build.rsp"]
7272
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -90,11 +90,11 @@
9090
weak
9191
[file "src/Directory.Build.props"]
9292
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
93-
sha = b76de49afb376aa48eb172963ed70663b59b31d3
94-
etag = c8b56f3860cc7ccb8773b7bd6189f5c7a6e3a2c27e9104c1ee201fbdc5af9873
93+
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
94+
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
9595
weak
9696
[file "src/Directory.Build.targets"]
9797
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
98-
sha = 33a20db26e47589769284817b271ce67ea9ccfd8
99-
etag = 1a3a0151b5771ee97ed8351254ff4c18a0ff568e0df5c33c6830f069bfbb067b
98+
sha = a8b208093599263b7f2d1fe3854634c588ea5199
99+
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
100100
weak

‎src/Directory.Build.props‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,18 @@
153153
<Import Project="Directory.props" Condition="Exists('Directory.props')"/>
154154
<Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
155155

156+
<!-- If the imported props changed ManagePackageVersionsCentrally, we need to replicate
157+
the Version defaults from Microsoft.NET.DefaultAssemblyInfo.targets since it's too
158+
early here and Directory.Packages.props will be imported right after this time,
159+
meaning dependencies that expect to use the currently building Version would not
160+
get the expected value.
161+
-->
162+
<PropertyGroup Condition="'$(ManagePackageVersionsCentrally)' == 'true' and '$(Version)' == ''">
163+
<VersionPrefix Condition=" '$(VersionPrefix)' == '' ">1.0.0</VersionPrefix>
164+
<Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
165+
<Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
166+
</PropertyGroup>
167+
156168
<!-- Implemented by SDK in .targets, guaranteeing it's overwritten. Added here since we add a DependsOnTargets to it.
157169
Covers backwards compatiblity with non-SDK projects. -->
158170
<Target Name="InitializeSourceControlInformation" />

‎src/Directory.Build.targets‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,28 @@
3434

3535
<ItemGroup Condition="'$(IsPackable)' == 'true'" Label="NuGet">
3636
<!-- This is compatible with nugetizer and SDK pack -->
37+
<!-- Only difference is we don't copy either to output directory -->
3738

3839
<!-- Project-level icon/readme will already be part of None items -->
3940
<None Update="@(None -> WithMetadataValue('Filename', 'icon'))"
4041
Pack="true" PackagePath="%(Filename)%(Extension)"
42+
CopyToOutputDirectory="Never"
4143
Condition="'$(PackageIcon)' != ''" />
4244

4345
<None Update="@(None -> WithMetadataValue('Filename', 'readme'))"
4446
Pack="true" PackagePath="%(Filename)%(Extension)"
47+
CopyToOutputDirectory="Never"
4548
Condition="'$(PackReadme)' != 'false' and '$(PackageReadmeFile)' != ''" />
4649

4750
<!-- src-level will need explicit inclusion -->
4851
<None Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png" Visible="false"
4952
Pack="true" PackagePath="%(Filename)%(Extension)"
53+
CopyToOutputDirectory="Never"
5054
Condition="Exists('$(MSBuildThisFileDirectory)icon.png') and !Exists('$(MSBuildProjectDirectory)\icon.png')" />
5155

5256
<None Include="$(MSBuildThisFileDirectory)readme.md" Link="readme.md"
5357
Pack="true" PackagePath="%(Filename)%(Extension)"
58+
CopyToOutputDirectory="Never"
5459
Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildThisFileDirectory)readme.md') and !Exists('$(MSBuildProjectDirectory)\readme.md')" />
5560
</ItemGroup>
5661

@@ -101,19 +106,17 @@
101106
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(BUDDY_EXECUTION_BRANCH)' != ''">$(BUDDY_EXECUTION_BRANCH)</RepositoryBranch>
102107
</PropertyGroup>
103108

104-
<PropertyGroup Condition="'$(EnableRexCodeGenerator)' == 'true'">
105-
<!-- VSCode/Razor compatibility -->
106-
<CoreCompileDependsOn>PrepareResources;$(CoreCompileDependsOn)</CoreCompileDependsOn>
109+
<PropertyGroup>
110+
<!-- Default to Just Works resources generation. See https://www.cazzulino.com/resources.html -->
111+
<CoreCompileDependsOn>CoreResGen;$(CoreCompileDependsOn)</CoreCompileDependsOn>
107112
</PropertyGroup>
108-
113+
109114
<ItemGroup>
110115
<!-- Consider the project out of date if any of these files changes -->
111116
<UpToDateCheck Include="@(None);@(Content);@(EmbeddedResource)" />
112-
<!-- We'll typically use ThisAssembly.Strings instead of the built-in resource manager codegen -->
113-
<EmbeddedResource Update="@(EmbeddedResource)" Generator="" Condition="'$(EnableRexCodeGenerator)' != 'true'" />
114-
<EmbeddedResource Update="@(EmbeddedResource)" Condition="'$(EnableRexCodeGenerator)' == 'true'">
117+
<!-- Opt-in to typed resource generation by setting custom tool to MSBuild:Compile -->
118+
<EmbeddedResource Update="@(EmbeddedResource -> WithMetadataValue('Generator', 'MSBuild:Compile'))" Type="Resx">
115119
<!-- Default to Just Works resources generation. See https://www.cazzulino.com/resources.html -->
116-
<Generator>MSBuild:Compile</Generator>
117120
<StronglyTypedFileName>$(IntermediateOutputPath)\$([MSBuild]::ValueOrDefault('%(RelativeDir)', '').Replace('\', '.').Replace('/', '.'))%(Filename).g$(DefaultLanguageSourceExtension)</StronglyTypedFileName>
118121
<StronglyTypedLanguage>$(Language)</StronglyTypedLanguage>
119122
<StronglyTypedNamespace Condition="'%(RelativeDir)' == ''">$(RootNamespace)</StronglyTypedNamespace>

0 commit comments

Comments
 (0)