File tree Expand file tree Collapse file tree 3 files changed +19
-4
lines changed
Expand file tree Collapse file tree 3 files changed +19
-4
lines changed Original file line number Diff line number Diff line change 9696 weak
9797[file "src/Directory.Build.props"]
9898 url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
99- sha = c509be4378ff6789df4f66338cb88119453c0975
99+ sha = 0ff8b7b79a82112678326d1dc5543ed890311366
100100
101- etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
101+ etag = 3ebde0a8630d526b80f15801179116e17a857ff880a4442e7db7b075efa4fd63
102102 weak
103103[file "src/Directory.Build.targets"]
104104 url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
Original file line number Diff line number Diff line change @@ -320,6 +320,7 @@ The versioning scheme for packages is:
320320<!-- sponsors .md -->
321321[](https://github.com/clarius)
322322 [](https://github.com/MFB-Technologies-Inc)
323+ [](https://github.com/sandrock)
323324 [](https://github.com/drivenet)
324325 [](https://github.com/Keflon)
325326 [](https://github.com/tbolon)
@@ -344,9 +345,10 @@ The versioning scheme for packages is:
344345 [](https://github.com/jwendl)
345346 [](https://github.com/adalon)
346347 [](https://github.com/Eule02)
347- [](https://github.com/henkmartijn)
348348 [](https://github.com/torutek)
349349 [](https://github.com/mccaffers)
350+ [](https://github.com/christoh)
351+ [](https://github.com/ADS-Fund)
350352
351353
352354<!-- sponsors .md -->
Original file line number Diff line number Diff line change 1- <Project >
1+ <Project TreatAsLocalProperty = " VersionPrefix " >
22 <!-- To extend/change the defaults, create a Directory.props alongside this file -->
33
44 <PropertyGroup Label =" CI" Condition =" '$(CI)' == ''" >
4343
4444 <!-- Ensure MSBuild tooling can access package artifacts always via PKG_[PackageId] -->
4545 <GeneratePathProperty >true</GeneratePathProperty >
46+ <!-- Avoid warnings for test projects when we run dotnet pack on the whole solution. -->
47+ <WarnOnPackingNonPackableProject >false</WarnOnPackingNonPackableProject >
48+ <!-- See https://learn.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#prunepackagereference-specification -->
49+ <RestoreEnablePackagePruning >true</RestoreEnablePackagePruning >
4650 </PropertyGroup >
4751
4852 <PropertyGroup Label =" Build" >
134138 <VersionSuffix Condition =" !$(VersionLabel.Contains('refs/tags/'))" >$(_VersionLabel)</VersionSuffix >
135139 <!-- Special case for tags, the label is actually the version. Backs compat since passed-in value overrides MSBuild-set one -->
136140 <Version Condition =" $(VersionLabel.Contains('refs/tags/'))" >$(_VersionLabel)</Version >
141+
142+ <!-- In order for latest from main/master to always be greatest when using -prerelease switch on install/run,
143+ we change the scheme as follows:
144+ - main/master remain as today: VersionPrefix: 42.42.${{ github.run_number }} (from yaml)
145+ - others: VersionPrefix: 42.42.0-[label].${{ github.run_number }}
146+ -->
147+ <IsMaster Condition =" $(VersionLabel.Contains('refs/heads/main')) or $(VersionLabel.Contains('refs/heads/master'))" >true</IsMaster >
148+ <VersionPrefix Condition =" '$(IsMaster)' != 'true'" >42.42.0</VersionPrefix >
149+ <VersionSuffix Condition =" '$(IsMaster)' != 'true'" >$(VersionSuffix).$(GITHUB_RUN_NUMBER)</VersionSuffix >
137150 </PropertyGroup >
138151
139152 <ItemGroup Label =" ThisAssembly.Project" >
You can’t perform that action at this time.
0 commit comments