Skip to content

Bumped version to latest #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2025
Merged

Bumped version to latest #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion BuildVersion.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<BuildVersionData
BuildMajor = "20"
BuildMinor = "1"
BuildPatch = "3"
BuildPatch = "6"
PreReleaseName = "alpha"
/>
6 changes: 0 additions & 6 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@
<IsPullRequestBuild Condition="'$(IsPullRequestBuild)'==''">false</IsPullRequestBuild>
<IsReleaseBuild Condition="'$(IsReleaseBuild)'==''">false</IsReleaseBuild>
<BuildTime Condition="'$(BuildTime)'=='' AND '$(APPVEYOR_REPO_COMMIT_TIMESTAMP)'!=''">$(APPVEYOR_REPO_COMMIT_TIMESTAMP)</BuildTime>
<LlvmVersionMajor Condition="'$(LlvmVersionMajor)'==''">20</LlvmVersionMajor>
<LlvmVersionMinor Condition="'$(LlvmVersionMinor)'==''">1</LlvmVersionMinor>
<LlvmVersionPatch Condition="'$(LlvmVersionPatch)'==''">1</LlvmVersionPatch>
<LlvmVersion>$(LlvmVersionMajor).$(LlvmVersionMinor).$(LlvmVersionPatch)</LlvmVersion>
<LlvmVersionNext Condition="'$(LlvmVersionNext)'=='21.0.0'"></LlvmVersionNext>
<ProjectPackageVersionRange>[$(LlvmVersion), 21.0.0)</ProjectPackageVersionRange>
<!--<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>-->
</PropertyGroup>
<Choose>
Expand Down
76 changes: 2 additions & 74 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,9 @@
<Project InitialTargets="VerifyProjectSettings;SetProjectSpecficVersionDependentProperties;ShowBuildParameters">
<!--
It is tempting to place the SDK ref here so that all the projects benefit from it
However, since this repo has C++ VCXPROJ projects, that doesn't work. It will pull
in requirements that break a VCXPROJ (or anything still stuck in the dark ages with Packages.config)
<Sdk Name="Microsoft.Build.CentralPackageVersions"/>
-->
<Project InitialTargets="VerifyProjectSettings;ShowBuildParameters">
<!--
Since Nuget.config is configured to include the build output location this
will ensure the folder exists during restore so that it won't fail.
-->
<Target Name="CreateBuildOutputNuget" BeforeTargets="Restore;Build;Rebuild">
<MakeDir Directories="$(MSBuildThisFileDirectory)BuildOutput\NuGet" />
</Target>

<Target Name="SetProjectSpecficVersionDependentProperties">
<PropertyGroup>
<NuspecProperties Condition="'$(NuspecFile)'!=''" >version=$(PackageVersion);llvmversion=$(LlvmVersion);buildbinoutput=$(BaseOutputPath);configuration=$(Configuration);$(NuspecProperties)</NuspecProperties>
</PropertyGroup>
</Target>

<!-- Download nuget.exe if it isn't found-->
<Target Name="_DownloadNugetExe" >
<MakeDir Directories="$(PackageOutputPath)" Condition="!EXISTS('$(PackageOutputPath')" />
<DownloadFile Condition="!EXISTS('$(PackageOutputPath)\NuGet.exe')"
SourceUrl="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
DestinationPath="$(PackageOutputPath)\NuGet.exe"
/>
</Target>

<!--
Version numbers are computed at build time after any declarative properties are evaluated
so this is needed to update the NuSpec properties with the dynamically generated values
NOTE: This can't use NuspecProperties as that is only applicable when using a NuSpec file.
Worse, it can cause a NullReferenceException (See: https://github.com/NuGet/Home/issues/4649 )
-->
<Target Name="_SetNuSpecPropertiesWithBuildInfo"
BeforeTargets="GenerateNuspec"
Condition="'$(MSBuildProjectExtension)'=='.csproj' AND $(GeneratePackageOnBuild)=='true'"
>
<PropertyGroup>
<Description>$(Description) $(llvmVersion)</Description>
</PropertyGroup>
<Message Importance="high" Text="PackageVersion: $(PackageVersion)" />
</Target>

<Target Name="EnsureLocalNugetFolder" Condition="!EXISTS($(PackageOutputPath))" BeforeTargets="Restore">
<MakeDir Directories="$(PackageOutputPath)" />
</Target>

<!-- Custom task to download a file from a web URL -->
<UsingTask TaskName="DownloadFile"
TaskFactory="CodeTaskFactory"
AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll"
>
<ParameterGroup>
<SourceUrl ParameterType="System.String" Required="true"/>
<DestinationPath ParameterType="System.String" Required="true"/>
</ParameterGroup>
<Task>
<Using Namespace="System.Net"/>
<Code Type="Fragment" Language="cs">
<![CDATA[
var client = new WebClient();
client.DownloadFile( SourceUrl, DestinationPath );
]]>
</Code>
</Task>
</UsingTask>

<!-- Create NuGet packages for NuSpec property in VCXPROJ projects -->
<Target Name="Pack" DependsOnTargets="_DownloadNugetExe;SetProjectSpecficVersionDependentProperties" Condition="'$(MSBuildProjectExtension)'=='.vcxproj'">
<Exec Condition="exists('$(NuSpecFile)')"
Command='"$(PackageOutputPath)NuGet.exe" pack $(NuSpecFile) -OutputDirectory $(PackageOutputPath) -Properties $(NuspecProperties) -NoPackageAnalysis' />
</Target>

<Target Name="EnsureBuildOutputPaths" BeforeTargets="Build;Restore">
<Target Name="EnsureBuildOutputPaths" BeforeTargets="Restore;Build;Rebuild">
<MakeDir Directories="$(PackageOutputPath)"/>
</Target>

Expand All @@ -88,7 +17,6 @@
<Message Importance="normal" Text=" FullBuildNumber: $(FullBuildNumber)"/>
<Message Importance="normal" Text=" PackageVersion: $(PackageVersion)"/>
<Message Importance="normal" Text=" FileVersion: $(FileVersion)"/>
<Message Importance="normal" Text=" LlvmVersion: $(LlvmVersion)"/>
<Message Importance="normal" Text=" Platform: $(Platform)"/>
<Message Importance="normal" Text=" Configuration: $(Configuration)"/>
</Target>
Expand Down
22 changes: 12 additions & 10 deletions Show-Docs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,17 @@
.SYNOPSIS
Shows docs using the docfx built-in server

.PARAMETER DocsPathToHost
Path of docs to host. Default is the local build but any legit path is accepted.
This is useful when downloading docs build artifacts to ensure they are built correctly.

.PARAMETER buildInfo
BuildInfo to use for current repo build. The hashtable provided for this must include the
`DocsOutputPath` value for the path to use. This is normally set by a call to `Initialize-Environment`

.PARAMETER DocsPathToHost
Path of docs to host. Default is the local build but any legit path is accepted.
This is useful when downloading docs build artifacts to ensure they are built correctly.
#>
Param(
[Parameter(Mandatory, ParameterSetName = 'UsePath', Position = 0)]
[string]$DocsPathToHost,

[Parameter(Mandatory, ParameterSetName = 'UseRepo', Position = 0)]
[hashtable]$buildInfo
[hashtable]$buildInfo,
[string]$DocsPathToHost
)

$docFXToolVersion = '2.78.3'
Expand All @@ -29,8 +26,13 @@ try
{
. ./repo-buildutils.ps1

if ($PSCmdlet.ParameterSetName -eq 'UseRepo')
if (!$DocsPathToHost)
{
if (!$buildInfo)
{
$buildInfo = Initialize-BuildEnvironment
}

$DocsPathToHost = $buildInfo['DocsOutputPath']
}

Expand Down
12 changes: 12 additions & 0 deletions docfx/templates/Ubiquity/public/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
@charset "UTF-8";

/*
Disable display of inherited members. It would be nice if there was a build option to not even generate this noise,
but sadly, there is none so this disables the final render of such things.
*/
.typelist.inheritedMembers {
display: none
}

#logo {
background-color: white
}

/*
Customized Highlight JS theming
The default theming that comes with docfx 'modern' support is rather limited. It doesn't
Expand Down
Loading