Skip to content

Commit d977e96

Browse files
dotnet-maestro[bot]T-GroCopilot
authored
[main] Source code updates from dotnet/dotnet (#19679)
* Backflow from https://github.com/dotnet/dotnet / 423ddd1 build 312946 Diff: https://github.com/dotnet/dotnet/compare/500589b2e20fb8a427620bb0fe9cedf1c68c5333..423ddd1cabeff54b53750de2d429e6ea121c7fd1 From: dotnet/dotnet@500589b To: dotnet/dotnet@423ddd1 [[ commit created by automation ]] * Update dependencies from build 312946 No dependency updates to commit [[ commit created by automation ]] * Re-add MSBuild darc NuGet source needed for Microsoft.Build 18.6.4 The codeflow automation incorrectly removed the darc-pub-DotNet-msbuild-Trusted-13cd968a NuGet source while Microsoft.Build.Framework 18.6.4 is still referenced in Version.Details.xml. This package is not available on any standard feed (nearest stable is 18.4.0 on dotnet-public), causing NU1103 errors across all CI jobs. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Update dependencies from build 313071 No dependency updates to commit [[ commit created by automation ]] * Re-add MSBuild darc NuGet source needed for Microsoft.Build 18.6.4 The codeflow automation incorrectly removed the darc-pub-DotNet-msbuild-Trusted-13cd968a NuGet source while Microsoft.Build.Framework 18.6.4 is still referenced in Version.Details.xml. This package is not available on any standard feed (nearest stable is 18.4.0 on dotnet-public), causing NU1103 errors across all CI jobs. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Retrigger CI after transient agent cancellation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent ba48c78 commit d977e96

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="ab01524bbb2ef1eea0ffaef161b3ef5686e8f256" BarId="310648" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="c802bb0f0b272d8547b12719c604c65f6beb1912" BarId="313071" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.Build" Version="18.6.4">
66
<Uri>https://github.com/dotnet/msbuild</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PropertyGroup>
1515
<!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
1616
the iteration format at the moment. https://github.com/dotnet/arcade/issues/15919 -->
17-
<FSharpPreReleaseIteration>4</FSharpPreReleaseIteration>
17+
<FSharpPreReleaseIteration>5</FSharpPreReleaseIteration>
1818
<PreReleaseVersionLabel>preview$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
1919
<!-- F# Version components -->
2020
<FSMajorVersion>11</FSMajorVersion>

0 commit comments

Comments
 (0)