Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
<ItemGroup>
<PackageVersion Include="Microsoft.Build" Version="[17.11.48]" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageVersion Include="Microsoft.Build" Version="[17.14.28]" Condition="'$(TargetFramework)' == 'net9.0'" />
<PackageVersion Include="Microsoft.Build" Version="18.0.2" Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net9.0'" />
<PackageVersion Include="Microsoft.Build" Version="18.4.0" Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net9.0'" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="Microsoft.CodeAnalysis" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.3.0" />
</ItemGroup>
</Project>
16 changes: 16 additions & 0 deletions src/Docfx.Build/XRefMaps/XRefMapDownloader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using System.IO.Compression;
using System.Net;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
using Docfx.Common;

using EnvironmentVariables = Docfx.DataContracts.Common.Constants.EnvironmentVariables;
Expand Down Expand Up @@ -158,6 +160,20 @@ private static async Task<XRefMap> DownloadFromWebAsync(Uri uri, CancellationTok
{
AutomaticDecompression = DecompressionMethods.All,
CheckCertificateRevocationList = !EnvironmentVariables.NoCheckCertificateRevocationList,
ServerCertificateCustomValidationCallback = (req, cert, chain, errors) =>
{
if (errors == SslPolicyErrors.None)
return true;

// Ignore OCSP validation error on macos. (On GitHub Actions environment. OSCP HTTP access seems be blocked)
if (OperatingSystem.IsMacOS())
{
if (chain?.ChainStatus != null && chain.ChainStatus.All(s => s.Status == X509ChainStatusFlags.RevocationStatusUnknown))
return true;
}

return false;
}
})
{
Timeout = TimeSpan.FromMinutes(30), // Default: 100 seconds
Expand Down
3 changes: 3 additions & 0 deletions src/Docfx.Dotnet/SymbolFormatter.Symbols.cs
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ private class PropertySymbol : IPropertySymbol
public IPropertySymbol PartialDefinitionPart => Inner.PartialDefinitionPart;
public IPropertySymbol PartialImplementationPart => Inner.PartialImplementationPart;
public bool IsPartialDefinition => Inner.IsPartialDefinition;
public IPropertySymbol ReduceExtensionMember(ITypeSymbol receiverType) => Inner.ReduceExtensionMember(receiverType);

}

public class MethodSymbol : IMethodSymbol
Expand Down Expand Up @@ -367,6 +369,7 @@ public class MethodSymbol : IMethodSymbol
public ImmutableArray<AttributeData> GetReturnTypeAttributes() => Inner.GetReturnTypeAttributes();
public ITypeSymbol GetTypeInferredDuringReduction(ITypeParameterSymbol reducedFromTypeParameter) => Inner.GetTypeInferredDuringReduction(reducedFromTypeParameter);
public IMethodSymbol ReduceExtensionMethod(ITypeSymbol receiverType) => Inner.ReduceExtensionMethod(receiverType);
public IMethodSymbol ReduceExtensionMember(ITypeSymbol receiverType) => Inner.ReduceExtensionMember(receiverType);
public ImmutableArray<SymbolDisplayPart> ToDisplayParts(SymbolDisplayFormat format = null) => Inner.ToDisplayParts(format);
public string ToDisplayString(SymbolDisplayFormat format = null) => Inner.ToDisplayString(format);
public ImmutableArray<SymbolDisplayPart> ToMinimalDisplayParts(SemanticModel semanticModel, int position, SymbolDisplayFormat format = null) => Inner.ToMinimalDisplayParts(semanticModel, position, format);
Expand Down
1 change: 0 additions & 1 deletion test/Docfx.Dotnet.Tests/SymbolUrlResolverUnitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Text.RegularExpressions;
using Microsoft.CodeAnalysis;
using Xunit;

namespace Docfx.Dotnet.Tests;
Expand Down
Loading