From c22f3625bc7d733bd8fe00d9fee0b910b3a49426 Mon Sep 17 00:00:00 2001
From: dlandi <dennis@dennislandi.com>
Date: Fri, 24 Jun 2022 15:16:22 +0200
Subject: [PATCH] upgrade projects to .Net-6.0

---
 .../AdaptiveCards.Blazor.Samples.csproj           |  5 +++--
 .../AdaptiveCards.Blazor.Samples/CodeBlock.razor  |  2 +-
 .../Pages/_Host.cshtml                            |  4 +++-
 samples/AdaptiveCards.Blazor.Samples/Startup.cs   |  6 ++++++
 .../AdaptiveCards.Blazor.Samples/appsettings.json |  3 ++-
 .../AdaptiveCards.Blazor.csproj                   | 15 +++++++++------
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/samples/AdaptiveCards.Blazor.Samples/AdaptiveCards.Blazor.Samples.csproj b/samples/AdaptiveCards.Blazor.Samples/AdaptiveCards.Blazor.Samples.csproj
index 6a5dd48..a5d0a4e 100644
--- a/samples/AdaptiveCards.Blazor.Samples/AdaptiveCards.Blazor.Samples.csproj
+++ b/samples/AdaptiveCards.Blazor.Samples/AdaptiveCards.Blazor.Samples.csproj
@@ -1,16 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
+
   <ItemGroup>
     <_ContentIncludedByDefault Remove="wwwroot\codeBlockJsInterop.js" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Blazor.AdaptiveCards\AdaptiveCards.Blazor.csproj" />
-    <PackageReference Include="BlazorStrap" Version="1.1.101"></PackageReference>
+    <PackageReference Include="BlazorStrap" Version="5.0.105.4262022"></PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/AdaptiveCards.Blazor.Samples/CodeBlock.razor b/samples/AdaptiveCards.Blazor.Samples/CodeBlock.razor
index 0cc133c..971ea78 100644
--- a/samples/AdaptiveCards.Blazor.Samples/CodeBlock.razor
+++ b/samples/AdaptiveCards.Blazor.Samples/CodeBlock.razor
@@ -1,5 +1,5 @@
 <div class="mt-5">
-    <BSButton Color="Color.Primary" OnClick="onclick">Source Code</BSButton>
+    <BSButton Color="BSColor.Light" OnClick="onclick">Source Code</BSButton>
     <div class="mb-3"></div>
     <BSCollapse IsOpen="@IsOpen">
         <BSCard CardType="CardType.Card">
diff --git a/samples/AdaptiveCards.Blazor.Samples/Pages/_Host.cshtml b/samples/AdaptiveCards.Blazor.Samples/Pages/_Host.cshtml
index 0fafb1e..30422ec 100644
--- a/samples/AdaptiveCards.Blazor.Samples/Pages/_Host.cshtml
+++ b/samples/AdaptiveCards.Blazor.Samples/Pages/_Host.cshtml
@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
     <title>AdaptiveCards for Blazor Samples</title>
     <base href="~/" />
-
+    <link href="AdaptiveCards.Blazor.Samples.styles.css" rel="stylesheet" integrity="if_needed">
     <link href="bootstrap.min.css" rel="stylesheet">
     <link href="docs.min.css" rel="stylesheet">
     <link href="prism.css" rel="stylesheet">
@@ -56,6 +56,8 @@
     </app>
 
     <script src="_framework/blazor.server.js"></script>
+    <script src="_content/BlazorStrap/popper.min.js"></script>
+    <script src="_content/BlazorStrap/blazorstrap.js"></script>
 
     <script>
         AOS.init({
diff --git a/samples/AdaptiveCards.Blazor.Samples/Startup.cs b/samples/AdaptiveCards.Blazor.Samples/Startup.cs
index 1f6962c..296d796 100644
--- a/samples/AdaptiveCards.Blazor.Samples/Startup.cs
+++ b/samples/AdaptiveCards.Blazor.Samples/Startup.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Hosting;
 using AdaptiveCards.Blazor.Samples.Data;
 using AdaptiveCards.Blazor.Extensions;
+using BlazorStrap;
 
 namespace AdaptiveCards.Blazor.Samples
 {
@@ -20,17 +21,22 @@ public class Startup
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
+            //services.AddSingleton<BlazorStrap.IBlazorStrap>();
+            services.AddBlazorStrap();
+
             services.AddRazorPages();
             services.AddServerSideBlazor();
             services.AddSingleton<WeatherForecastService>();
             services.AddHttpClient("samples", x => {
                 x.BaseAddress = new System.Uri("https://raw.githubusercontent.com/mikoskinen/Blazor.AdaptiveCards/master/samples/AdaptiveCards.Blazor.Samples/Pages/");
+                
             });
 
             services.AddBlazorAdaptiveCards()
                 .AddTemplate<WeatherForecast>(Schemas.WeatherTemplated)
                 .AddTemplate<Customer>(Schemas.CustomerTemplated)
                 .AddFileTemplate("Alternative", "AlternativeTemplatedAdaptiveCard.json");
+            ;
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/samples/AdaptiveCards.Blazor.Samples/appsettings.json b/samples/AdaptiveCards.Blazor.Samples/appsettings.json
index d9d9a9b..0015947 100644
--- a/samples/AdaptiveCards.Blazor.Samples/appsettings.json
+++ b/samples/AdaptiveCards.Blazor.Samples/appsettings.json
@@ -6,5 +6,6 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "DetailedErrors": true
 }
diff --git a/src/Blazor.AdaptiveCards/AdaptiveCards.Blazor.csproj b/src/Blazor.AdaptiveCards/AdaptiveCards.Blazor.csproj
index 29961af..e641a0a 100644
--- a/src/Blazor.AdaptiveCards/AdaptiveCards.Blazor.csproj
+++ b/src/Blazor.AdaptiveCards/AdaptiveCards.Blazor.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RazorLangVersion>3.0</RazorLangVersion>
     <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -24,14 +24,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AdaptiveCards.Rendering.Html" Version="1.2.4" />
-    <PackageReference Include="Scriban" Version="2.0.1" />
-    <PackageReference Include="MinVer" Version="2.0.0" />
+    <PackageReference Include="AdaptiveCards.Rendering.Html" Version="2.7.3" />
+    <PackageReference Include="Scriban" Version="5.4.6" />
+    <PackageReference Include="MinVer" Version="4.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.6" />
   </ItemGroup>
 
   <ItemGroup>