Skip to content
Merged
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
15 changes: 6 additions & 9 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="GitReader" Version="1.4.0" />
<PackageVersion Include="HtmlAgilityPack" Version="1.11.54" />
<PackageVersion Include="ICSharpCode.Decompiler" Version="8.1.1.7464" />
<PackageVersion Include="IgnoresAccessChecksToGenerator" Version="0.6.0" />
<PackageVersion Include="Jint" Version="3.0.0-beta-2052" />
<PackageVersion Include="JsonSchema.Net" Version="5.2.6" />
<PackageVersion Include="Markdig" Version="0.33.0" />

<!-- "17.3.2" is the latest compatible version for .NET 6 -->
<!-- "17.3.2" is the latest compatible version for .NET 6 -->
<PackageVersion Include="Microsoft.Build" Version="[17.3.2]" Condition="'$(TargetFramework)' == 'net6.0'" />
<PackageVersion Include="Microsoft.Build" Version="17.7.2" Condition="'$(TargetFramework)' != 'net6.0'" />

<PackageVersion Include="Microsoft.Build" Version="17.7.2" Condition="'$(TargetFramework)' != 'net6.0'" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.6.10" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.7.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" />
Expand All @@ -36,18 +34,17 @@
<PackageVersion Include="System.Composition" Version="7.0.0" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
<PackageVersion Include="YamlDotNet" Version="13.7.1" />

<!-- Test only -->
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="13.3.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
<PackageVersion Include="Microsoft.Playwright" Version="1.37.1" />
<PackageVersion Include="NuGet.Frameworks" Version="6.8.0-rc.122" Condition="'$(TargetFramework)' != 'net8.0'" />
<PackageVersion Include="NuGet.Frameworks" Version="6.8.0-rc.122" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageVersion Include="NuGet.Frameworks" Version="6.8.0-rc.122" Condition="'$(TargetFramework)' != 'net8.0'" />
<PackageVersion Include="NuGet.Frameworks" Version="6.8.0-rc.122" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageVersion Include="Verify.DiffPlex" Version="2.2.1" />
<PackageVersion Include="Verify.Xunit" Version="22.1.4" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
<PackageVersion Include="xunit" Version="2.5.3" />
</ItemGroup>
</Project>
</Project>
6 changes: 0 additions & 6 deletions src/Docfx.App/RunBuild.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ public static string Exec(BuildJsonConfig config, BuildOptions options, string c
EnvironmentContext.SetGitFeaturesDisabled(config.DisableGitFeatures);
EnvironmentContext.SetBaseDirectory(Path.GetFullPath(string.IsNullOrEmpty(configDirectory) ? Directory.GetCurrentDirectory() : configDirectory));

if (!config.DisableGitFeatures)
{
// Initialize Lazy<bool> property by ThreadPool thread.(It takes about 50-100 ms)
Task.Run(() => GitUtility.ExistGitCommand.Value);
}

// TODO: remove BaseDirectory from Config, it may cause potential issue when abused
var baseDirectory = EnvironmentContext.BaseDirectory;
var outputFolder = Path.GetFullPath(Path.Combine(
Expand Down
6 changes: 3 additions & 3 deletions src/Docfx.Build.SchemaDriven/OverwriteApplier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ public object BuildOverwriteWithSchema(FileModel owModel, OverwriteDocumentModel
{
["remote"] = overwrite.Documentation.Remote == null ? null : new Dictionary<string, object>
{
["path"] = overwrite.Documentation.Remote.RelativePath,
["branch"] = overwrite.Documentation.Remote.RemoteBranch,
["repo"] = overwrite.Documentation.Remote.RemoteRepositoryUrl,
["path"] = overwrite.Documentation.Remote.Path,
["branch"] = overwrite.Documentation.Remote.Branch,
["repo"] = overwrite.Documentation.Remote.Repo,
}
["path"] = overwrite.Documentation?.Path,
["startLine"] = overwrite.Documentation?.StartLine ?? 0,
Expand Down
3 changes: 3 additions & 0 deletions src/Docfx.Common/Docfx.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@
<ProjectReference Include="..\Docfx.Plugins\Docfx.Plugins.csproj" />
<ProjectReference Include="..\Docfx.YamlSerialization\Docfx.YamlSerialization.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="GitReader" />
</ItemGroup>
</Project>
37 changes: 4 additions & 33 deletions src/Docfx.Common/Git/GitDetail.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,49 +6,20 @@

namespace Docfx.Common.Git;

public class GitDetail
public record GitDetail
{
/// <summary>
/// Relative path of current file to the Git Root Directory
/// </summary>
[YamlMember(Alias = "path")]
[JsonProperty("path")]
public string RelativePath { get; set; }
public string Path { get; set; }

[YamlMember(Alias = "branch")]
[JsonProperty("branch")]
public string RemoteBranch { get; set; }
public string Branch { get; set; }

[YamlMember(Alias = "repo")]
[JsonProperty("repo")]
public string RemoteRepositoryUrl { get; set; }

// remove it to avoid config hash changed
//[YamlMember(Alias = "commit")]
//[JsonProperty("commit")]
//public string CommitId { get; set; }

// remove it to avoid config hash changed
//[JsonProperty("key")]
//[YamlMember(Alias = "key")]
//public string Description { get; set; }

public override bool Equals(object obj)
{
if (obj == null) return false;
if (ReferenceEquals(this, obj)) return true;
if (GetType() != obj.GetType()) return false;

return Equals(ToString(), obj.ToString());
}

public override int GetHashCode()
{
return ToString().GetHashCode();
}

public override string ToString()
{
return $"branch: {RemoteBranch}, url: {RemoteRepositoryUrl}, file: {RelativePath}";
}
public string Repo { get; set; }
}
12 changes: 0 additions & 12 deletions src/Docfx.Common/Git/GitRepoInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,4 @@ public class GitRepoInfo
public string RepoProject { get; set; }

public Uri NormalizedRepoUrl { get; set; }

public string RepoRootPath { get; set; }

public string LocalBranch { get; set; }

public string RemoteBranch { get; set; }

public string RemoteOriginUrl { get; set; }

public string RemoteHeadCommitId { get; set; }

public string LocalHeadCommitId { get; set; }
}
Loading