Skip to content

Commit 5432de0

Browse files
MiYanniMiYanni
committed
Merge branch 'main' into merge/release/9.0.3xx-to-main
# Conflicts: # NuGet.config # eng/Version.Details.xml # eng/Versions.props # global.json # src/Cli/Microsoft.DotNet.Cli.Sln.Internal/FileManipulation/FileUtil.cs # src/Cli/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs # src/Cli/dotnet/SlnFileExtensions.cs # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf # src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf # src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.InstallRecords.cs # src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets # src/SourceBuild/content/eng/Version.Details.xml # src/SourceBuild/content/eng/Versions.props # src/SourceBuild/content/global.json # src/Tasks/Common/Resources/Strings.resx # src/Tasks/Common/Resources/xlf/Strings.cs.xlf # src/Tasks/Common/Resources/xlf/Strings.de.xlf # src/Tasks/Common/Resources/xlf/Strings.es.xlf # src/Tasks/Common/Resources/xlf/Strings.fr.xlf # src/Tasks/Common/Resources/xlf/Strings.it.xlf # src/Tasks/Common/Resources/xlf/Strings.ja.xlf # src/Tasks/Common/Resources/xlf/Strings.ko.xlf # src/Tasks/Common/Resources/xlf/Strings.pl.xlf # src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf # src/Tasks/Common/Resources/xlf/Strings.ru.xlf # src/Tasks/Common/Resources/xlf/Strings.tr.xlf # src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf # src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf # src/Tasks/Microsoft.NET.Build.Tasks/ShowMissingWorkloads.cs # test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.cs # test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs # test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs # test/Microsoft.NET.Build.Tests/WorkloadTests.cs # test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt # test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt # test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt # test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt # test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt # test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt # test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs # test/dotnet-watch.Tests/Utilities/AssertEx.cs # test/dotnet-workload-search.Tests/GivenDotnetWorkloadSearch.cs
2 parents d8d501b + a076841 commit 5432de0

File tree

1,900 files changed

+40346
-23816
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,900 files changed

+40346
-23816
lines changed

Diff for: ‎.config/dotnet-tools.json

+1-1
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.25072.2",
77
"commands": [
88
"darc"
99
]

Diff for: ‎.config/tsaoptions.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"instanceUrl": "https://devdiv.visualstudio.com/",
3+
"template": "TFSDEVDIV",
4+
"projectName": "DEVDIV",
5+
"areaPath": "DevDiv\\NET Tools\\SDK",
6+
"iterationPath": "DevDiv",
7+
"notificationAliases": [ "dotnetdevexcli@microsoft.com" ],
8+
"repositoryName": "dotnet-sdk",
9+
"codebaseName": "dotnet-sdk"
10+
}

Diff for: ‎.devcontainer/vmr/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// The container supports source-building the SDK
44
{
55
"name": "VMR with PR changes",
6-
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39",
6+
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9",
77
"hostRequirements": {
88
// A completely source built .NET is >64 GB with all the repos/artifacts
99
"storage": "128gb"

Diff for: ‎.devcontainer/vmr/init.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ vmr_branch=$(git -C "$sdk_dir" log --pretty=format:'%D' HEAD^ \
2525
| sed 's@origin/@@' \
2626
| sed 's@,.*@@')
2727

28-
"$workspace_dir/synchronize-vmr.sh" --branch "$vmr_branch" --debug
28+
"$workspace_dir/synchronize-vmr.sh" --branch "$vmr_branch" --ci --debug
2929

30-
(cd "$vmr_dir" && ./prep-source-build.sh)
30+
cd "$vmr_dir"

Diff for: ‎.gitattributes

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
###############################################################################
1111
*.xlf linguist-generated=true
1212

13+
###############################################################################
14+
# Set default behavior to:
15+
# don't collapse these files in PRs
16+
###############################################################################
17+
**/build/** linguist-generated=false
18+
1319
###############################################################################
1420
# Set file behavior to:
1521
# treat as text

Diff for: ‎.github/workflows/stale.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
inputs:
99
daysBeforeStale:
1010
required: true
11-
default: "2192"
11+
default: "1827"
1212
daysBeforeClose:
1313
required: true
1414
default: "30"

Diff for: ‎.vsts-ci.yml

+12-40
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ extends:
6565
containers:
6666
alpine319WithNode:
6767
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
68-
cblMariner20Fpm:
69-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
7068
centosStream9:
7169
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
7270
debian12Amd64:
@@ -75,13 +73,17 @@ extends:
7573
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
7674
mariner20CrossArm:
7775
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
78-
ubuntu2204DebPkg:
79-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
8076
sdl:
8177
sourceAnalysisPool:
8278
name: $(DncEngInternalBuildPool)
8379
image: 1es-windows-2022
8480
os: windows
81+
policheck:
82+
enabled: true
83+
tsa:
84+
enabled: true
85+
binskim:
86+
enabled: true
8587
${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:
8688
componentgovernance:
8789
# Refdoc: https://docs.opensource.microsoft.com/tools/cg/component-detection/variables/
@@ -105,6 +107,10 @@ extends:
105107
publishTaskPrefix: 1ES.
106108
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
107109
locBranch: release/9.0.2xx
110+
# WORKAROUND: BinSkim requires the folder exist prior to scanning.
111+
preSteps:
112+
- powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force
113+
displayName: Create artifacts/bin directory
108114
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
109115
timeoutInMinutes: 90
110116
windowsJobParameterSets:
@@ -200,21 +206,20 @@ extends:
200206
runTests: false
201207
### PORTABLE ###
202208
- categoryName: Portable
203-
container: ubuntu2204DebPkg
204209
# Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.
205210
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
206211
officialBuildProperties: $(_officialBuildProperties)
207212
osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
208213
runTests: false
209214
- categoryName: Portable
210-
container: cblMariner20Fpm
215+
container: centosStream9
211216
# Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.
212217
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
213218
officialBuildProperties: $(_officialBuildProperties)
214219
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
215220
runTests: false
216221
- categoryName: Portable
217-
container: cblMariner20Fpm
222+
container: centosStream9
218223
buildArchitecture: arm64
219224
runtimeIdentifier: linux-arm64
220225
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
@@ -305,16 +310,6 @@ extends:
305310
buildArchitecture: arm64
306311
runtimeIdentifier: osx-arm64
307312

308-
############### SOURCE BUILD ###############
309-
- template: /eng/common/templates-official/job/source-build.yml@self
310-
parameters:
311-
enableInternalSources: true
312-
platform:
313-
name: Managed
314-
container: centosStream9
315-
jobProperties:
316-
timeoutInMinutes: 30
317-
318313
############### DOTNET-FORMAT ###############
319314
- ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:
320315
- template: /eng/dotnet-format/dotnet-format-integration.yml@self
@@ -337,26 +332,3 @@ extends:
337332
name: $(DncEngInternalBuildPool)
338333
image: 1es-windows-2022
339334
os: windows
340-
341-
############### POST-BUILD STAGE ###############
342-
- template: /eng/common/templates-official/post-build/post-build.yml@self
343-
parameters:
344-
publishingInfraVersion: 3
345-
enableSymbolValidation: false
346-
enableSigningValidation: false
347-
enableNugetValidation: false
348-
enableSourceLinkValidation: false
349-
publishInstallersAndChecksums: true
350-
publishAssetsImmediately: true
351-
SDLValidationParameters:
352-
enable: false
353-
params: ' -SourceToolsList @("policheck","credscan")
354-
-TsaInstanceURL $(_TsaInstanceURL)
355-
-TsaProjectName $(_TsaProjectName)
356-
-TsaNotificationEmail $(_TsaNotificationEmail)
357-
-TsaCodebaseAdmin $(_TsaCodebaseAdmin)
358-
-TsaBugAreaPath $(_TsaBugAreaPath)
359-
-TsaIterationPath $(_TsaIterationPath)
360-
-TsaRepositoryName "dotnet-sdk"
361-
-TsaCodebaseName "dotnet-sdk"
362-
-TsaPublish $True'

Diff for: ‎.vsts-pr.yml

+5-10
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ pr:
88
- main
99
- release/*
1010
- internal/release/*
11+
paths:
12+
exclude:
13+
- documentation/*
14+
- README.md
15+
- CODEOWNERS
1116

1217
variables:
1318
- template: /eng/pipelines/templates/variables/sdk-defaults.yml
@@ -71,15 +76,5 @@ stages:
7176
buildArchitecture: arm64
7277
runtimeIdentifier: osx-arm64
7378

74-
############### SOURCE BUILD ###############
75-
- template: /eng/common/templates/job/source-build.yml
76-
parameters:
77-
enableInternalSources: true
78-
platform:
79-
name: Managed
80-
container: centosStream9
81-
jobProperties:
82-
timeoutInMinutes: 30
83-
8479
############### DOTNET-FORMAT ###############
8580
- template: /eng/dotnet-format/dotnet-format-integration.yml

Diff for: ‎CODEOWNERS

+2-1
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@
106106
/test/dotnet-format.Tests @dotnet/roslyn-ide
107107

108108
# Area: VMR & SourceBuild
109-
/.devcontainer/ @dotnet/source-build
109+
/.devcontainer/ @dotnet/source-build @dotnet/product-construction
110110
/eng/pipelines/ @dotnet/source-build @dotnet/product-construction
111+
/eng/DotNetBuild.props @dotnet/source-build @dotnet/product-construction
111112
/eng/SourceBuild* @dotnet/source-build
112113
/src/SourceBuild/ @dotnet/source-build @dotnet/product-construction
113114
/src/VirtualMonoRepo/ @dotnet/product-construction

Diff for: ‎Directory.Build.props

+19-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
Note: The redist-installer project does use Architecture. The Arcade SDK does not use either BuildArchitecture or Architecture.
1717
-->
1818
<Platform Condition="'$(SetPlatformFromArchitecture)' == 'true' And ('$(Platform)' == '' Or '$(Platform)' == 'AnyCPU')">$(Architecture)</Platform>
19+
<Nullable>enable</Nullable>
1920
</PropertyGroup>
2021

2122
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
@@ -34,7 +35,10 @@
3435
<!-- Default to all packages generating a corresponding symbol package -->
3536
<IncludeSymbols>true</IncludeSymbols>
3637
<IsShippingPackage>false</IsShippingPackage>
37-
<SdkTargetFramework>net9.0</SdkTargetFramework>
38+
<SdkTargetFramework>net10.0</SdkTargetFramework>
39+
<!-- TODO: Remove when Arcade updated NetCurrent to net10.0. -->
40+
<NetCurrent>net10.0</NetCurrent>
41+
<NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</NetToolMinimum>
3842
<ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
3943
<VisualStudioServiceTargetFramework>net8.0</VisualStudioServiceTargetFramework>
4044

@@ -44,7 +48,7 @@
4448
<!-- NU1701 Disable implicit package target fallback, and disable warning for when we explicitly add it (currently needed for
4549
Microsoft.ApplicationInsights) -->
4650
<!-- NU1507 Disable multi-feed check as .NET uses multiple internal feeds intentionally -->
47-
<NoWarn>$(NoWarn);NU1701;NU1507</NoWarn>
51+
<NoWarn>$(NoWarn);NU1701;NU1507;NU1202</NoWarn>
4852
<!-- do not enable analyzers on source build-->
4953
<EnforceCodeStyleInBuild Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</EnforceCodeStyleInBuild>
5054
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
@@ -77,5 +81,18 @@
7781
<Using Include="System.Xml.Linq" />
7882
</ItemGroup>
7983

84+
<!-- These aliases need to live outside of Versions.props as VMR / source-build overwrites some of the version properties for live builds. -->
85+
<PropertyGroup>
86+
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
87+
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppHostwinx64PackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
88+
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
89+
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
90+
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
91+
92+
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
93+
<SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>
94+
</PropertyGroup>
95+
8096
<Import Project="build/GenerateResxSource.targets" />
97+
8198
</Project>

Diff for: ‎Directory.Build.targets

+22-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
4+
<PropertyGroup>
5+
<!--
6+
Disable nullable warnings when targeting anything other than our supported .NET core version(s).
7+
This condition will be evaluated multiple times in multi-targeted projects hence need to be careful
8+
to only set in the inner builds, not the outer build where only $(TargetFrameworks) is defined.
9+
We still check $(TargetFrameworks) for empty though, because for single-targeted builds we want to
10+
allow nullable warnings regardless of target framework.
11+
-->
12+
<NoWarn Condition="'$(DisableNullableWarnings)' == '' AND '$(TargetFrameworks)' != '' AND '$(TargetFramework)' != '' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">$(NoWarn);Nullable</NoWarn>
13+
</PropertyGroup>
14+
415
<ItemGroup>
516
<SupportedPlatform Remove="Android" />
617
<SupportedPlatform Remove="iOS" />
@@ -36,22 +47,30 @@
3647

3748
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
3849

50+
<PropertyGroup>
51+
<FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel)</FullNugetVersion>
52+
<FullNugetVersion Condition="'$(PreReleaseVersionIteration)' != ''">$(FullNugetVersion).$(PreReleaseVersionIteration)</FullNugetVersion>
53+
<FullNugetVersion Condition=" '$(VersionSuffixDateStamp)' != '' And '$(VersionSuffixBuildOfTheDay)' != '' ">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>
54+
</PropertyGroup>
55+
3956
<!-- Optionally override arcade's test target with one which will run the tests as tools.
4057
Conditionally overriding a target requires a conditional import of another (.targets)
4158
file. -->
4259
<Import Project="OverrideTest.targets"
4360
Condition="'$(RunTestsAsTool)' == 'true' And '$(CanRunTestAsTool)' == 'true'"/>
4461

45-
4662
<!-- Update KnownFrameworkReferences to target the right version of the runtime -->
4763
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
4864
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))
49-
and '$(MSBuildProjectName)' != 'toolset-tasks'
50-
and '$(MSBuildProjectName)' != 'core-sdk-tasks'">
65+
and '$(MSBuildProjectName)' != 'sdk-tasks'">
5166
<FrameworkReference
5267
Update="Microsoft.NETCore.App"
5368
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
5469
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
70+
<KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler"
71+
ILCompilerPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
72+
<KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2"
73+
Crossgen2PackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
5574
</ItemGroup>
5675

5776
<ItemGroup Condition="$(MicrosoftAspNetCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))">

Diff for: ‎Directory.Packages.props

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
3434
<PackageVersion Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
3535
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersPackageVersion)" />
36+
<PackageVersion Include="Microsoft.DotNet.DarcLib" Version="$(MicrosoftDotNetDarcLibVersion)" />
3637
<PackageVersion Include="Microsoft.DotNet.Installer.Windows.Security.TestData" Version="$(MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion)" />
3738
<PackageVersion Include="Microsoft.DotNet.SignCheck" Version="$(ArcadeSdkVersion)" />
3839
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
@@ -44,8 +45,8 @@
4445
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
4546
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
4647
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
47-
<PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
4848
<PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistPackageVersion)" />
49+
<PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
4950
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
5051
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
5152
<PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />
@@ -105,6 +106,7 @@
105106
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)" />
106107
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
107108
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
109+
<PackageVersion Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
108110
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
109111
<!-- System.Reflection.Metadata and System.Collections.Immutable cannot be pinned here because of hard dependencies within Roslyn on specific versions that have to work both here and in VS -->
110112
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="$(SystemReflectionMetadataLoadContextVersion)" />

0 commit comments

Comments
 (0)