Skip to content

Commit 42c1eef

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 47591: [internal/release/8.0.3xx] Merge from public
Merge from public release/8.0.3xx to internal/release/8.0.3xx and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Merge from public branch to internal release branch. #### PR Summary This pull request merges updates from the public branch into the internal release branch, including updates to package sources and dependencies. - Updated `NuGet.config` with new package sources and removed outdated ones. - Updated `eng/Version.Details.xml` with new versions and SHAs for various dependencies. - Updated `global.json` to reference new versions of `Microsoft.DotNet.Arcade.Sdk` and `Microsoft.DotNet.Helix.Sdk`. - Updated `eng/Versions.props` with new versions for `MicrosoftBuildPackageVersion`, `MicrosoftBuildLocalizationPackageVersion`, and `MicrosoftDotNetXUnitExtensionsVersion`. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
2 parents e85b180 + fa8c83b commit 42c1eef

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-1/nuget/v3/index.json" />
2222
<!-- End: Package sources from dotnet-aspnetcore -->
2323
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
24-
<add key="darc-pub-DotNet-msbuild-Trusted-939cc33" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-939cc332/nuget/v3/index.json" />
24+
<add key="darc-pub-DotNet-msbuild-Trusted-0e18be8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-0e18be81/nuget/v3/index.json" />
2525
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2626
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2727
<!-- 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
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.10.19">
58+
<Dependency Name="Microsoft.Build" Version="17.10.21">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>939cc332cc357d59cc6cfdde70ddc03372e22c26</Sha>
60+
<Sha>0e18be81c1881b24619dd1239afca022aeff1eef</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.10.19-preview-25071-10">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.10.21-preview-25111-03">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>939cc332cc357d59cc6cfdde70ddc03372e22c26</Sha>
64+
<Sha>0e18be81c1881b24619dd1239afca022aeff1eef</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.19-preview-25071-10">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.21-preview-25111-03">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>939cc332cc357d59cc6cfdde70ddc03372e22c26</Sha>
68+
<Sha>0e18be81c1881b24619dd1239afca022aeff1eef</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25105.2">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25111.4">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
496+
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25105.2">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25111.4">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
501+
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25105.2">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25111.4">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
505+
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25105.2">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25111.4">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
509+
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25105.2</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25111.4</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -124,7 +124,7 @@
124124
</PropertyGroup>
125125
<PropertyGroup>
126126
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
127-
<MicrosoftBuildPackageVersion>17.10.19</MicrosoftBuildPackageVersion>
127+
<MicrosoftBuildPackageVersion>17.10.21</MicrosoftBuildPackageVersion>
128128
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
129129
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
130130
so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
133133
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
134134
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
135135
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
136-
<MicrosoftBuildLocalizationPackageVersion>17.10.19-preview-25071-10</MicrosoftBuildLocalizationPackageVersion>
136+
<MicrosoftBuildLocalizationPackageVersion>17.10.21-preview-25111-03</MicrosoftBuildLocalizationPackageVersion>
137137
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
138138
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -213,7 +213,7 @@
213213
<PropertyGroup>
214214
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
215215
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
216-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25105.2</MicrosoftDotNetXUnitExtensionsVersion>
216+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25111.4</MicrosoftDotNetXUnitExtensionsVersion>
217217
<MoqPackageVersion>4.18.4</MoqPackageVersion>
218218
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
219219
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.112",
3+
"dotnet": "8.0.113",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25105.2",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25105.2"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25111.4",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25111.4"
1919
}
2020
}

0 commit comments

Comments
 (0)