Merge branch 'master' into feature/create-account-example

annahileta · web-flow · commit 372cdd262bc0 · 2024-10-23T11:10:30.000+02:00
Signed-off-by: Anna Hileta &lt;80112359+annahileta@users.noreply.github.com&gt;
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -14,9 +14,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: '8.0.x'
     - name: setup-msbuild
       uses: microsoft/setup-msbuild@v1.1.3
     - name: Restore dependencies
diff --git a/JWT-Console/JWT-Console.csproj b/JWT-Console/JWT-Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>JWT_Console</RootNamespace>
     <DocuSignAuthType>JWT</DocuSignAuthType>
   </PropertyGroup>
diff --git a/Quick_ACG/Quick_ACG.csproj b/Quick_ACG/Quick_ACG.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<LangVersion>8.0</LangVersion>
     <RootNamespace>DocuSign.CodeExamples</RootNamespace>
   </PropertyGroup>
diff --git a/README.md b/README.md
diff --git a/launcher-csharp.Tests/launcher-csharp.Tests.csproj b/launcher-csharp.Tests/launcher-csharp.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>launcher_csharp.Tests</RootNamespace>
 
     <IsPackable>false</IsPackable>
diff --git a/launcher-csharp/WebForms/Controllers/CreateAndEmbedForm.cs b/launcher-csharp/WebForms/Controllers/CreateAndEmbedForm.cs
@@ -79,7 +79,7 @@ public ActionResult CheckTemplates()
 
             this.ViewBag.CodeExampleText = this.CodeExampleText;
             this.ViewBag.Description = this.CodeExampleText.AdditionalPages
-                .First(x => x.Name == "create_web_form").ResultsPageText;
+                .First(x => x.Name == "create_web_form").ResultsPageText.Replace("{0}", "launcher-csharp");
 
             return this.View("embedForm");
         }
diff --git a/launcher-csharp/WebForms/Examples/CreateAndEmbedFormService.cs b/launcher-csharp/WebForms/Examples/CreateAndEmbedFormService.cs
@@ -128,8 +128,8 @@ public static EnvelopeTemplate PrepareEnvelopeTemplate(string resultsTemplateNam
                         TabLabel = "Yes",
                         AnchorString = "/SMS/",
                         AnchorUnits = "pixels",
-                        AnchorXOffset = "20",
-                        AnchorYOffset = "10",
+                        AnchorXOffset = "0",
+                        AnchorYOffset = "0",
                     },
                 },
                 SignHereTabs = new List<SignHere>
@@ -152,35 +152,35 @@ public static EnvelopeTemplate PrepareEnvelopeTemplate(string resultsTemplateNam
                         TabLabel = "FullName",
                         AnchorString = "/FullName/",
                         AnchorUnits = "pixels",
-                        AnchorXOffset = "20",
-                        AnchorYOffset = "10",
+                        AnchorXOffset = "0",
+                        AnchorYOffset = "0",
                     },
                     new Text()
                     {
                         DocumentId = "1",
                         TabLabel = "PhoneNumber",
                         AnchorString = "/PhoneNumber/",
                         AnchorUnits = "pixels",
-                        AnchorXOffset = "20",
-                        AnchorYOffset = "10",
+                        AnchorXOffset = "0",
+                        AnchorYOffset = "0",
                     },
                     new Text()
                     {
                         DocumentId = "1",
                         TabLabel = "Company",
                         AnchorString = "/Company/",
                         AnchorUnits = "pixels",
-                        AnchorXOffset = "20",
-                        AnchorYOffset = "10",
+                        AnchorXOffset = "0",
+                        AnchorYOffset = "0",
                     },
                     new Text()
                     {
                         DocumentId = "1",
                         TabLabel = "JobTitle",
                         AnchorString = "/Title/",
                         AnchorUnits = "pixels",
-                        AnchorXOffset = "20",
-                        AnchorYOffset = "10",
+                        AnchorXOffset = "0",
+                        AnchorYOffset = "0",
                     },
                 },
                 DateSignedTabs = new List<DateSigned>
@@ -191,8 +191,8 @@ public static EnvelopeTemplate PrepareEnvelopeTemplate(string resultsTemplateNam
                         TabLabel = "DateSigned",
                         AnchorString = "/Date/",
                         AnchorUnits = "pixels",
-                        AnchorXOffset = "20",
-                        AnchorYOffset = "10",
+                        AnchorXOffset = "0",
+                        AnchorYOffset = "0",
                     },
                 },
             };
@@ -204,7 +204,7 @@ public static EnvelopeTemplate PrepareEnvelopeTemplate(string resultsTemplateNam
 
             return new EnvelopeTemplate()
             {
-                Description = "Example template created via the API",
+                Description = "Example template created via the eSignature API",
                 Name = resultsTemplateName,
                 Shared = "false",
                 Documents = new List<Document> { document },
diff --git a/launcher-csharp/WebForms/Views/CreateAndEmbedForm/Embed.cshtml b/launcher-csharp/WebForms/Views/CreateAndEmbedForm/Embed.cshtml
@@ -11,7 +11,7 @@
   <body>
     <div id="app">
       <div id="webform-customer-app-area">
-            <h5 id="webforms-heading">The web form has been embedded below using the DocuSign.js library.</h5>
+            <h5 id="webforms-heading">The web form has been embedded below using the Docusign JS library.</h5>
         <div id="docusign" class="webform-iframe-container">
           <p>Web Form will render here</p>
         </div>
diff --git a/launcher-csharp/launcher-csharp.csproj b/launcher-csharp/launcher-csharp.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
diff --git a/launcher-csharp/web-form-config.json b/launcher-csharp/web-form-config.json
diff --git a/manifest/CodeExamplesManifest.json b/manifest/CodeExamplesManifest.json

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public ActionResult CheckTemplates()`
`79`	`79`
`80`	`80`	`this.ViewBag.CodeExampleText = this.CodeExampleText;`
`81`	`81`	`this.ViewBag.Description = this.CodeExampleText.AdditionalPages`
`82`		`- .First(x => x.Name == "create_web_form").ResultsPageText;`
	`82`	`+ .First(x => x.Name == "create_web_form").ResultsPageText.Replace("{0}", "launcher-csharp");`
`83`	`83`
`84`	`84`	`return this.View("embedForm");`
`85`	`85`	`}`