Skip to content

Commit 1828045

Browse files
v-wuzhaiv-wuzhai
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into merge/release/9.0.2xx-to-release/9.0.3xx
2 parents 27e9ef4 + 7cde229 commit 1828045

File tree

244 files changed

+2875
-1572
lines changed

Some content is hidden

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

244 files changed

+2875
-1572
lines changed

‎Directory.Packages.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@
6565
<PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
6666
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
6767
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
68+
<PackageVersion Include="Microsoft.VisualStudio.Sdk" Version="17.2.32505.173" />
69+
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.11.435" />
6870
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
69-
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.28" />
71+
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
7072
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
7173
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
7274
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />

‎NuGet.config

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,12 @@
2828
<!-- Begin: Package sources from dotnet-emsdk -->
2929
<!-- End: Package sources from dotnet-emsdk -->
3030
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
31-
<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" />
3231
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3332
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3433
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3534
<!-- Begin: Package sources from dotnet-runtime -->
3635
<!-- End: Package sources from dotnet-runtime -->
3736
<!-- Begin: Package sources from dotnet-templating -->
38-
<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" />
39-
<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" />
40-
<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" />
41-
<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" />
42-
<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" />
4337
<!-- End: Package sources from dotnet-templating -->
4438
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4539
<!-- End: Package sources from dotnet-windowsdesktop -->
@@ -59,6 +53,8 @@
5953
<add key="dotnet-tools-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json" />
6054
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
6155
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
56+
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
57+
<add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
6258
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
6359
<!-- Used for Rich Navigation indexing task -->
6460
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />

‎eng/Signing.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
<FileSignInfo Include="MessagePack.Annotations.dll" CertificateName="$(ExternalCertificateId)" />
6868
<FileSignInfo Include="MessagePack.dll" CertificateName="$(ExternalCertificateId)" />
6969
<FileSignInfo Include="Nerdbank.Streams.dll" CertificateName="$(ExternalCertificateId)" />
70-
<FileSignInfo Include="StreamJsonRpc.dll" CertificateName="$(ExternalCertificateId)" />
7170
<FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="$(ExternalCertificateId)" />
7271
<FileSignInfo Include="CommandLine.dll" CertificateName="$(ExternalCertificateId)" />
7372
<FileSignInfo Include="FluentAssertions.dll" CertificateName="$(ExternalCertificateId)" />
@@ -81,6 +80,10 @@
8180
<FileSignInfo Include="Valleysoft.DockerCredsProvider.dll" CertificateName="$(ExternalCertificateId)" />
8281
</ItemGroup>
8382

83+
<ItemGroup>
84+
<FileSignInfo Include="StreamJsonRpc.dll" CertificateName="MicrosoftSHA2" />
85+
</ItemGroup>
86+
8487
<!-- Filter out any test packages from ItemsToSign -->
8588
<ItemGroup>
8689
<ItemsToSignPostBuild Remove="*tests*.nupkg" />

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,31 @@
2222
<UsagePattern IdentityGlob="Microsoft.Extensions.FileSystemGlobbing/*6.0.0*" />
2323
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.7.2" />
2424
<UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/3.2.2146" />
25-
<UsagePattern IdentityGlob="System.Collections.Immutable/8.0.0" />
25+
<UsagePattern IdentityGlob="System.Collections.Immutable/9.0.0" />
2626
<UsagePattern IdentityGlob="System.CommandLine.Rendering/0.4.0-alpha.24112.1" />
27-
<UsagePattern IdentityGlob="System.Composition/*8.0.0*" />
27+
<UsagePattern IdentityGlob="System.Composition/*9.0.0*" />
2828
<UsagePattern IdentityGlob="System.Composition.AttributedModel/*7.0.0*" />
2929
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*7.0.0*" />
3030
<UsagePattern IdentityGlob="System.Composition.Convention/*7.0.0*" />
3131
<UsagePattern IdentityGlob="System.Composition.Hosting/*7.0.0*" />
3232
<UsagePattern IdentityGlob="System.Composition.Runtime/*7.0.0*" />
3333
<UsagePattern IdentityGlob="System.Composition.TypedParts/*7.0.0*" />
34-
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
34+
<UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/*9.0.0*" />
35+
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*9.0.0*" />
3536
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
3637
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
37-
<UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
38+
<UsagePattern IdentityGlob="System.Reflection.Metadata/9.0.0" />
3839
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
3940

4041
<!-- Transitive dependencies from MSBuild -->
4142
<UsagePattern IdentityGlob="Microsoft.VisualStudio.SolutionPersistence/1.0.9" />
4243

4344
<!-- Transitive dependencies from roslyn -->
4445
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
45-
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0.0" />
46-
<UsagePattern IdentityGlob="Microsoft.Extensions.Options/8.0.0" />
47-
<UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/8.0.0" />
46+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/9.0.0" />
47+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/9.0.0" />
48+
<UsagePattern IdentityGlob="Microsoft.Extensions.Options/9.0.0" />
49+
<UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/9.0.0" />
4850
<UsagePattern IdentityGlob="System.Buffers/4.6.0" />
4951
<UsagePattern IdentityGlob="System.Memory/4.6.0" />
5052
<UsagePattern IdentityGlob="System.Numerics.Vectors/4.6.0" />
@@ -57,8 +59,8 @@
5759
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
5860
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />
5961

60-
<UsagePattern IdentityGlob="System.IO.Pipelines/*8.0.0*" />
61-
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
62+
<UsagePattern IdentityGlob="System.IO.Pipelines/*9.0.0*" />
63+
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*9.0.0*" />
6264
</IgnorePatterns>
6365

6466
</UsageData>

0 commit comments

Comments
 (0)