Merge pull request #41 from damienbod/dev-net6

Dev net6
damienbod · Nov 21, 2021 · 621a0e8 · 621a0e8
2 parents 18ea47b + ef5bfae
commit 621a0e8
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 31 deletions.
diff --git a/examplesUsingCertificateAuthentication/AspNetCoreChained/AspNetCoreCertificateAuth.sln b/examplesUsingCertificateAuthentication/AspNetCoreChained/AspNetCoreCertificateAuth.sln
@@ -1,12 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29609.76
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreCertificateAuth", "AspNetCoreCertificateAuth\AspNetCoreCertificateAuth.csproj", "{ED21F60B-1535-4B84-92E9-5D76319DA0BC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E953693D-E196-4AA8-BD74-8C5D8127ED96}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreCertificateAuthApiChained", "AspNetCoreCertificateAuthApiChained\AspNetCoreCertificateAuthApiChained.csproj", "{FE17EDCF-C5C4-4B7C-AC01-99E372BBE952}"
 EndProject
 Global

diff --git a/...thentication/AspNetCoreChained/AspNetCoreCertificateAuth/AspNetCoreCertificateAuth.csproj b/...thentication/AspNetCoreChained/AspNetCoreCertificateAuth/AspNetCoreCertificateAuth.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...oreChained/AspNetCoreCertificateAuthApiChained/AspNetCoreCertificateAuthApiChained.csproj b/...oreChained/AspNetCoreCertificateAuthApiChained/AspNetCoreCertificateAuthApiChained.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
     <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examplesUsingCertificateAuthentication/AzureCertAuth/AzureCertAuth/AzureCertAuth.csproj b/examplesUsingCertificateAuthentication/AzureCertAuth/AzureCertAuth/AzureCertAuth.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.9" />
-    <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.9" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.21" />
+    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
     <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -21,5 +21,4 @@
     </None>
   </ItemGroup>
 
-
 </Project>
diff --git a/examplesUsingCertificateAuthentication/AzureCertAuth/AzureCertAuth/AzureCertAuth.csproj.user b/examplesUsingCertificateAuthentication/AzureCertAuth/AzureCertAuth/AzureCertAuth.csproj.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>AzureCertAuth20201108214641 - Web Deploy</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>C:\repos\git\damienbod\AspNetCoreCertificates\examplesUsingCertificateAuthentication\AzureCertAuth\AzureCertAuth\Properties\PublishProfiles\AzureCertAuth20201108214641 - Web Deploy.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>
diff --git a/.../AzureCertAuth/Properties/PublishProfiles/AzureCertAuth20201108214641 - Web Deploy.pubxml b/.../AzureCertAuth/Properties/PublishProfiles/AzureCertAuth20201108214641 - Web Deploy.pubxml
@@ -6,7 +6,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <WebPublishMethod>MSDeploy</WebPublishMethod>
-    <ResourceId>/subscriptions/1f943d6c-66d4-4c2f-a158-e6b99fcec7a2/resourcegroups/damienbod-rg/providers/Microsoft.Web/sites/AzureCertAuth20201108214641</ResourceId>
+    <ResourceId>/subscriptions/1f943d6c-66d4-4c2f-a158-e6b99fcec7a2/resourceGroups/damienbod-rg/providers/Microsoft.Web/sites/AzureCertAuth20201108214641</ResourceId>
     <ResourceGroup>damienbod-rg</ResourceGroup>
     <PublishProvider>AzureWebSite</PublishProvider>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
@@ -21,6 +21,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
     <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
     <EnableMSDeployBackup>True</EnableMSDeployBackup>
+    <EnableMsDeployAppOffline>True</EnableMsDeployAppOffline>
     <UserName>$AzureCertAuth20201108214641</UserName>
     <_SavePWD>True</_SavePWD>
     <_DestinationType>AzureWebSite</_DestinationType>

diff --git a/...eCertAuth/Properties/PublishProfiles/AzureCertAuth20201108214641 - Web Deploy.pubxml.user b/...eCertAuth/Properties/PublishProfiles/AzureCertAuth20201108214641 - Web Deploy.pubxml.user
@@ -6,6 +6,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
-    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAjv2N8rrLV0OVNuQiOcXSgQAAAAACAAAAAAAQZgAAAAEAACAAAADT062VmkMuu7iB1pMnuaeMkxEBiUQHYZN7T3ugY33rMQAAAAAOgAAAAAIAACAAAABTznU7242kZRxKLhcxtLBDQRq6H3Ac/U2uNdPL/WRq8oAAAAC3ZiKxsJe9PIrDr1xAAIpErLAUdCHvUA0v9wUYnpo2ah4DLduwB8ThLENPyQvAkXfkZaiYXbhSOcbFOyV1Sbv83Q8yIT9Vy/n3/XBLYFwt708KkArcUwuKMXVJu24PyLR9ItAbiRJuxSRgy/Ws+DqR3VdeEzDfDNbeVWGTc6TS5EAAAADmVE+T+35Zx0/pe+mCiw3Aa2Y+PeKW85LeQN8mXaWtS0yQSAGatd1o3VnRNH72EBf1kT9A3UW0i7MFQrMbQy6s</EncryptedPassword>
+    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAqOAdXithLkCz7ynmx1cmCAAAAAACAAAAAAAQZgAAAAEAACAAAAB64j38vEnO0aURIT1ORpc4MOMMABGI4IRvaXv55AnJDgAAAAAOgAAAAAIAACAAAAAzhuX9c8NTuHn0fdZSCxzMjm3cuUOj0FN12Sbm7VXsloAAAAA95PQKYL9ALDHayzb4yElEKNB9y+nVmaNa5XCiyiV9DlijIez2GcltpmZ1wTMFU8C2Kp0iGk6iUORkYLRCMI8dhhpDbWudO1NazBraFh5A6XboqLm1X+UqcX22XEfpGYsvMC8ngSG3aXHiDoTBJPS1+z6uAFBzkult18Fw9j4qvEAAAAA0fjAC0dm0yMDQyCmUomen0OJC4Jlu7Zrl9Tr0+K7r5P1+FtjNQGerPoE4XEkCoB4r0pTdkPKXFEp6mDiB0W+Z</EncryptedPassword>
   </PropertyGroup>
 </Project>
diff --git a/...Authentication/AzureCertAuth/AzureCertAuthClientConsole/AzureCertAuthClientConsole.csproj b/...Authentication/AzureCertAuth/AzureCertAuthClientConsole/AzureCertAuthClientConsole.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examplesUsingCertificateAuthentication/AzureCertAuth/AzureCertAuthClientConsole/Program.cs b/examplesUsingCertificateAuthentication/AzureCertAuth/AzureCertAuthClientConsole/Program.cs
@@ -8,11 +8,11 @@ namespace AzureCertAuthClientConsole
 {
     class Program
     {
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
             Console.WriteLine("Get data!");
 
-            var json = GetApiDataUsingHttpClientHandler().GetAwaiter().GetResult();
+            var json = await GetApiDataUsingHttpClientHandler();
 
             Console.WriteLine("Success!");
         }