Skip to content
This repository has been archived by the owner on Feb 16, 2019. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/gcm-bug'
Browse files Browse the repository at this point in the history
  • Loading branch information
coder2000 committed May 1, 2017
2 parents 76013e1 + 387769b commit c18050d
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 15 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ build/
Backup/
_UpgradeReport_Files/

*.shfbproj
*.dll
*.suo
*.xml
Expand Down
101 changes: 101 additions & 0 deletions Ubiety.Docs/Ubiety.Docs.shfbproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- The configuration and platform will be used to determine which assemblies to include from solution and
project documentation sources -->
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>80b0f9a4-5d4d-4aac-9c72-49fe2c1af17a</ProjectGuid>
<SHFBSchemaVersion>2015.6.5.0</SHFBSchemaVersion>
<SHFBROOT Condition=" '$(SHFBROOT)' == '' ">$(MSBuildThisFileDirectory)..\packages\EWSoftware.SHFB.2017.1.28.0\Tools\</SHFBROOT>
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual Studio adds them anyway -->
<AssemblyName>Ubiety.Docs</AssemblyName>
<RootNamespace>Ubiety.Docs</RootNamespace>
<Name>Ubiety.Docs</Name>
<!-- SHFB properties -->
<FrameworkVersion>.NET Framework 4.5</FrameworkVersion>
<OutputPath>.\Help\</OutputPath>
<HtmlHelpName>Ubiety.Docs</HtmlHelpName>
<Language>en-US</Language>
<TransformComponentArguments>
<Argument Key="logoFile" Value="Help.png" xmlns="" />
<Argument Key="logoHeight" Value="" xmlns="" />
<Argument Key="logoWidth" Value="" xmlns="" />
<Argument Key="logoAltText" Value="" xmlns="" />
<Argument Key="logoPlacement" Value="left" xmlns="" />
<Argument Key="logoAlignment" Value="left" xmlns="" />
<Argument Key="maxVersionParts" Value="" xmlns="" />
</TransformComponentArguments>
<DocumentationSources>
<DocumentationSource sourceFile="..\ubiety\bin\Debug\Ubiety.Xmpp.dll" />
<DocumentationSource sourceFile="..\ubiety\ubiety.csproj" />
</DocumentationSources>
<SaveComponentCacheCapacity>100</SaveComponentCacheCapacity>
<BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
<HelpFileFormat>Markdown</HelpFileFormat>
<IndentHtml>False</IndentHtml>
<KeepLogFile>True</KeepLogFile>
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
<CleanIntermediates>True</CleanIntermediates>
<HelpFileVersion>1.0.0.0</HelpFileVersion>
<MaximumGroupParts>2</MaximumGroupParts>
<NamespaceGrouping>False</NamespaceGrouping>
<SyntaxFilters>Standard</SyntaxFilters>
<SdkLinkTarget>Blank</SdkLinkTarget>
<RootNamespaceContainer>False</RootNamespaceContainer>
<PresentationStyle>Markdown</PresentationStyle>
<Preliminary>False</Preliminary>
<NamingMethod>Guid</NamingMethod>
<HelpTitle>A Sandcastle Documented Class Library</HelpTitle>
<ContentPlacement>AboveNamespaces</ContentPlacement>

<ComponentPath>$(MSBuildThisFileDirectory)..\packages\EWSoftware.SHFB.NETFramework.4.6.2\</ComponentPath>
</PropertyGroup>
<!-- There are no properties for these groups. AnyCPU needs to appear in order for Visual Studio to perform
the build. The others are optional common platform types that may appear. -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
</PropertyGroup>
<ItemGroup>
<Folder Include="Content" />
<Folder Include="Content\VersionHistory" />
<Folder Include="icons" />
<Folder Include="media" />
</ItemGroup>
<ItemGroup>
<None Include="Content\VersionHistory\v1.0.0.0.aml" />
<None Include="Content\VersionHistory\VersionHistory.aml" />
<None Include="Content\Welcome.aml" />
</ItemGroup>
<ItemGroup>
<ContentLayout Include="ContentLayout.content" />
</ItemGroup>
<ItemGroup>
<Content Include="icons\Help.png" />
</ItemGroup>
<!-- Import the SHFB build targets -->
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
<!-- The pre-build and post-build event properties must appear *after* the targets file import in order to be
evaluated correctly. -->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
</Project>
14 changes: 0 additions & 14 deletions ubiety.sln
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C72D9A
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ubiety.Xmpp.Gcm", "Ubiety.Xmpp.Gcm\Ubiety.Xmpp.Gcm.csproj", "{E39385E8-356B-4B21-9BA8-AAC331C861FA}"
EndProject
Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "Ubiety.Docs", "Ubiety.Docs\Ubiety.Docs.shfbproj", "{80B0F9A4-5D4D-4AAC-9C72-49FE2C1AF17A}"
EndProject
Global
Expand Down Expand Up @@ -58,18 +56,6 @@ Global
{76FB5852-B727-426B-9054-0B580C0B5E5F}.Release|Any CPU.Build.0 = Release|Any CPU
{76FB5852-B727-426B-9054-0B580C0B5E5F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{76FB5852-B727-426B-9054-0B580C0B5E5F}.Release|x86.ActiveCfg = Release|Any CPU
{E39385E8-356B-4B21-9BA8-AAC331C861FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E39385E8-356B-4B21-9BA8-AAC331C861FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E39385E8-356B-4B21-9BA8-AAC331C861FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{E39385E8-356B-4B21-9BA8-AAC331C861FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{E39385E8-356B-4B21-9BA8-AAC331C861FA}.Debug|x86.ActiveCfg = Debug|Any CPU
{E39385E8-356B-4B21-9BA8-AAC331C861FA}.Debug|x86.Build.0 = Debug|Any CPU
{E39385E8-356B-4B21-9BA8-AAC331C861FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E39385E8-356B-4B21-9BA8-AAC331C861FA}.Release|Any CPU.Build.0 = Release|Any CPU
{E39385E8-356B-4B21-9BA8-AAC331C861FA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{E39385E8-356B-4B21-9BA8-AAC331C861FA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{E39385E8-356B-4B21-9BA8-AAC331C861FA}.Release|x86.ActiveCfg = Release|Any CPU
{E39385E8-356B-4B21-9BA8-AAC331C861FA}.Release|x86.Build.0 = Release|Any CPU
{80B0F9A4-5D4D-4AAC-9C72-49FE2C1AF17A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80B0F9A4-5D4D-4AAC-9C72-49FE2C1AF17A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80B0F9A4-5D4D-4AAC-9C72-49FE2C1AF17A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand Down

0 comments on commit c18050d

Please sign in to comment.