Skip to content

[release/10.0.1xx] Source code updates from dotnet/dotnet #51633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsplaisted merged 12 commits into from
Nov 18, 2025
Merged

[release/10.0.1xx] Source code updates from dotnet/dotnet #51633

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
138720d
Backflow from https://github.com/dotnet/dotnet / e17b0d0 build 289695
dotnet-maestro[bot] Nov 8, 2025
5ba0fa8
Merge release/10.0.1xx into darc-release/10.0.1xx-93f43bbb-dd87-4769-…
dotnet-maestro[bot] Nov 8, 2025
a9ba084
Update dependencies from https://github.com/dotnet/dotnet build 289695
dotnet-maestro[bot] Nov 8, 2025
22ff741
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-93f43bbb-d…
DonnaChen888 Nov 11, 2025
127cce5
Fix workload manifest package prerelease label for servicing
dsplaisted Nov 12, 2025
d638d2d
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-93f43bbb-d…
DonnaChen888 Nov 12, 2025
934db91
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-93f43bbb-d…
DonnaChen888 Nov 12, 2025
6304ba0
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-93f43bbb-d…
DonnaChen888 Nov 13, 2025
629ad2c
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-93f43bbb-d…
DonnaChen888 Nov 14, 2025
bddce54
Use default runtime version in runtimeconfig.json same as MSBuild-bas…
jjonescz Nov 14, 2025
01e5beb
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-93f43bbb-d…
DonnaChen888 Nov 17, 2025
ef10228
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-93f43bbb-d…
DonnaChen888 Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix workload manifest package prerelease label for servicing
  • Loading branch information
@dsplaisted
dsplaisted committed Nov 12, 2025
commit 127cce5c4b79ae61dd02bd98089103d2cff429ee
5 changes: 3 additions & 2 deletions src/Workloads/Manifests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
</PropertyGroup>

<PropertyGroup>
<_workloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' and '$(PrereleaseVersionLabel)' != 'rtm'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</_workloadVersionSuffix>
<_workloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' and '$(PrereleaseVersionLabel)' != 'rtm'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</_workloadVersionSuffix>
<_workloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' and
'$(PrereleaseVersionLabel)' != 'rtm' and
'$(PrereleaseVersionLabel)' != 'servicing'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</_workloadVersionSuffix>
<PackageId>$(MSBuildProjectName)-$(BuiltinWorkloadFeatureBand)$(_workloadVersionSuffix)</PackageId>
<PackageId Condition="'$(MSBuildProjectName)' == 'Microsoft.NET.Workload.Emscripten.Current.Transport.Manifest'">Microsoft.NET.Workload.Emscripten.Current.Manifest-$(BuiltinWorkloadFeatureBand).Transport</PackageId>
</PropertyGroup>
Expand Down
Loading