Skip to content

Commit

Permalink
Merge pull request #2 from emiliano84/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Emiliano84 authored Sep 13, 2019
2 parents 5fe01d4 + a45f318 commit 1993db5
Show file tree
Hide file tree
Showing 97 changed files with 169 additions and 109 deletions.
14 changes: 0 additions & 14 deletions .github/actions/docfx-build/Dockerfile

This file was deleted.

5 changes: 0 additions & 5 deletions .github/actions/docfx-build/action.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/actions/docfx-build/entrypoint.sh

This file was deleted.

10 changes: 0 additions & 10 deletions .github/actions/hello-world/Dockerfile

This file was deleted.

16 changes: 0 additions & 16 deletions .github/actions/hello-world/action.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .github/actions/hello-world/entrypoint.sh

This file was deleted.

1 change: 1 addition & 0 deletions .github/scripts/docfx.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"docfx/docfx.exe" docfx.json --property VisualStudioVersion=16.0
100 changes: 61 additions & 39 deletions .github/workflows/docfx.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,67 @@
name: DocFx Clone And Build
# This workflow is triggered on push to the repository.
on: [push]

jobs:
build:
name: Clone Repos
runs-on: ubuntu-latest
name: DocFx Clone, Build And Push
on:
pull_request:
types: [closed]

jobs:
clone_and_push:
runs-on: windows-latest
name: Clone, Build And Push
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v1

- name: Clone
run: git clone https://emiliano84:${{secrets.GITHUB_TOKEN}}@github.com/emiliano84/Toolkit.git ../Toolkit
- name: Clone
run: git clone https://emiliano84:${{secrets.GITHUB_TOKEN}}@github.com/emiliano84/Toolkit.git ../Toolkit
shell: bash

- name: Echo
run: echo ${HOME} ${GITHUB_ACTOR} ${GITHUB_REPOSITORY} ${GITHUB_WORKSPACE} ${GITHUB_SHA}
# ${{secrets.TOKEN}} ${{secrets.GITHUB_TOKEN}}
- name: Git Config email
run: git config --global user.email "[email protected]"
shell: bash

- name: Ls
run: ls
- name: Git Config name
run: git config --global user.name "DocFx Bot"
shell: bash

- name: Ls /home/runner/work/Toolkit.Docs
run: ls /home/runner/work/Toolkit.Docs

docfx_build:
runs-on: ubuntu-latest
name: Docfx Build
steps:
- name: Docfx Build Step
id: docfx_build
uses: emiliano84/Toolkit.Docs/.github/actions/docfx-build@master
- name: Git Config remote.origin.url
run: git config --global remote.origin.url "https://emiliano84:${{secrets.GITHUB_TOKEN}}@github.com/emiliano84/Toolkit.Docs.git"
shell: bash

# hello_world_job:
# runs-on: ubuntu-latest
# name: A job to say hello
# steps:
# # - uses: ./ # Uses an action in the root directory
# - name: Hello world action step
# id: hello
# uses: emiliano84/Toolkit.Docs/.github/actions/hello-world@master
# with:
# who-to-greet: 'Mona the Octocat'
# # Use the output from the `hello` step
# - name: Get the output time
# run: echo "The time was ${{ steps.hello.outputs.time }}"
- name: git remote add origin
run: git remote add origin https://github.com/emiliano84/Toolkit.Docs
continue-on-error: true
shell: bash

- name: git fetch origin
run: git fetch origin
shell: bash

- name: git checkout master
run: git checkout master
shell: bash

- name: Docfx
id: docfx
run: ".github/scripts/docfx.bat"
shell: bash

- name: git subtree add
run: git subtree add --prefix docs origin/gh-pages
continue-on-error: true
shell: bash

- name: Git Add docs
run: git add docs/* -f
shell: bash

- name: Git Commit
run: git commit -m "Docs"
shell: bash

# create a local gh-pages branch containing the splitted output folder
- name: Git subtree
run: git subtree split --prefix docs -b gh-pages
shell: bash
# force the push of the gh-pages branch to the remote gh-pages branch at origin
- name: Git Push
run: git push -f https://emiliano84:${{secrets.GITHUB_TOKEN}}@github.com/emiliano84/Toolkit.Docs.git gh-pages:gh-pages
shell: bash
2 changes: 1 addition & 1 deletion articles/gettingStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i

Testing Code Snippet

[!code-csharp[EdgeTappedListViewEventArgs](../../src/UwpCommunity.Uwp.Controls/Collections/EdgeTappedListViewEventArgs.cs)]
[!code-csharp[EdgeTappedListViewEventArgs](../../Toolkit/UwpCommunity.Uwp.Controls/Collections/EdgeTappedListViewEventArgs.cs)]

Binary file added docfx/AutoMapper.dll
Binary file not shown.
Binary file added docfx/CommandLine.dll
Binary file not shown.
Binary file added docfx/DotLiquid.dll
Binary file not shown.
Binary file added docfx/Dotnet.ProjInfo.Helpers.dll
Binary file not shown.
Binary file added docfx/Dotnet.ProjInfo.dll
Binary file not shown.
Binary file added docfx/FSharp.Compiler.Service.MSBuild.v12.dll
Binary file not shown.
Binary file added docfx/FSharp.Compiler.Service.dll
Binary file not shown.
Binary file added docfx/FSharp.Core.dll
Binary file not shown.
Binary file added docfx/FSharp.Core.resources.dll
Binary file not shown.
Binary file added docfx/HtmlAgilityPack.dll
Binary file not shown.
Binary file added docfx/Jint.dll
Binary file not shown.
Binary file added docfx/Markdig.dll
Binary file not shown.
Binary file added docfx/Microsoft.Build.Locator.dll
Binary file not shown.
Binary file added docfx/Microsoft.CodeAnalysis.CSharp.Features.dll
Binary file not shown.
Binary file not shown.
Binary file added docfx/Microsoft.CodeAnalysis.CSharp.dll
Binary file not shown.
Binary file added docfx/Microsoft.CodeAnalysis.Features.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added docfx/Microsoft.CodeAnalysis.VisualBasic.dll
Binary file not shown.
Binary file not shown.
Binary file added docfx/Microsoft.CodeAnalysis.Workspaces.dll
Binary file not shown.
Binary file added docfx/Microsoft.CodeAnalysis.dll
Binary file not shown.
Binary file added docfx/Microsoft.DocAsCode.Build.Common.dll
Binary file not shown.
Binary file not shown.
Binary file added docfx/Microsoft.DocAsCode.Build.Engine.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added docfx/Microsoft.DocAsCode.Build.RestApi.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added docfx/Microsoft.DocAsCode.Common.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added docfx/Microsoft.DocAsCode.Dfm.dll
Binary file not shown.
Binary file added docfx/Microsoft.DocAsCode.Glob.dll
Binary file not shown.
Binary file added docfx/Microsoft.DocAsCode.HtmlToPdf.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added docfx/Microsoft.DocAsCode.MarkdigEngine.dll
Binary file not shown.
Binary file added docfx/Microsoft.DocAsCode.MarkdownLite.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added docfx/Microsoft.DocAsCode.Plugins.dll
Binary file not shown.
Binary file added docfx/Microsoft.DocAsCode.YamlSerialization.dll
Binary file not shown.
Binary file added docfx/Microsoft.Owin.Diagnostics.dll
Binary file not shown.
Binary file added docfx/Microsoft.Owin.FileSystems.dll
Binary file not shown.
Binary file added docfx/Microsoft.Owin.Host.HttpListener.dll
Binary file not shown.
Binary file added docfx/Microsoft.Owin.Hosting.dll
Binary file not shown.
Binary file added docfx/Microsoft.Owin.StaticFiles.dll
Binary file not shown.
Binary file added docfx/Microsoft.Owin.dll
Binary file not shown.
Binary file added docfx/Microsoft.VisualStudio.RemoteControl.dll
Binary file not shown.
Binary file not shown.
Binary file added docfx/Newtonsoft.Json.Schema.dll
Binary file not shown.
Binary file added docfx/Newtonsoft.Json.dll
Binary file not shown.
Binary file added docfx/NuGet.Common.dll
Binary file not shown.
Binary file added docfx/NuGet.Configuration.dll
Binary file not shown.
Binary file added docfx/NuGet.DependencyResolver.Core.dll
Binary file not shown.
Binary file added docfx/NuGet.Frameworks.dll
Binary file not shown.
Binary file added docfx/NuGet.LibraryModel.dll
Binary file not shown.
Binary file added docfx/NuGet.Packaging.Core.Types.dll
Binary file not shown.
Binary file added docfx/NuGet.Packaging.Core.dll
Binary file not shown.
Binary file added docfx/NuGet.Packaging.dll
Binary file not shown.
Binary file added docfx/NuGet.ProjectModel.dll
Binary file not shown.
Binary file added docfx/NuGet.Protocol.dll
Binary file not shown.
Binary file added docfx/NuGet.Versioning.dll
Binary file not shown.
Binary file added docfx/Nustache.Core.dll
Binary file not shown.
Binary file added docfx/Owin.dll
Binary file not shown.
Binary file added docfx/SQLitePCLRaw.core.dll
Binary file not shown.
Binary file added docfx/System.Collections.Immutable.dll
Binary file not shown.
Binary file added docfx/System.Composition.AttributedModel.dll
Binary file not shown.
Binary file added docfx/System.Composition.Convention.dll
Binary file not shown.
Binary file added docfx/System.Composition.Hosting.dll
Binary file not shown.
Binary file added docfx/System.Composition.Runtime.dll
Binary file not shown.
Binary file added docfx/System.Composition.TypedParts.dll
Binary file not shown.
Binary file added docfx/System.Reflection.Metadata.dll
Binary file not shown.
Binary file added docfx/System.Text.Encoding.CodePages.dll
Binary file not shown.
Binary file added docfx/System.Threading.Tasks.Dataflow.dll
Binary file not shown.
Binary file added docfx/YamlDotNet.dll
Binary file not shown.
Binary file added docfx/docfx.exe
Binary file not shown.
106 changes: 106 additions & 0 deletions docfx/docfx.exe.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="msbuildToolsets" type="Microsoft.Build.Evaluation.ToolsetConfigurationSection, Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</configSections>
<!-- To define one or more new toolsets, add an 'msbuildToolsets' element in this file. -->
<msbuildToolsets default="Current">
<toolset toolsVersion="Current">
<property name="MSBuildToolsPath" value="$([MSBuild]::GetCurrentToolsDirectory())" />
<property name="MSBuildToolsPath32" value="$([MSBuild]::GetToolsDirectory32())" />
<property name="MSBuildToolsPath64" value="$([MSBuild]::GetToolsDirectory64())" />
<property name="MSBuildSDKsPath" value="$([MSBuild]::GetMSBuildSDKsPath())" />
<property name="FrameworkSDKRoot" value="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\NETFXSDK\4.7.2@InstallationFolder)" />
<property name="MSBuildRuntimeVersion" value="4.0.30319" />
<property name="MSBuildFrameworkToolsPath" value="$(SystemRoot)\Microsoft.NET\Framework\v$(MSBuildRuntimeVersion)\" />
<property name="MSBuildFrameworkToolsPath32" value="$(SystemRoot)\Microsoft.NET\Framework\v$(MSBuildRuntimeVersion)\" />
<property name="MSBuildFrameworkToolsPath64" value="$(SystemRoot)\Microsoft.NET\Framework64\v$(MSBuildRuntimeVersion)\" />
<property name="MSBuildFrameworkToolsRoot" value="$(SystemRoot)\Microsoft.NET\Framework\" />
<property name="SDK35ToolsPath" value="$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx35Tools-x86', 'InstallationFolder', null, RegistryView.Registry32))" />
<property name="SDK40ToolsPath" value="$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\NETFXSDK\4.7.2\WinSDK-NetFx40Tools-x86', 'InstallationFolder', null, RegistryView.Registry32))" />
<property name="WindowsSDK80Path" value="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1@InstallationFolder)" />
<property name="VsInstallRoot" value="$([MSBuild]::GetVsInstallRoot())" />
<property name="MSBuildToolsRoot" value="$(VsInstallRoot)\MSBuild" />
<property name="MSBuildExtensionsPath" value="$([MSBuild]::GetMSBuildExtensionsPath())" />
<property name="MSBuildExtensionsPath32" value="$([MSBuild]::GetMSBuildExtensionsPath())" />
<property name="RoslynTargetsPath" value="$([MSBuild]::GetToolsDirectory32())\Roslyn" />
<!-- VC Specific Paths -->
<property name="VCTargetsPath" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath)','$(MSBuildExtensionsPath32)\Microsoft\VC\v160\'))" />
<property name="VCTargetsPath14" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath14)','$([MSBuild]::GetProgramFiles32())\MSBuild\Microsoft.Cpp\v4.0\V140\'))" />
<property name="VCTargetsPath12" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath12)','$([MSBuild]::GetProgramFiles32())\MSBuild\Microsoft.Cpp\v4.0\V120\'))" />
<property name="VCTargetsPath11" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath11)','$([MSBuild]::GetProgramFiles32())\MSBuild\Microsoft.Cpp\v4.0\V110\'))" />
<property name="VCTargetsPath10" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath10)','$([MSBuild]::GetProgramFiles32())\MSBuild\Microsoft.Cpp\v4.0\'))" />
<property name="AndroidTargetsPath" value="$(MSBuildExtensionsPath32)\Microsoft\MDD\Android\V150\" />
<property name="iOSTargetsPath" value="$(MSBuildExtensionsPath32)\Microsoft\MDD\iOS\V150\" />
<projectImportSearchPaths>
<searchPaths os="windows">
<property name="MSBuildExtensionsPath" value="$(MSBuildProgramFiles32)\MSBuild" />
<property name="MSBuildExtensionsPath32" value="$(MSBuildProgramFiles32)\MSBuild" />
<property name="MSBuildExtensionsPath64" value="$(MSBuildProgramFiles32)\MSBuild" />
<property name="VSToolsPath" value="$(MSBuildProgramFiles32)\MSBuild\Microsoft\VisualStudio\v$(VisualStudioVersion)" />
</searchPaths>
</projectImportSearchPaths>
</toolset>
</msbuildToolsets>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Build.Conversion.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Build.Tasks.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Build.Utilities.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="NuGet.Common" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="NuGet.Frameworks" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="NuGet.Versioning" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.5.0.4" newVersion="4.5.0.4" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
</configuration>
Binary file added docfx/itextsharp.dll
Binary file not shown.

0 comments on commit 1993db5

Please sign in to comment.