Skip to content

Commit

Permalink
[vscode] Fix failing official builds (#76071)
Browse files Browse the repository at this point in the history
* Workaround failing official builds (#75898)

* Update structured logger (#75865)

Upgrade to latest structured logger binaries and see if that addresses the failure to read binary logs.

---------

Co-authored-by: Jared Parsons <jared@paranoidcoding.org>
  • Loading branch information
jjonescz and jaredpar authored Nov 26, 2024
1 parent 0007900 commit 2b1a7fd
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ extends:
/p:DotnetPublishUsingPipelines=true
/p:IgnoreIbcMergeErrors=true
/p:GenerateSbom=true
/p:ForceAzureComSources=true
condition: succeeded()

- template: /eng/common/templates-official/steps/generate-sbom.yml@self
Expand Down
2 changes: 1 addition & 1 deletion eng/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
Infra
-->
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.169" />
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.386" />
<PackageVersion Include="Mono.Options" Version="6.6.0.161" />
<PackageVersion Include="RichCodeNav.EnvVarDump" Version="0.1.1643-alpha" />
<PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="$(RoslynDiagnosticsNugetPackageVersion)" />
Expand Down
9 changes: 9 additions & 0 deletions eng/InternalTools.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
$(RestoreSources);
https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json
</RestoreSources>

<!-- Workaround for https://github.com/dotnet/dnceng/issues/4441. -->
<RestoreSources Condition="'$(ForceAzureComSources)' == 'true'">
https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
https://pkgs.dev.azure.com/devdiv/_packaging/VS/nuget/v3/index.json;
https://pkgs.dev.azure.com/devdiv/_packaging/Engineering/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json
</RestoreSources>
</PropertyGroup>

<ItemGroup Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
Expand Down

0 comments on commit 2b1a7fd

Please sign in to comment.