Skip to content

Commit 1167703

Browse files
mariam-abdullamariam-abdulla
authored
Merge branch 'main' into dev/mabdullah/fix-bug-logger-env-var-in-dotnet-test
2 parents 65f661d + 4708311 commit 1167703

File tree

275 files changed

+4353
-3757
lines changed

Some content is hidden

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

275 files changed

+4353
-3757
lines changed

‎Directory.Packages.props

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@
6767
<PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
6868
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
6969
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
70+
<PackageVersion Include="Microsoft.VisualStudio.Sdk" Version="17.2.32505.173" />
71+
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.11.435" />
7072
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
7173
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.28" />
7274
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />

‎NuGet.config

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<add key="dotnet-tools-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json" />
2626
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
2727
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
28+
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
29+
<add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
2830
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
2931
<!-- Used for Rich Navigation indexing task -->
3032
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />

‎eng/Signing.props

+4-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
<FileSignInfo Include="MessagePack.Annotations.dll" CertificateName="$(ExternalCertificateId)" />
6161
<FileSignInfo Include="MessagePack.dll" CertificateName="$(ExternalCertificateId)" />
6262
<FileSignInfo Include="Nerdbank.Streams.dll" CertificateName="$(ExternalCertificateId)" />
63-
<FileSignInfo Include="StreamJsonRpc.dll" CertificateName="$(ExternalCertificateId)" />
6463
<FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="$(ExternalCertificateId)" />
6564
<FileSignInfo Include="CommandLine.dll" CertificateName="$(ExternalCertificateId)" />
6665
<FileSignInfo Include="FluentAssertions.dll" CertificateName="$(ExternalCertificateId)" />
@@ -74,6 +73,10 @@
7473
<FileSignInfo Include="Valleysoft.DockerCredsProvider.dll" CertificateName="$(ExternalCertificateId)" />
7574
</ItemGroup>
7675

76+
<ItemGroup>
77+
<FileSignInfo Include="StreamJsonRpc.dll" CertificateName="MicrosoftSHA2" />
78+
</ItemGroup>
79+
7780
<!-- Filter out any test packages from ItemsToSign -->
7881
<ItemGroup>
7982
<ItemsToSign Remove="$(ArtifactsPackagesDir)**\*tests*.nupkg" />

‎eng/Version.Details.xml

+62-62
Original file line numberDiff line numberDiff line change
@@ -115,57 +115,57 @@
115115
<Sha>428195cb74072bbb5314889119525369cb9bdeb0</Sha>
116116
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
117117
</Dependency>
118-
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25124.4">
118+
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25160.5">
119119
<Uri>https://github.com/dotnet/fsharp</Uri>
120-
<Sha>e4889bb53328e6a75855c3f3d2122d0aacae7a4b</Sha>
120+
<Sha>345742da75dc6c5fe485ef1236d3f034ebcdcb53</Sha>
121121
</Dependency>
122122
<!-- Intermediate is necessary for source build. -->
123-
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="9.0.300-beta.25124.4">
123+
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="9.0.300-beta.25160.5">
124124
<Uri>https://github.com/dotnet/fsharp</Uri>
125-
<Sha>e4889bb53328e6a75855c3f3d2122d0aacae7a4b</Sha>
125+
<Sha>345742da75dc6c5fe485ef1236d3f034ebcdcb53</Sha>
126126
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
127127
</Dependency>
128-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25157.4">
128+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25160.11">
129129
<Uri>https://github.com/dotnet/roslyn</Uri>
130-
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
130+
<Sha>0544987e8d90cf530c887f52ec32fde80b79fe50</Sha>
131131
</Dependency>
132132
<!-- Intermediate is necessary for source build. -->
133-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25157.4">
133+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25160.11">
134134
<Uri>https://github.com/dotnet/roslyn</Uri>
135-
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
135+
<Sha>0544987e8d90cf530c887f52ec32fde80b79fe50</Sha>
136136
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
137137
</Dependency>
138-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25157.4">
138+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25160.11">
139139
<Uri>https://github.com/dotnet/roslyn</Uri>
140-
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
140+
<Sha>0544987e8d90cf530c887f52ec32fde80b79fe50</Sha>
141141
</Dependency>
142-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25157.4">
142+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25160.11">
143143
<Uri>https://github.com/dotnet/roslyn</Uri>
144-
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
144+
<Sha>0544987e8d90cf530c887f52ec32fde80b79fe50</Sha>
145145
</Dependency>
146-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25157.4">
146+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25160.11">
147147
<Uri>https://github.com/dotnet/roslyn</Uri>
148-
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
148+
<Sha>0544987e8d90cf530c887f52ec32fde80b79fe50</Sha>
149149
</Dependency>
150-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25157.4">
150+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25160.11">
151151
<Uri>https://github.com/dotnet/roslyn</Uri>
152-
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
152+
<Sha>0544987e8d90cf530c887f52ec32fde80b79fe50</Sha>
153153
</Dependency>
154-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25157.4">
154+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25160.11">
155155
<Uri>https://github.com/dotnet/roslyn</Uri>
156-
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
156+
<Sha>0544987e8d90cf530c887f52ec32fde80b79fe50</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25157.4">
158+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25160.11">
159159
<Uri>https://github.com/dotnet/roslyn</Uri>
160-
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
160+
<Sha>0544987e8d90cf530c887f52ec32fde80b79fe50</Sha>
161161
</Dependency>
162-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0-3.25157.4">
162+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0-3.25160.11">
163163
<Uri>https://github.com/dotnet/roslyn</Uri>
164-
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
164+
<Sha>0544987e8d90cf530c887f52ec32fde80b79fe50</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25157.4">
166+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25160.11">
167167
<Uri>https://github.com/dotnet/roslyn</Uri>
168-
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
168+
<Sha>0544987e8d90cf530c887f52ec32fde80b79fe50</Sha>
169169
</Dependency>
170170
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.66">
171171
<Uri>https://github.com/nuget/nuget.client</Uri>
@@ -426,22 +426,22 @@
426426
<Sha>12d57ddde6bd2f47757364252596cfa89df2ef60</Sha>
427427
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
428428
</Dependency>
429-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25160.1">
429+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25160.2">
430430
<Uri>https://github.com/dotnet/razor</Uri>
431-
<Sha>b8cab05568a20347b6fa1e222a611d24b7b6b1aa</Sha>
431+
<Sha>e0517b8e469412a4b4be8f82bbb194f13a4226e0</Sha>
432432
</Dependency>
433-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25160.1">
433+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25160.2">
434434
<Uri>https://github.com/dotnet/razor</Uri>
435-
<Sha>b8cab05568a20347b6fa1e222a611d24b7b6b1aa</Sha>
435+
<Sha>e0517b8e469412a4b4be8f82bbb194f13a4226e0</Sha>
436436
</Dependency>
437-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25160.1">
437+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25160.2">
438438
<Uri>https://github.com/dotnet/razor</Uri>
439-
<Sha>b8cab05568a20347b6fa1e222a611d24b7b6b1aa</Sha>
439+
<Sha>e0517b8e469412a4b4be8f82bbb194f13a4226e0</Sha>
440440
</Dependency>
441441
<!-- Intermediate is necessary for source build. -->
442-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25160.1">
442+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25160.2">
443443
<Uri>https://github.com/dotnet/razor</Uri>
444-
<Sha>b8cab05568a20347b6fa1e222a611d24b7b6b1aa</Sha>
444+
<Sha>e0517b8e469412a4b4be8f82bbb194f13a4226e0</Sha>
445445
<SourceBuild RepoName="razor" ManagedOnly="true" />
446446
</Dependency>
447447
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
@@ -506,43 +506,43 @@
506506
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
507507
</Dependency>
508508
<!-- Intermediate is necessary for source build. -->
509-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.615601">
509+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.616001">
510510
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
511-
<Sha>232bcf31aad21949f80d6706720540b85e43fff3</Sha>
511+
<Sha>8f9f6fa14523b2f2475ea0a86be1cf60b5de5336</Sha>
512512
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
513513
</Dependency>
514514
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.25124.1">
515515
<Uri>https://github.com/dotnet/deployment-tools</Uri>
516516
<Sha>3597bfe8e90ef3d99b917b84b05eaef88369d5ef</Sha>
517517
</Dependency>
518-
<Dependency Name="Microsoft.Build.Tasks.Git" Version="10.0.0-beta.25158.1">
518+
<Dependency Name="Microsoft.Build.Tasks.Git" Version="10.0.0-beta.25160.1">
519519
<Uri>https://github.com/dotnet/sourcelink</Uri>
520-
<Sha>d555cac33e58c0f60ab282bf0d07782720746c96</Sha>
520+
<Sha>b46885e38b11d363a8582b795b35a00778f56bb8</Sha>
521521
</Dependency>
522-
<Dependency Name="Microsoft.SourceLink.Common" Version="10.0.0-beta.25158.1">
522+
<Dependency Name="Microsoft.SourceLink.Common" Version="10.0.0-beta.25160.1">
523523
<Uri>https://github.com/dotnet/sourcelink</Uri>
524-
<Sha>d555cac33e58c0f60ab282bf0d07782720746c96</Sha>
524+
<Sha>b46885e38b11d363a8582b795b35a00778f56bb8</Sha>
525525
</Dependency>
526-
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25158.1">
526+
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25160.1">
527527
<Uri>https://github.com/dotnet/sourcelink</Uri>
528-
<Sha>d555cac33e58c0f60ab282bf0d07782720746c96</Sha>
528+
<Sha>b46885e38b11d363a8582b795b35a00778f56bb8</Sha>
529529
</Dependency>
530-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25158.1">
530+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25160.1">
531531
<Uri>https://github.com/dotnet/sourcelink</Uri>
532-
<Sha>d555cac33e58c0f60ab282bf0d07782720746c96</Sha>
532+
<Sha>b46885e38b11d363a8582b795b35a00778f56bb8</Sha>
533533
</Dependency>
534-
<Dependency Name="Microsoft.SourceLink.GitLab" Version="10.0.0-beta.25158.1">
534+
<Dependency Name="Microsoft.SourceLink.GitLab" Version="10.0.0-beta.25160.1">
535535
<Uri>https://github.com/dotnet/sourcelink</Uri>
536-
<Sha>d555cac33e58c0f60ab282bf0d07782720746c96</Sha>
536+
<Sha>b46885e38b11d363a8582b795b35a00778f56bb8</Sha>
537537
</Dependency>
538-
<Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="10.0.0-beta.25158.1">
538+
<Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="10.0.0-beta.25160.1">
539539
<Uri>https://github.com/dotnet/sourcelink</Uri>
540-
<Sha>d555cac33e58c0f60ab282bf0d07782720746c96</Sha>
540+
<Sha>b46885e38b11d363a8582b795b35a00778f56bb8</Sha>
541541
</Dependency>
542542
<!-- Intermediate is necessary for source build. -->
543-
<Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="10.0.0-beta.25158.1">
543+
<Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="10.0.0-beta.25160.1">
544544
<Uri>https://github.com/dotnet/sourcelink</Uri>
545-
<Sha>d555cac33e58c0f60ab282bf0d07782720746c96</Sha>
545+
<Sha>b46885e38b11d363a8582b795b35a00778f56bb8</Sha>
546546
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
547547
</Dependency>
548548
<!-- Intermediate is necessary for source build. -->
@@ -640,34 +640,34 @@
640640
</Dependency>
641641
</ProductDependencies>
642642
<ToolsetDependencies>
643-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
643+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25160.4">
644644
<Uri>https://github.com/dotnet/arcade</Uri>
645-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
645+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
646646
</Dependency>
647-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25157.1">
647+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25160.4">
648648
<Uri>https://github.com/dotnet/arcade</Uri>
649-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
649+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
650650
</Dependency>
651-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
651+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25160.4">
652652
<Uri>https://github.com/dotnet/arcade</Uri>
653-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
653+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
654654
</Dependency>
655-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25157.1">
655+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25160.4">
656656
<Uri>https://github.com/dotnet/arcade</Uri>
657-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
657+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
658658
</Dependency>
659-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
659+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25160.4">
660660
<Uri>https://github.com/dotnet/arcade</Uri>
661-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
661+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
662662
</Dependency>
663-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
663+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25160.4">
664664
<Uri>https://github.com/dotnet/arcade</Uri>
665-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
665+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
666666
</Dependency>
667667
<!-- Intermediate is necessary for source build. -->
668-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25157.1">
668+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25160.4">
669669
<Uri>https://github.com/dotnet/arcade</Uri>
670-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
670+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
671671
<SourceBuild RepoName="arcade" ManagedOnly="true" />
672672
</Dependency>
673673
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.3.25155.15">

0 commit comments

Comments
 (0)