Skip to content

Commit 2182ad3

Browse files
marcpopMSFTvseanreesermsft
authored andcommitted
Merged PR 51011: Merge from public to internal
#### AI description (iteration 1) #### PR Classification This PR synchronizes dependency and configuration updates by merging changes from the public branch into the internal repository. #### PR Summary This merge updates multiple dependency versions, configuration settings, and localization strings to align internal builds with public updates. Key changes include: - Updates in `eng/Version.Details.xml` and `eng/Versions.props` to bump versions for Microsoft.DotNet.Darc, Microsoft.DotNet.DarcLib, Microsoft.DotNet.Arcade.Sdk, Microsoft.Build, and scenario test packages. - Revised package references in `src/Layout/tool_fsharp/tool_fsc.csproj` with version overrides and the addition of Microsoft.NET.StringTools. - Version increments in `src/SourceBuild/content/global.json` and related version prop files for .NET tools and source-built SDK/artifact versions. - CI and NuGet configuration adjustments in `/.vsts-ci.yml` and `/NuGet.config`, including updating branch names and package source keys. - Translation updates in localization files under `src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/` for container download failure messages. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
2 parents 643f2f7 + fabd7af commit 2182ad3

File tree

16 files changed

+38
-37
lines changed

16 files changed

+38
-37
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.24367.3",
6+
"version": "1.1.0-beta.25317.4",
77
"commands": [
88
"darc"
99
]

.vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ extends:
105105
templateFolderName: templates-official
106106
publishTaskPrefix: 1ES.
107107
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
108-
locBranch: release/9.0.3xx
108+
locBranch: main
109109
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
110110
timeoutInMinutes: 90
111111
windowsJobParameterSets:

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<add key="darc-pub-dotnet-emsdk-b567cdb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b567cdb6/nuget/v3/index.json" />
3131
<!-- End: Package sources from dotnet-emsdk -->
3232
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
33-
<add key="darc-pub-DotNet-msbuild-Trusted-c95bb4f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-c95bb4f6/nuget/v3/index.json" />
33+
<add key="darc-pub-DotNet-msbuild-Trusted-65391c5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-65391c53/nuget/v3/index.json" />
3434
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3535
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3636
<!-- End: Package sources from dotnet-roslyn-analyzers -->

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>b567cdb6b8b461de79f2a2536a22ca3a67f2f33e</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.14.12">
72+
<Dependency Name="Microsoft.Build" Version="17.14.13">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>c95bb4f600d1a6e1afa99869f302820d4c114053</Sha>
74+
<Sha>65391c53b2d0d47b01039648ea788fe5c6c5eec1</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.12-servicing-25278-08">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.13-servicing-25313-14">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>c95bb4f600d1a6e1afa99869f302820d4c114053</Sha>
78+
<Sha>65391c53b2d0d47b01039648ea788fe5c6c5eec1</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.12-servicing-25278-08">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.13-servicing-25313-14">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>c95bb4f600d1a6e1afa99869f302820d4c114053</Sha>
83+
<Sha>65391c53b2d0d47b01039648ea788fe5c6c5eec1</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25228.3">
@@ -589,22 +589,22 @@
589589
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
590590
<Sha>3c298d9f00936d651cc47d221762474e25277672</Sha>
591591
</Dependency>
592-
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24367.3">
592+
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25317.4">
593593
<Uri>https://github.com/dotnet/arcade-services</Uri>
594-
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
594+
<Sha>e156e649f28395d9d0ee1e848225a689b59e0fd3</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24367.3">
596+
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25317.4">
597597
<Uri>https://github.com/dotnet/arcade-services</Uri>
598-
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
598+
<Sha>e156e649f28395d9d0ee1e848225a689b59e0fd3</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25269.1">
600+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25316.1">
601601
<Uri>https://github.com/dotnet/scenario-tests</Uri>
602-
<Sha>5c769be3733c4ffa543fc7e7ec5fadd4fa8f8c9e</Sha>
602+
<Sha>45390d82e9b9686adeee65e046b8232f6814bea0</Sha>
603603
</Dependency>
604604
<!-- Intermediate is necessary for source build. -->
605-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25269.1">
605+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25316.1">
606606
<Uri>https://github.com/dotnet/scenario-tests</Uri>
607-
<Sha>5c769be3733c4ffa543fc7e7ec5fadd4fa8f8c9e</Sha>
607+
<Sha>45390d82e9b9686adeee65e046b8232f6814bea0</Sha>
608608
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
609609
</Dependency>
610610
<!--

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</PropertyGroup>
7474
<PropertyGroup>
7575
<!-- Dependency from https://github.com/dotnet/arcade-services -->
76-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24367.3</MicrosoftDotNetDarcLibVersion>
76+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25317.4</MicrosoftDotNetDarcLibVersion>
7777
</PropertyGroup>
7878
<PropertyGroup>
7979
<!-- Dependency from https://github.com/dotnet/aspire -->
@@ -182,8 +182,8 @@
182182
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
183183
184184
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
185-
<MicrosoftBuildVersion>17.14.12</MicrosoftBuildVersion>
186-
<MicrosoftBuildLocalizationVersion>17.14.12-servicing-25278-08</MicrosoftBuildLocalizationVersion>
185+
<MicrosoftBuildVersion>17.14.13</MicrosoftBuildVersion>
186+
<MicrosoftBuildLocalizationVersion>17.14.13-servicing-25313-14</MicrosoftBuildLocalizationVersion>
187187
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.31</MicrosoftBuildMinimumVersion>
188188
<MinimumVSVersion>17.12</MinimumVSVersion>
189189
</PropertyGroup>
@@ -263,7 +263,7 @@
263263
<PropertyGroup Label="Infrastructure and test only dependencies">
264264
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
265265
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
266-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25269.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
266+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25316.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
267267
</PropertyGroup>
268268
<PropertyGroup Label="Manually updated">
269269
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)