Skip to content

Commit 8f21634

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 46860: [internal/release/8.0.1xx] Merge from public
Merge from public release/8.0.1xx to internal/release/8.0.1xx and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Dependency updates and internal configuration changes. #### PR Summary This pull request updates various dependencies and internal configurations to newer versions. - Updated dependency versions in `/eng/Version.Details.xml` and `/global.json`. - Added new package sources and updated existing ones in `/NuGet.config`. - Updated MSBuild version in `/eng/common/tools.ps1` and `/eng/common/sdk-task.ps1`. - Updated various dependency versions in `/eng/Versions.props`.
2 parents 415951d + a96fa93 commit 8f21634

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

‎NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca/nuget/v3/index.json" />
2525
<!-- End: Package sources from dotnet-aspnetcore -->
2626
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
27-
<add key="darc-pub-DotNet-msbuild-Trusted-e2abee0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e2abee08/nuget/v3/index.json" />
27+
<add key="darc-pub-DotNet-msbuild-Trusted-31744df" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-31744dfc/nuget/v3/index.json" />
2828
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2929
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3030
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3131
<!-- Begin: Package sources from dotnet-runtime -->
3232
<add key="darc-int-dotnet-runtime-eba546b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0/nuget/v3/index.json" />
3333
<!-- End: Package sources from dotnet-runtime -->
3434
<!-- Begin: Package sources from dotnet-templating -->
35-
<add key="darc-pub-dotnet-templating-3dc94e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-3dc94e39/nuget/v3/index.json" />
35+
<add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
3636
<!-- End: Package sources from dotnet-templating -->
3737
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3838
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.113">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>3dc94e390f9d515149fe99e64bf5daa8133aff4d</Sha>
6+
<Sha>335a66efa4126495303c20598f1d9537d5d6897c</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.113-servicing.25062.5">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.113-servicing.25066.8">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>3dc94e390f9d515149fe99e64bf5daa8133aff4d</Sha>
10+
<Sha>335a66efa4126495303c20598f1d9537d5d6897c</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.113-servicing.25062.5">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.113-servicing.25066.8">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>3dc94e390f9d515149fe99e64bf5daa8133aff4d</Sha>
14+
<Sha>335a66efa4126495303c20598f1d9537d5d6897c</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.13">
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.8.15">
58+
<Dependency Name="Microsoft.Build" Version="17.8.18">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef</Sha>
60+
<Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.8.15-preview-24613-11">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.8.18-preview-25066-03">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef</Sha>
64+
<Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.15-preview-24613-11">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.18-preview-25066-03">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef</Sha>
68+
<Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25060.1">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
496+
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25060.1">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25066.6">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
501+
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25060.1">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25066.6">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
505+
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25060.1">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25066.6">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
509+
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25060.1</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25066.6</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -121,7 +121,7 @@
121121
</PropertyGroup>
122122
<PropertyGroup>
123123
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
124-
<MicrosoftBuildPackageVersion>17.8.15</MicrosoftBuildPackageVersion>
124+
<MicrosoftBuildPackageVersion>17.8.18</MicrosoftBuildPackageVersion>
125125
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
126126
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
127127
so target one that matches the version in minimumMSBuildVersion.
@@ -130,7 +130,7 @@
130130
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
131131
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
132132
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
133-
<MicrosoftBuildLocalizationPackageVersion>17.8.15-preview-24613-11</MicrosoftBuildLocalizationPackageVersion>
133+
<MicrosoftBuildLocalizationPackageVersion>17.8.18-preview-25066-03</MicrosoftBuildLocalizationPackageVersion>
134134
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
135135
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
136136
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -143,7 +143,7 @@
143143
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
144144
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
145145
<!-- test dependencies -->
146-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.113-servicing.25062.5</MicrosoftTemplateEngineMocksPackageVersion>
146+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.113-servicing.25066.8</MicrosoftTemplateEngineMocksPackageVersion>
147147
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
148148
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
149149
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -209,7 +209,7 @@
209209
<PropertyGroup>
210210
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
211211
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
212-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25060.1</MicrosoftDotNetXUnitExtensionsVersion>
212+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25066.6</MicrosoftDotNetXUnitExtensionsVersion>
213213
<MoqPackageVersion>4.18.4</MoqPackageVersion>
214214
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
215215
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
384384

385385
# If the version of msbuild is going to be xcopied,
386386
# use this version. Version matches a package here:
387-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
388-
$defaultXCopyMSBuildVersion = '17.8.1-2'
387+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0
388+
$defaultXCopyMSBuildVersion = '17.12.0'
389389

390390
if (!$vsRequirements) {
391391
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎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.110",
3+
"dotnet": "8.0.112",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25066.6"
1919
}
2020
}

0 commit comments

Comments
 (0)