Skip to content

Added tests and bug fixes for things found by tests. #183

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
May 4, 2020
Merged

Added tests and bug fixes for things found by tests. #183

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 Ubiquity.NET.ruleset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@
<Rule Id="RECS0129" Action="None" />
<Rule Id="RECS0145" Action="None" />
<Rule Id="RECS0147" Action="Warning" />
<Rule Id="RECS0154" Action="Info" />
<Rule Id="RECS0154" Action="None" />
</Rules>
<Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
<Rule Id="SA0001" Action="Hidden" />
Expand Down
62 changes: 7 additions & 55 deletions docfx/current/Ubiquity.NET.Llvm.Docfx.API.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,68 +8,20 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="docfx.console" PrivateAssets="all">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="memberpage" PrivateAssets="All" />
<PackageReference Include="msdn.4.5.2" PrivateAssets="All" />
<PackageReference Include="docfx.console" PrivateAssets="All" />
<PackageReference Include="memberpage" PrivateAssets="All" GeneratePathProperty="true" />
<PackageReference Include="msdn.4.5.2" PrivateAssets="All" GeneratePathProperty="true" />
</ItemGroup>

<ItemGroup>
<None Update="docfx.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<!-- Custom task to Compare versions -->
<UsingTask TaskName="VersionCheck" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<ActualVersion ParameterType="System.String" Required="true" />
<MaximumSupportedVersion ParameterType="System.String" Required="true" />
<IsValidVersion ParameterType="System.Boolean" Output="true" />
</ParameterGroup>
<Task>
<Using Namespace="System" />
<Code Type="Fragment" Language="cs">
<![CDATA[
IsValidVersion = Version.Parse(ActualVersion) < Version.Parse(MaximumSupportedVersion);
]]>
</Code>
</Task>
</UsingTask>

<!--
This target dynamically resolves the installed location of the NuGet Packages used and applies
appropriate parameters to the DocFx command to use them. Otherwise the docfx.json would need to
have a hard coded path, which doesn't work with multiple users of a version controlled project.
-->
<Target Name="GetDocfxPackagePaths" BeforeTargets="DocBuild" DependsOnTargets="ResolvePackageDependenciesDesignTime">
<ItemGroup>
<docfxpkg Include="@(PackageDefinitions)" Condition="'%(PackageDefinitions.Name)'=='docfx.console'" />
<memberpage Include="@(PackageDefinitions)" Condition="'%(PackageDefinitions.Name)'=='memberpage'" />
<Msdn4_5_2 Include="@(PackageDefinitions)" Condition="'%(PackageDefinitions.Name)'=='msdn.4.5.2'" />
</ItemGroup>
<PropertyGroup>
<DocfxConsolePath>%(docfxpkg.ResolvedPath)</DocfxConsolePath>
<MemberPagePath>%(memberpage.ResolvedPath)</MemberPagePath>
<MsdnXRefPath>%(msdn4_5_2.ResolvedPath)</MsdnXRefPath>
<IsSupportedMSBuild>false</IsSupportedMSBuild>
</PropertyGroup>
<VersionCheck Condition="$(MSBuildVersion)!=''" MaximumSupportedVersion="17.0.999" ActualVersion="$(MSBuildVersion)">
<Output TaskParameter="IsValidVersion" PropertyName="IsSupportedMSBuild" />
</VersionCheck>
<Error Code="DOCFX:0001" ContinueOnError="false" Condition="!$(IsSupportedMSBuild)" Text="As of DOCFX 2.40 docfx cannot generate metadata for CSPROJ files using MSBuild &gt; 16.0.xx (Current MSBuild is $(MSBuildVersion))" />
</Target>

<Target Name="SetDocFxParameters" BeforeTargets="DocGenerateMetadata" DependsOnTargets="GetDocfxPackagePaths">
<Target Name="SetDocFxParameters" BeforeTargets="DocGenerateMetadata">
<ItemGroup>
<DocFxCrossRefMap Include="llvm-xref.yml" />
<DocFxCrossRefMap Include="$(MsdnXrefPath)\content\msdn.4.5.2.zip" />
<DocFxCrossRefMap Include="$(MsdnXrefPath)\content\namespaces.4.5.2.zip" />
<DocFxCrossRefMap Include="$(Pkgmsdn_4_5_2)\content\msdn.4.5.2.zip" />
<DocFxCrossRefMap Include="$(Pkgmsdn_4_5_2)\content\namespaces.4.5.2.zip" />
</ItemGroup>
<ItemGroup>
<DocFxTemplate Include="statictoc" />
<DocFxTemplate Include="$(MemberPagePath)\content" />
<DocFxTemplate Include="$(Pkgmemberpage)\content" />
<DocFxTemplate Include="$(BuildRootDir)docfx\templates\Ubiquity" />
</ItemGroup>
<PropertyGroup>
Expand Down
50 changes: 5 additions & 45 deletions docfx/index/Ubiquity.NET.Llvm.Docfx.Index.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,52 +5,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="docfx.console" PrivateAssets="all">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="memberpage" PrivateAssets="All" />
<PackageReference Include="docfx.console" PrivateAssets="All" GeneratePathProperty="true" />
<PackageReference Include="memberpage" PrivateAssets="All" GeneratePathProperty="true" />
<PackageReference Include="msdn.4.5.2" PrivateAssets="All" GeneratePathProperty="true" />
</ItemGroup>

<!-- Custom task to Compare versions -->
<UsingTask TaskName="VersionCheck" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<ActualVersion ParameterType="System.String" Required="true" />
<MaximumSupportedVersion ParameterType="System.String" Required="true" />
<IsValidVersion ParameterType="System.Boolean" Output="true" />
</ParameterGroup>
<Task>
<Using Namespace="System" />
<Code Type="Fragment" Language="cs">
<![CDATA[
IsValidVersion = Version.Parse(ActualVersion) < Version.Parse(MaximumSupportedVersion);
]]>
</Code>
</Task>
</UsingTask>

<!--
This target dynamically resolves the installed location of the NuGet Packages used and applies
appropriate parameters to the DocFx command to use them. Otherwise the docfx.json would need to
have a hard coded path, which doesn't work with multiple users of a version controlled project.
-->
<Target Name="GetDocfxPackagePaths" BeforeTargets="DocBuild" DependsOnTargets="ResolvePackageDependenciesDesignTime">
<ItemGroup>
<docfxpkg Include="@(PackageDefinitions)" Condition="'%(PackageDefinitions.Name)'=='docfx.console'" />
<memberpage Include="@(PackageDefinitions)" Condition="'%(PackageDefinitions.Name)'=='memberpage'" />
<Msdn4_5_2 Include="@(PackageDefinitions)" Condition="'%(PackageDefinitions.Name)'=='msdn.4.5.2'" />
</ItemGroup>
<PropertyGroup>
<DocfxConsolePath>%(docfxpkg.ResolvedPath)</DocfxConsolePath>
<MemberPagePath>%(memberpage.ResolvedPath)</MemberPagePath>
<IsSupportedMSBuild>false</IsSupportedMSBuild>
</PropertyGroup>
<VersionCheck Condition="$(MSBuildVersion)!=''" MaximumSupportedVersion="17.0.999" ActualVersion="$(MSBuildVersion)">
<Output TaskParameter="IsValidVersion" PropertyName="IsSupportedMSBuild" />
</VersionCheck>
<Error Code="DOCFX:0001" ContinueOnError="false" Condition="!$(IsSupportedMSBuild)" Text="As of DOCFX 2.40 docfx cannot generate metadata for CSPROJ files using MSBuild &gt; 16.0.xx (Current MSBuild is $(MSBuildVersion))" />
</Target>

<Target Name="SetDocFxParameters" BeforeTargets="DocGenerateMetadata" DependsOnTargets="GetDocfxPackagePaths">
<Target Name="SetDocFxParameters" BeforeTargets="DocGenerateMetadata">
<ItemGroup>
<DocFxCrossRefMap Include="versions-xref.yml" />
</ItemGroup>
Expand All @@ -60,7 +20,7 @@
<DocParameters>$(DocParameters) --globalMetadata="{_buildVersion:\"$(FullBuildNumber)\"}"</DocParameters>
<DocParameters>$(DocParameters) --intermediateFolder="$(IntermediateOutputPath.TrimEnd('\'))"</DocParameters>
<DocParameters>$(DocParameters) --xref="@(DocFxCrossRefMap->'%(FullPath)',',')"</DocParameters>
<DocTemplate>statictoc,$(MemberPagePath)\content,$(BuildRootDir)docfx\templates\Ubiquity</DocTemplate>
<DocTemplate>statictoc,$(Pkgmemberpage)\content,$(BuildRootDir)docfx\templates\Ubiquity</DocTemplate>
</PropertyGroup>
</Target>
</Project>
25 changes: 25 additions & 0 deletions src/Interop/LlvmBindingsGenerator/LlvmBindingsGenerator.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30021.99
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LlvmBindingsGenerator", "LlvmBindingsGenerator.csproj", "{9A14EF74-BDF8-4D00-803A-A48A14828526}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9A14EF74-BDF8-4D00-803A-A48A14828526}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A14EF74-BDF8-4D00-803A-A48A14828526}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A14EF74-BDF8-4D00-803A-A48A14828526}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9A14EF74-BDF8-4D00-803A-A48A14828526}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3C6B306B-6805-4AAA-A735-D285C826A434}
EndGlobalSection
EndGlobal
Loading