Skip to content

Commit 2c01adb

Browse files
devlooped-botkzu
devlooped-bot
authored and
kzu
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Improve default Product metadata, remove .git from user-facing URLs devlooped/oss@4339749 - Add Company MSBuild property by default devlooped/oss@c509be4
1 parent 6e887a1 commit 2c01adb

File tree

4 files changed

+50
-19
lines changed

4 files changed

+50
-19
lines changed

‎.netconfig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@
117117
weak
118118
[file "src/Directory.Build.props"]
119119
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
120-
sha = 81d972fd0760c244d134dae7f4b17d6c43cb004a
120+
sha = c509be4378ff6789df4f66338cb88119453c0975
121121

122-
etag = 1368697c1521e465a1dea88b93787b1c7def441c37d62afc903fb8d07179e4f6
122+
etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
123123
weak
124124
[file "src/Directory.Build.targets"]
125125
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
126-
sha = a8b208093599263b7f2d1fe3854634c588ea5199
126+
sha = 4339749ef4b8f66def75931df09ef99c149f8421
127127

128-
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
128+
etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
129129
weak
130130
[file "src/nuget.config"]
131131
url = https://github.com/devlooped/oss/blob/main/src/nuget.config

‎readme.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,8 @@ IChatClient client = new GrokChatClient(Env.Get("XAI_API_KEY")!, "grok-3-mini")
350350
[![Adrian Alonso](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/adalon.png "Adrian Alonso")](https://github.com/adalon)
351351
[![Michael Hagedorn](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Eule02.png "Michael Hagedorn")](https://github.com/Eule02)
352352
[![Alex Rønne Petersen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/alexrp.png "Alex Rønne Petersen")](https://github.com/alexrp)
353+
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/henkmartijn.png "")](https://github.com/henkmartijn)
354+
[![Sebastien Lebreton](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/sailro.png "Sebastien Lebreton")](https://github.com/sailro)
353355

354356

355357
<!-- sponsors.md -->

‎src/Directory.Build.props‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
<PropertyGroup Label="CI" Condition="'$(CI)' == ''">
55
<CI>false</CI>
66
<!-- GH, CircleCI, GitLab and BitBucket already use CI -->
7-
<CI Condition="'$(TF_BUILD)' == 'true' or '$(TEAMCITY_VERSION)' != '' or '$(APPVEYOR)' != '' or '$(BuildRunner)' == 'MyGet' or '$(JENKINS_URL)' != '' or '$(TRAVIS)' == 'true' or '$(BUDDY)' == 'true'">true</CI>
7+
<CI Condition="'$(TF_BUILD)' == 'true' or
8+
'$(TEAMCITY_VERSION)' != '' or
9+
'$(APPVEYOR)' != '' or
10+
'$(BuildRunner)' == 'MyGet' or
11+
'$(JENKINS_URL)' != '' or
12+
'$(TRAVIS)' == 'true' or
13+
'$(BUDDY)' == 'true'">true</CI>
814
</PropertyGroup>
915

1016
<PropertyGroup>
@@ -14,6 +20,7 @@
1420

1521
<PropertyGroup Label="NuGet">
1622
<Authors>Daniel Cazzulino</Authors>
23+
<Company>Devlooped</Company>
1724
<Copyright>Copyright (C) Daniel Cazzulino and Contributors. All rights reserved.</Copyright>
1825
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1926
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -146,7 +153,7 @@
146153
<Using Include="System.ArgumentNullException" Static="true" />
147154
</ItemGroup>
148155

149-
<Import Project="Directory.props" Condition="Exists('Directory.props')" />
156+
<Import Project="Directory.props" Condition="Exists('Directory.props')"/>
150157
<Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
151158

152159
<!-- If the imported props changed ManagePackageVersionsCentrally, we need to replicate

‎src/Directory.Build.targets‎

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,26 @@
3737
<!-- Only difference is we don't copy either to output directory -->
3838

3939
<!-- Project-level icon/readme will already be part of None items -->
40-
<None Update="@(None -&gt; WithMetadataValue('Filename', 'icon'))" Pack="true" PackagePath="%(Filename)%(Extension)" CopyToOutputDirectory="Never" Condition="'$(PackageIcon)' != ''" />
41-
42-
<None Update="@(None -&gt; WithMetadataValue('Filename', 'readme'))" Pack="true" PackagePath="%(Filename)%(Extension)" CopyToOutputDirectory="Never" Condition="'$(PackReadme)' != 'false' and '$(PackageReadmeFile)' != ''" />
40+
<None Update="@(None -> WithMetadataValue('Filename', 'icon'))"
41+
Pack="true" PackagePath="%(Filename)%(Extension)"
42+
CopyToOutputDirectory="Never"
43+
Condition="'$(PackageIcon)' != ''" />
44+
45+
<None Update="@(None -> WithMetadataValue('Filename', 'readme'))"
46+
Pack="true" PackagePath="%(Filename)%(Extension)"
47+
CopyToOutputDirectory="Never"
48+
Condition="'$(PackReadme)' != 'false' and '$(PackageReadmeFile)' != ''" />
4349

4450
<!-- src-level will need explicit inclusion -->
45-
<None Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png" Visible="false" Pack="true" PackagePath="%(Filename)%(Extension)" CopyToOutputDirectory="Never" Condition="Exists('$(MSBuildThisFileDirectory)icon.png') and !Exists('$(MSBuildProjectDirectory)\icon.png')" />
46-
47-
<None Include="$(MSBuildThisFileDirectory)readme.md" Link="readme.md" Pack="true" PackagePath="%(Filename)%(Extension)" CopyToOutputDirectory="Never" Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildThisFileDirectory)readme.md') and !Exists('$(MSBuildProjectDirectory)\readme.md')" />
51+
<None Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png" Visible="false"
52+
Pack="true" PackagePath="%(Filename)%(Extension)"
53+
CopyToOutputDirectory="Never"
54+
Condition="Exists('$(MSBuildThisFileDirectory)icon.png') and !Exists('$(MSBuildProjectDirectory)\icon.png')" />
55+
56+
<None Include="$(MSBuildThisFileDirectory)readme.md" Link="readme.md"
57+
Pack="true" PackagePath="%(Filename)%(Extension)"
58+
CopyToOutputDirectory="Never"
59+
Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildThisFileDirectory)readme.md') and !Exists('$(MSBuildProjectDirectory)\readme.md')" />
4860
</ItemGroup>
4961

5062
<!-- Microsoft.NET.Sdk\targets\Microsoft.NET.DefaultAssemblyInfo.targets does this and is imported
@@ -103,7 +115,7 @@
103115
<!-- Consider the project out of date if any of these files changes -->
104116
<UpToDateCheck Include="@(None);@(Content);@(EmbeddedResource)" />
105117
<!-- Opt-in to typed resource generation by setting custom tool to MSBuild:Compile -->
106-
<EmbeddedResource Update="@(EmbeddedResource -&gt; WithMetadataValue('Generator', 'MSBuild:Compile'))" Type="Resx">
118+
<EmbeddedResource Update="@(EmbeddedResource -> WithMetadataValue('Generator', 'MSBuild:Compile'))" Type="Resx">
107119
<!-- Default to Just Works resources generation. See https://www.cazzulino.com/resources.html -->
108120
<StronglyTypedFileName>$(IntermediateOutputPath)\$([MSBuild]::ValueOrDefault('%(RelativeDir)', '').Replace('\', '.').Replace('/', '.'))%(Filename).g$(DefaultLanguageSourceExtension)</StronglyTypedFileName>
109121
<StronglyTypedLanguage>$(Language)</StronglyTypedLanguage>
@@ -129,7 +141,10 @@
129141
</ItemGroup>
130142

131143
<!-- Make sure the source control info is available before calling source generators -->
132-
<Target Name="EnsureProjectInformation" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun" AfterTargets="InitializeSourceControlInformation" DependsOnTargets="InitializeSourceControlInformation">
144+
<Target Name="EnsureProjectInformation"
145+
BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun"
146+
AfterTargets="InitializeSourceControlInformation"
147+
DependsOnTargets="InitializeSourceControlInformation">
133148

134149
<PropertyGroup Condition="'$(SourceControlInformationFeatureSupported)' == 'true'">
135150
<!-- The project must specify PublishRepositoryUrl=true in order to publish the URL, in order to prevent inadvertent leak of internal URL. -->
@@ -145,25 +160,32 @@
145160

146161
<!-- Add SourceRoot as a project property too -->
147162
<ItemGroup>
148-
<_GitSourceRoot Include="@(SourceRoot -&gt; WithMetadataValue('SourceControl', 'git'))" />
163+
<_GitSourceRoot Include="@(SourceRoot -> WithMetadataValue('SourceControl', 'git'))" />
149164
</ItemGroup>
150165

151166
<PropertyGroup>
152167
<RepositoryRoot>@(_GitSourceRoot)</RepositoryRoot>
168+
<!-- Only change if it wasn't just the default from Microsoft.NET.DefaultAssemblyInfo.targets -->
169+
<ProductFromUrl Condition="'$(SourceControlInformationFeatureSupported)' == 'true'">$([System.IO.Path]::GetFileNameWithoutExtension($(PrivateRepositoryUrl)))</ProductFromUrl>
170+
<Product Condition="'$(Product)' == '$(AssemblyName)' and '$(ProductFromUrl)' != ''">$(ProductFromUrl)</Product>
153171
</PropertyGroup>
154172

155173
</Target>
156174

157-
<Target Name="UpdatePackageMetadata" BeforeTargets="PrepareForBuild;GenerateMSBuildEditorConfigFileShouldRun;GetAssemblyVersion;GetPackageMetadata;GenerateNuspec;Pack" DependsOnTargets="EnsureProjectInformation" Condition="'$(SourceControlInformationFeatureSupported)' == 'true' And '$(IsPackable)' == 'true'">
175+
<Target Name="UpdatePackageMetadata"
176+
BeforeTargets="PrepareForBuild;GenerateMSBuildEditorConfigFileShouldRun;GetAssemblyVersion;GetPackageMetadata;GenerateNuspec;Pack"
177+
DependsOnTargets="EnsureProjectInformation"
178+
Condition="'$(SourceControlInformationFeatureSupported)' == 'true' And
179+
'$(IsPackable)' == 'true'">
158180
<PropertyGroup>
159-
<PackageProjectUrl Condition="'$(PackageProjectUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(RepositoryUrl)</PackageProjectUrl>
181+
<PackageProjectUrl Condition="'$(PackageProjectUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(RepositoryUrl.Replace('.git', ''))</PackageProjectUrl>
160182
<PackageDescription>$(Description)</PackageDescription>
161-
<PackageReleaseNotes Condition="'$(RepositoryUrl)' != '' and Exists('$(MSBuildThisFileDirectory)..\changelog.md')">$(RepositoryUrl)/blob/main/changelog.md</PackageReleaseNotes>
183+
<PackageReleaseNotes Condition="'$(RepositoryUrl)' != '' and Exists('$(MSBuildThisFileDirectory)..\changelog.md')">$(RepositoryUrl.Replace('.git', ''))/blob/main/changelog.md</PackageReleaseNotes>
162184
</PropertyGroup>
163185
</Target>
164186

165187
<!-- Import before UsingTask because first to declare tasks wins -->
166-
<Import Project="Directory.targets" Condition="Exists('Directory.targets')" />
188+
<Import Project="Directory.targets" Condition="Exists('Directory.targets')"/>
167189
<Import Project="Directory.targets.user" Condition="Exists('Directory.targets.user')" />
168190

169191
</Project>

0 commit comments

Comments
 (0)