Skip to content

Commit e70f32a

Browse files
committed
Merge branch 'master' into feature/document-generation-update
2 parents 769356e + b759821 commit e70f32a

File tree

4 files changed

+25
-1
lines changed

4 files changed

+25
-1
lines changed

azure-pipelines.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,21 @@ steps:
8686

8787
- script: dir $(Build.SourcesDirectory)/code-examples-csharp-private
8888

89+
- script: |
90+
echo "Checking for running Docker containers..."
91+
containers=$(docker ps -q)
92+
if [ ! -z "$containers" ]; then
93+
echo "Stopping running Docker containers..."
94+
docker stop $(docker ps -q)
95+
else
96+
echo "No Docker containers are running."
97+
fi
98+
displayName: "check for running containers"
99+
100+
- script: |
101+
docker system prune -a --force
102+
displayName: "cleanup docker files"
103+
89104
- task: Docker@2
90105
displayName: Build csharp image
91106
inputs:

launcher-csharp/Maestro/Examples/CreateWorkflowService.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,7 @@ private static Dictionary<string, object> PrepareVariables(string triggerId)
727727
{ "source", "step" },
728728
{ "propertyName", "envelopeId" },
729729
{ "stepId", "step2" },
730+
{ "type", "String" },
730731
}
731732
},
732733
{
@@ -736,6 +737,7 @@ private static Dictionary<string, object> PrepareVariables(string triggerId)
736737
{ "source", "step" },
737738
{ "propertyName", "combinedDocumentsBase64" },
738739
{ "stepId", "step2" },
740+
{ "type", "File" },
739741
}
740742
},
741743
{
@@ -745,6 +747,7 @@ private static Dictionary<string, object> PrepareVariables(string triggerId)
745747
{ "source", "step" },
746748
{ "propertyName", "fields.signer.text.value" },
747749
{ "stepId", "step2" },
750+
{ "type", "String" },
748751
}
749752
},
750753
};

launcher-csharp/launcher-csharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<PackageReference Include="DocuSign.Click" Version="1.2.2" />
4141
<PackageReference Include="DocuSign.eSign.dll" Version="6.9.0-rc1" />
4242
<PackageReference Include="DocuSign.Monitor" Version="1.1.1" />
43-
<PackageReference Include="DocuSign.Maestro" Version="1.0.0-alpha2" />
43+
<PackageReference Include="DocuSign.Maestro" Version="1.0.0-rc1" />
4444
<PackageReference Include="DocuSign.Rooms" Version="1.3.0" />
4545
<PackageReference Include="DocuSign.WebForms" Version="1.0.1-rc10" />
4646
<PackageReference Include="Microsoft.AspNetCore.Session" Version="2.2.0" />

manifest/CodeExamplesManifest.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1963,6 +1963,12 @@
19631963
]
19641964
}
19651965
],
1966+
"AdditionalPage": [
1967+
{
1968+
"Name": "publish_workflow",
1969+
"ResultsPageText": "Please open <a href=\"{0}\" target=\"_blank\">the following page</a> to publish the workflow."
1970+
}
1971+
],
19661972
"RedirectsToOtherCodeExamples": [
19671973
{
19681974
"CodeExampleToRedirectTo": 8,

0 commit comments

Comments
 (0)