StephenOTT · glazkovalex · Oct 3, 2022 · Jan 30, 2024 · Jan 30, 2024 · Jan 30, 2024
diff --git a/src/Blazor.Bpmn/Blazor.Bpmn.csproj b/src/Blazor.Bpmn/Blazor.Bpmn.csproj
@@ -1,19 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
-
-
   <ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.8" />
+    <Folder Include="Components\" />
   </ItemGroup>
-
   <ItemGroup>
-    <Folder Include="Components\" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.1" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Cammand.sln b/src/Cammand.sln
@@ -1,15 +1,15 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.810.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Blazor.Bpmn", "Blazor.Bpmn\Blazor.Bpmn.csproj", "{711EF309-A06E-4E5B-9A54-17ED0C68F995}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor.Bpmn", "Blazor.Bpmn\Blazor.Bpmn.csproj", "{711EF309-A06E-4E5B-9A54-17ED0C68F995}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Camunda.Http.Api", "Camunda.Http.Api\Camunda.Http.Api.csproj", "{338C7887-818E-444B-AC44-F8C8D9F68DAE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Camunda.Http.Api", "Camunda.Http.Api\Camunda.Http.Api.csproj", "{338C7887-818E-444B-AC44-F8C8D9F68DAE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Formio", "Formio\Formio.csproj", "{B1717ADE-2749-4627-9347-2B3605BC8F85}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Formio", "Formio\Formio.csproj", "{B1717ADE-2749-4627-9347-2B3605BC8F85}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MainApp", "MainApp\MainApp.csproj", "{FC5477AB-1BC3-4ECB-A5F3-49673FD460B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MainApp", "MainApp\MainApp.csproj", "{FC5477AB-1BC3-4ECB-A5F3-49673FD460B9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Camunda.Http.Api/Camunda.Http.Api.csproj b/src/Camunda.Http.Api/Camunda.Http.Api.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>Camunda.Http.Api</AssemblyName>
     <PackageId>Camunda.Http.Api</PackageId>
     <OutputType>Library</OutputType>
@@ -18,12 +17,9 @@
     <RepositoryType>git</RepositoryType>
     <PackageReleaseNotes>Minor update</PackageReleaseNotes>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="JsonSubTypes" Version="1.8.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Polly" Version="7.2.1" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="JsonSubTypes" Version="2.0.1" />
+    <PackageReference Include="Polly" Version="8.2.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/src/Formio/Components/FormioBuilder.razor b/src/Formio/Components/FormioBuilder.razor
@@ -4,7 +4,6 @@
 
 <div @ref="@FormioElement"></div>
 
-
 @code
 {
     ElementReference FormioElement;
@@ -13,19 +12,19 @@
 
     [Parameter]
     public FormSchema FormSchema { get; set; } = null;
-    
+
     [Parameter]
     public RenderFragment NoSchemaDisplay { get; set; }
 
     [Parameter]
     public object BuilderConfig { get; set; } = null;
-    
+
     [Parameter]
    public EventCallback OnBuilderSaveComponent { get; set; }
-    
+
     [Parameter]
     public EventCallback<FormSchema> OnBuilderChange { get; set; }
-    
+
     // [Parameter]
     // public string GeneratedSchema { get; set; }
 
@@ -38,7 +37,7 @@
         }
     }
 
-    
+
     private async Task BuildForm()
     {
         var dotNetReference = DotNetObjectReference.Create(this);
@@ -56,10 +55,7 @@
     {
         await FormInstance.DisposeAsync();
     }
-
-
-    
-
+
     void LogNoSchema()
     {
         Console.WriteLine("No Form Schema found for Formio Builder");

diff --git a/src/Formio/Components/FormioViewer.razor b/src/Formio/Components/FormioViewer.razor
@@ -28,8 +28,6 @@
     [Parameter]
     public EventCallback<FormSubmission> OnFormSubmit { get; set; }
 
-
-
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)

diff --git a/src/Formio/Formio.csproj b/src/Formio/Formio.csproj
@@ -1,22 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-
+<Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
-
   <ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.8" />
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="Components\" />
-    <Folder Include="wwwroot\css\fonts" />
+    <Folder Include="wwwroot\css\" />
+    <Folder Include="wwwroot\js\" />
   </ItemGroup>
-
   <ItemGroup>
     <_ContentIncludedByDefault Remove="wwwroot\bpmn\.DS_Store" />
     <_ContentIncludedByDefault Remove="wwwroot\bpmn\css\bpmn-custom.css" />
@@ -28,4 +21,8 @@
     <_ContentIncludedByDefault Remove="wwwroot\bpmn\font\bpmn.woff" />
     <_ContentIncludedByDefault Remove="wwwroot\bpmn\font\bpmn.woff2" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
+  </ItemGroup>
+</Project>
diff --git a/src/Formio/Properties/launchSettings.json b/src/Formio/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "Formio": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:9408;http://localhost:9409"
+    }
+  }
+}
diff --git a/src/Formio/libman.json b/src/Formio/libman.json
@@ -0,0 +1,30 @@
+{
+  "version": "1.0",
+  "defaultProvider": "unpkg",
+  "libraries": [
+    {
+      "library": "bootstrap@4.6.2",
+      "destination": "wwwroot/lib/bootstrap/",
+      "files": [
+        "dist/*/*.*"
+      ]
+    },
+    {
+      "provider": "unpkg",
+      "library": "formiojs@4.18.2",
+      "destination": "wwwroot/lib/formiojs/",
+      "files": [
+        "dist/*.*",
+        "dist/*/*.*"
+      ]
+    },
+    {
+      "provider": "unpkg",
+      "library": "bootswatch@4.6.2",
+      "destination": "wwwroot/lib/bootswatch/",
+      "files": [
+        "dist/materia/bootstrap.min.css"
+      ]
+    }
+  ]
+}
diff --git a/src/Formio/wwwroot/css/bootstrap/bootstrap-grid.css.map b/src/Formio/wwwroot/css/bootstrap/bootstrap-grid.css.map
diff --git a/src/Formio/wwwroot/css/bootstrap/bootstrap-grid.min.css b/src/Formio/wwwroot/css/bootstrap/bootstrap-grid.min.css
diff --git a/src/Formio/wwwroot/css/bootstrap/bootstrap-grid.min.css.map b/src/Formio/wwwroot/css/bootstrap/bootstrap-grid.min.css.map
diff --git a/src/Formio/wwwroot/css/bootstrap/bootstrap-reboot.css.map b/src/Formio/wwwroot/css/bootstrap/bootstrap-reboot.css.map
diff --git a/src/Formio/wwwroot/css/bootstrap/bootstrap-reboot.min.css b/src/Formio/wwwroot/css/bootstrap/bootstrap-reboot.min.css
diff --git a/src/Formio/wwwroot/css/bootstrap/bootstrap-reboot.min.css.map b/src/Formio/wwwroot/css/bootstrap/bootstrap-reboot.min.css.map
diff --git a/src/Formio/wwwroot/css/bootstrap/bootstrap.css.map b/src/Formio/wwwroot/css/bootstrap/bootstrap.css.map
diff --git a/src/Formio/wwwroot/css/bootstrap/bootstrap.min.css b/src/Formio/wwwroot/css/bootstrap/bootstrap.min.css
diff --git a/src/Formio/wwwroot/css/bootstrap/bootstrap.min.css.map b/src/Formio/wwwroot/css/bootstrap/bootstrap.min.css.map
diff --git a/src/Formio/wwwroot/css/formio.full.min.css b/src/Formio/wwwroot/css/formio.full.min.css
diff --git a/src/Formio/wwwroot/js/bootstrap/bootstrap.bundle.js.map b/src/Formio/wwwroot/js/bootstrap/bootstrap.bundle.js.map
diff --git a/src/Formio/wwwroot/js/bootstrap/bootstrap.bundle.min.js b/src/Formio/wwwroot/js/bootstrap/bootstrap.bundle.min.js
diff --git a/src/Formio/wwwroot/js/bootstrap/bootstrap.bundle.min.js.map b/src/Formio/wwwroot/js/bootstrap/bootstrap.bundle.min.js.map
diff --git a/src/Formio/wwwroot/js/bootstrap/bootstrap.js.map b/src/Formio/wwwroot/js/bootstrap/bootstrap.js.map
diff --git a/src/Formio/wwwroot/js/bootstrap/bootstrap.min.js b/src/Formio/wwwroot/js/bootstrap/bootstrap.min.js
diff --git a/src/Formio/wwwroot/js/bootstrap/bootstrap.min.js.map b/src/Formio/wwwroot/js/bootstrap/bootstrap.min.js.map
diff --git a/src/Formio/wwwroot/js/formio-interop.js b/src/Formio/wwwroot/js/formio-interop.js
@@ -1,4 +1,4 @@
-import "./formio.full.min.js";
+import "./../lib/formiojs/dist/formio.full.min.js";
 
 Formio.icons = 'fontawesome'
 

diff --git a/src/Formio/wwwroot/js/formio.full.min.js b/src/Formio/wwwroot/js/formio.full.min.js
diff --git a/.../wwwroot/css/bootstrap/bootstrap-grid.css → ...lib/bootstrap/dist/css/bootstrap-grid.css b/.../wwwroot/css/bootstrap/bootstrap-grid.css → ...lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/src/Formio/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/src/Formio/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/src/Formio/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/src/Formio/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/src/Formio/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/src/Formio/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/...wwroot/css/bootstrap/bootstrap-reboot.css → ...b/bootstrap/dist/css/bootstrap-reboot.css b/...wwroot/css/bootstrap/bootstrap-reboot.css → ...b/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/src/Formio/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/src/Formio/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/src/Formio/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/src/Formio/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/src/Formio/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/src/Formio/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map