Skip to content
This repository has been archived by the owner on Apr 21, 2021. It is now read-only.

Commit

Permalink
Merge branch 'develop' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
justcoding121 committed Nov 10, 2020
2 parents 9874d0c + d06214d commit 169c31e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .build/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Task Build -depends Restore-Packages{
#publish API documentation changes for GitHub pages under master\docs directory
Task Document -depends Build {

if($Branch -eq "master")
if($Branch -eq "develop")
{

#use docfx to generate API documentation from source metadata
Expand All @@ -91,7 +91,7 @@ Task Document -depends Build {
New-Item -ItemType Directory -Force -Path $TEMP_REPO_DIR

#clone
git clone https://github.com/$GitHubUserName/$GitHubProjectName.git --branch master $TEMP_REPO_DIR
git clone https://github.com/$GitHubUserName/$GitHubProjectName.git --branch develop $TEMP_REPO_DIR

If(test-path "$TEMP_REPO_DIR\docs")
{
Expand All @@ -105,14 +105,14 @@ Task Document -depends Build {
#copy docs to clone directory\docs
Copy-Item -Path "$RepoRoot\docs\*" -Destination "$TEMP_REPO_DIR\docs" -Recurse -Force

#push changes to master
#push changes to develop
git config --global credential.helper store
Add-Content "$HOME\.git-credentials" "https://$($env:github_access_token):[email protected]`n"
git config --global user.email $env:github_email
git config --global user.name "buildbot171"
git add . -A
git commit -m "API documentation update by build server"
git push origin master
git push origin develop

#move cd back to current location
cd $Here
Expand Down
7 changes: 7 additions & 0 deletions src/EventHook/EventHook.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Office.Interop.Outlook, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
Expand Down Expand Up @@ -92,6 +98,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="StrongNameKey.snk" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\.nuget\NuGet.targets" Condition="Exists('..\..\.nuget\NuGet.targets')" />
Expand Down
Binary file added src/EventHook/StrongNameKey.snk
Binary file not shown.

0 comments on commit 169c31e

Please sign in to comment.