diff --git a/IPA.Loader/Config/Config.cs b/IPA.Loader/Config/Config.cs index 8cde00fb..d7c1a6af 100644 --- a/IPA.Loader/Config/Config.cs +++ b/IPA.Loader/Config/Config.cs @@ -28,6 +28,7 @@ namespace IPA.Config /// /// The extension associated with this type, without the '.' /// + /// the extension to register the config provider as // ReSharper disable once UnusedAutoPropertyAccessor.Global public string Extension { get; private set; } @@ -52,6 +53,7 @@ namespace IPA.Config /// /// The order of preference for the config type. /// + /// the list of config extensions in order of preference // ReSharper disable once UnusedAutoPropertyAccessor.Global public string[] PreferenceOrder { get; private set; } @@ -75,6 +77,7 @@ namespace IPA.Config /// /// The name to use for the config. /// + /// the name to use for the config // ReSharper disable once UnusedAutoPropertyAccessor.Global public string Name { get; private set; } @@ -191,7 +194,6 @@ namespace IPA.Config { foreach (var provider in configProviders) { - if (provider.Item2.LastModified > provider.Item1.Value) { try diff --git a/appveyor.yml b/appveyor.yml index 7487c0b1..19ac0999 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -78,27 +78,37 @@ before_deploy: { New-Item -ItemType directory -Path origin_site/tags } } + function Do-DocFX($params) + { + Add-Content link_branch.json "{`"_gitContribute`":{`"sourceBranch`":`"$env:APPVEYOR_REPO_COMMIT`",`"apiSpecFolder`":`"docs/override`"}}" + & docfx metadata + Invoke-Expression "& docfx build --globalMetadataFiles link_branch.json $params" + if ($lastexitcode -ne 0){ + throw [System.Exception] "docfx build failed with exit code $lastexitcode." + } + } + if ($env:APPVEYOR_REPO_TAG -eq "true") { # Copy current site into tags + Do-DocFX "-o origin_site/tags" + Git-Do cd origin_site # make things a bit easier $tagPath = "tags/$env:APPVEYOR_REPO_TAG_NAME" New-Item -ItemType directory -Path $tagPath - Copy-Item -Path (Get-ChildItem -Exclude ('.git','tags')).FullName -Destination $tagPath -Recurse + #Copy-Item -Path (Get-ChildItem -Exclude ('.git','tags')).FullName -Destination $tagPath -Recurse + #pushd .. + #popd + Move-Item tags/_site $tagPath git add -A 2>&1 git commit -q -a -m "Saved tag $env:APPVEYOR_REPO_TAG_NAME" 2>&1 } elseif (-Not $env:APPVEYOR_PULL_REQUEST_TITLE) { # Generate docs - Add-Content link_branch.json "{`"_gitContribute`":{`"sourceBranch`":`"$env:APPVEYOR_REPO_COMMIT`",`"apiSpecFolder`":`"docs/override`"}}" - & docfx metadata - & docfx build --globalMetadataFiles link_branch.json - if ($lastexitcode -ne 0){ - throw [System.Exception] "docfx build failed with exit code $lastexitcode." - } + Do-DocFX Git-Do