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

Commit 169c31e

Browse files
committed
Merge branch 'develop' into stable
2 parents 9874d0c + d06214d commit 169c31e

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

.build/build.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Task Build -depends Restore-Packages{
6464
#publish API documentation changes for GitHub pages under master\docs directory
6565
Task Document -depends Build {
6666

67-
if($Branch -eq "master")
67+
if($Branch -eq "develop")
6868
{
6969

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

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

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

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

117117
#move cd back to current location
118118
cd $Here

src/EventHook/EventHook.csproj

+7
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@
4040
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
4141
<Prefer32Bit>false</Prefer32Bit>
4242
</PropertyGroup>
43+
<PropertyGroup>
44+
<SignAssembly>true</SignAssembly>
45+
</PropertyGroup>
46+
<PropertyGroup>
47+
<AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile>
48+
</PropertyGroup>
4349
<ItemGroup>
4450
<Reference Include="Microsoft.Office.Interop.Outlook, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
4551
<EmbedInteropTypes>True</EmbedInteropTypes>
@@ -92,6 +98,7 @@
9298
</ItemGroup>
9399
<ItemGroup>
94100
<None Include="app.config" />
101+
<None Include="StrongNameKey.snk" />
95102
</ItemGroup>
96103
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
97104
<Import Project="..\..\.nuget\NuGet.targets" Condition="Exists('..\..\.nuget\NuGet.targets')" />

src/EventHook/StrongNameKey.snk

596 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)