Skip to content

[automated] Merge branch 'release/9.0.2xx' => 'release/9.0.3xx' #47526

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

Closed
wants to merge 30 commits into from
Closed

[automated] Merge branch 'release/9.0.2xx' => 'release/9.0.3xx' #47526

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3911ea3
Merge commit 'b147026c9e448bb84055c263ede1531ba62d4c94'
Jan 22, 2025
494ef74
Merge commit '3f4e4ab698598674a19bf1afe8960b1845343e2d'
Feb 4, 2025
1efa89b
Merge commit 'cf38d2ee1c185b0d2985fa8b3c4d5b6636f20067'
Feb 5, 2025
03d2e51
Merge commit '268619a48c6ed1d87ff8393b309cad28abd52b9f'
Feb 6, 2025
b80e734
Merge commit 'e39fc8c751e8ea4b083bce4b7d298345bac68a02'
Feb 6, 2025
75e90fb
Merge commit '9edd8374b1614e326698d0dfb98ce938f9738102'
Feb 6, 2025
d558267
Merge commit 'c311a6d329af16b3fc068eca9dd40b27041f93a2'
Feb 6, 2025
a45f900
Merge commit 'fac56b2ed465c618060acad73b99ae60ea63ac23'
Feb 6, 2025
fb64924
Merge commit '865d8848a9edbe1408340ccf997e85793d828c81'
Feb 7, 2025
c74905d
Merge commit 'ad560cbf8d3188480b244eeb42cd512ec4d19335'
Feb 7, 2025
9f0f502
Merge commit '5a647a7e3b636fc0dc3ee78b2089c92cb29db6fd'
Feb 8, 2025
02c4bd5
Merge commit '228c796c8adf5e21ae76a41c95c739e11860263d'
Feb 11, 2025
1d6e945
Merge commit 'e4d65225f4602b4c082f415ed72132506ef6ee52'
Feb 11, 2025
a3cfd27
Merge commit '346d06baea1cf7113e181e779b056b955973c633'
Feb 12, 2025
7b568df
Merged PR 47533: [internal/release/9.0.1xx] Update dependencies from …
Feb 12, 2025
00b8b89
Merge commit '70393ec28787350e885a5acd196e94318f9edfd6'
Feb 12, 2025
f8e6eef
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Feb 13, 2025
91ddc98
Merged PR 47611: [internal/release/9.0.1xx] Update dependencies from …
Feb 13, 2025
a659cf1
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Feb 13, 2025
8fceac6
Merged PR 47615: [internal/release/9.0.1xx] Update dependencies from …
Feb 13, 2025
1671004
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Feb 13, 2025
2750432
Merged PR 47672: [internal/release/9.0.1xx] Update dependencies from …
Feb 13, 2025
dc41936
Merge commit '2750432faabfdcf0d08b9650ff1d0a5e45ca6e59' into internal…
vseanreesermsft Mar 11, 2025
3d62706
Add dotnet-templating feed to fix build failure
v-wuzhai Mar 12, 2025
1b40c2a
Merging internal commits for release/9.0.1xx (#47470)
v-wuzhai Mar 12, 2025
1d4c418
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
v-wuzhai Mar 12, 2025
4455c5a
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' (#47490)
v-wuzhai Mar 12, 2025
a8b7dc5
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Mar 12, 2025
b2333f6
[release/9.0.2xx] Update dependencies from dotnet/msbuild (#47511)
edvilme Mar 12, 2025
6643542
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into …
v-wuzhai Mar 13, 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
20 changes: 13 additions & 7 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,30 @@
<!-- Begin: Package sources from dotnet-aspire -->
<!-- End: Package sources from dotnet-aspire -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-b96167f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-b96167fb/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-b96167f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-b96167fb-2/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-dad5528" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dad5528e/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-dad5528-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dad5528e-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-dad5528-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dad5528e-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-d87bc64" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d87bc64f/nuget/v3/index.json" />
<add key="darc-pub-DotNet-msbuild-Trusted-a4ef1e9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a4ef1e90/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
<!-- End: Package sources from dotnet-roslyn-analyzers -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-831d23e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-831d23e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-831d23e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-pub-dotnet-templating-a2862fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a2862fdc/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-a2862fd-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a2862fdc-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-a2862fd-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a2862fdc-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-978233e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-978233e8/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-38b262d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-38b262d8/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-1c33258" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1c33258c/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-1c33258-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1c33258c-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-1c33258-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1c33258c-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
Expand All @@ -72,12 +74,16 @@
<!-- Begin: Package sources from dotnet-templating -->
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-b96167f" value="true" />
<add key="darc-int-dotnet-aspnetcore-b96167f-2" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-831d23e-1" value="true" />
<add key="darc-int-dotnet-runtime-831d23e-2" value="true" />
<add key="darc-int-dotnet-runtime-831d23e" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-1c33258-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-1c33258-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-1c33258" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,18 @@
<Sha>dad5528e5bdf92a05a5a404c5f7939523390b96d</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.13.19">
<Dependency Name="Microsoft.Build" Version="17.13.20">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d87bc64f6b9eb3af9b6b785f910136cc6a309ce7</Sha>
<Sha>a4ef1e90fef9b56473708b7d308f982c7c9f46d9</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.13.19-preview-25128-01">
<Dependency Name="Microsoft.Build.Localization" Version="17.13.20-preview-25162-14">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d87bc64f6b9eb3af9b6b785f910136cc6a309ce7</Sha>
<Sha>a4ef1e90fef9b56473708b7d308f982c7c9f46d9</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.19-preview-25128-01">
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.20-preview-25162-14">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d87bc64f6b9eb3af9b6b785f910136cc6a309ce7</Sha>
<Sha>a4ef1e90fef9b56473708b7d308f982c7c9f46d9</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.202-beta.25154.2">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.

Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
<MicrosoftBuildVersion>17.13.19</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.13.19-preview-25128-01</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildVersion>17.13.20</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.13.20-preview-25162-14</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
<MinimumVSVersion>17.12</MinimumVSVersion>
</PropertyGroup>
Expand Down