Merge tag '1.7.0' into develop

WildGums · Nov 15, 2023 · 8fb7d8e · 8fb7d8e
2 parents 1698c87 + 98be8fe
commit 8fb7d8e
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 15 deletions.
diff --git a/src/Blorc.OpenIdConnect.DemoApp.Server/Blorc.OpenIdConnect.DemoApp.Server.csproj b/src/Blorc.OpenIdConnect.DemoApp.Server/Blorc.OpenIdConnect.DemoApp.Server.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Blorc.OpenIdConnect.DemoApp/Blorc.OpenIdConnect.DemoApp.csproj b/src/Blorc.OpenIdConnect.DemoApp/Blorc.OpenIdConnect.DemoApp.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.*" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.*" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.*" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.BrowserConsole" Version="1.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.*" />
+    <PackageReference Include="System.Net.Http.Json" Version="8.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Blorc.OpenIdConnect.Tests/Blorc.OpenIdConnect.Tests.csproj b/src/Blorc.OpenIdConnect.Tests/Blorc.OpenIdConnect.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>Blorc.OpenIdConnect.Tests</AssemblyName>
     <RootNamespace>Blorc.OpenIdConnect.Tests</RootNamespace>
     <PackageId>Blorc.OpenIdConnect.Tests</PackageId>

diff --git a/...dConnect.Tests/PublicApiFacts.Blorc_OpenIdConnect_HasNoBreakingChanges_Async.verified.txt b/...dConnect.Tests/PublicApiFacts.Blorc_OpenIdConnect_HasNoBreakingChanges_Async.verified.txt
@@ -1,4 +1,4 @@
-[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName=".NET 6.0")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v8.0", FrameworkDisplayName=".NET 8.0")]
 namespace Blorc.OpenIdConnect
 {
     public class AccessTokenDelegatingHandler : System.Net.Http.DelegatingHandler

diff --git a/src/Blorc.OpenIdConnect/Blorc.OpenIdConnect.csproj b/src/Blorc.OpenIdConnect/Blorc.OpenIdConnect.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <AssemblyName>Blorc.OpenIdConnect</AssemblyName>
     <RootNamespace>Blorc.OpenIdConnect</RootNamespace>
     <PackageId>Blorc.OpenIdConnect</PackageId>
@@ -19,17 +19,30 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blorc.Core" Version="1.2.0" />
+    <PackageReference Include="Blorc.Core" Version="1.3.0" />
     <PackageReference Include="Fody" Version="6.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.*" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.*" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="all" />
   </ItemGroup>
 
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0')) ">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.*" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net7.0')) ">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.*" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net8.0')) ">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.*" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Remove="package.json" />
     <None Include="package.json" />

diff --git a/src/global.json b/src/global.json
@@ -3,7 +3,7 @@
         "MSBuild.Sdk.Extras": "3.0.44"
     },
     "sdk": {
-        "version": "7.0.0",
+        "version": "8.0.0",
         "rollForward": "latestMinor",
         "allowPrerelease": false
     }