update to net6.0 net7.0 net8.0

netcorepal · Sep 29, 2023 · 5dc6a7e · 5dc6a7e
1 parent ef6f45d
commit 5dc6a7e
Show file tree

Hide file tree

Showing 37 changed files with 582 additions and 395 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,10 +3,8 @@ name: 'CI'
 on:
   push:
     branches:
-    - main
-    - features/**
-    tags:
-    - '*.*.*'
+    - mainx
+    - featuresx/**
   pull_request:
 
 env:

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -0,0 +1,26 @@
+name: preview build
+
+on:
+  push:
+    branches: [ netcorepal ]
+  pull_request:
+    branches: [ netcorepal ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        global-json-file: global.json
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build -c Release --no-restore
+    - name: Test
+      run: dotnet test # --verbosity normal
+    - name: Pack NuGet
+      run: dotnet pack -c Release --version-suffix preview.1.`date +%y%m%d%H%M` -o ./  -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
+    - name: Push MyGet
+      run: dotnet nuget push '*.nupkg' -s https://www.myget.org/F/netcorepal/api/v3/index.json -k ${{ secrets.MYGET_API_KEY }} --skip-duplicate
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+	<Import Project="$(MSBuildThisFileDirectory)\eng\versions.props" />
+</Project>
diff --git a/NuGet.config b/NuGet.config
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-	<clear/>
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
-    <add key="IdentityServer Local" value="./nuget" />
   </packageSources>
 </configuration>
diff --git a/eng/versions.props b/eng/versions.props
@@ -0,0 +1,7 @@
+<Project>
+    <PropertyGroup>
+        <VersionPrefix>0.1.0</VersionPrefix>
+        <VersionSuffix></VersionSuffix>
+        <PackageId>NetCorePal.$(AssemblyName)</PackageId>
+    </PropertyGroup>
+</Project>
diff --git a/global.json b/global.json
@@ -1,5 +1,7 @@
 {
   "sdk": {
-    "version": "6.0.406"
+    "version": "8.0.100-preview.7.23376.3",
+    "allowPrerelease": true,
+    "rollForward": "latestMinor"
   }
 }
diff --git a/netcorepal.identityserver4.sln b/netcorepal.identityserver4.sln
@@ -0,0 +1,85 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer4", "src\IdentityServer4\src\IdentityServer4.csproj", "{95E6BE6A-9EE0-42CD-B341-AB5119327085}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer4.EntityFramework", "src\EntityFramework\src\IdentityServer4.EntityFramework.csproj", "{19C53216-A194-4A67-B325-7C151B3123FE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer4.EntityFramework.Storage", "src\EntityFramework.Storage\src\IdentityServer4.EntityFramework.Storage.csproj", "{657D452F-CE20-492D-80D8-BF64587856D2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer4.Storage", "src\Storage\src\IdentityServer4.Storage.csproj", "{21812066-32ED-4A27-B216-0B7D8407A256}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer4.AspNetIdentity", "src\AspNetIdentity\src\IdentityServer4.AspNetIdentity.csproj", "{E0630A5C-DE93-471C-843D-55F2F5CBBA94}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer.UnitTests", "src\IdentityServer4\test\IdentityServer.UnitTests\IdentityServer.UnitTests.csproj", "{27C2B16B-6270-4AAA-9C9D-A36F31788E45}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BC762CB2-A04C-4945-815A-C654EFCB46F4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer.IntegrationTests", "src\IdentityServer4\test\IdentityServer.IntegrationTests\IdentityServer.IntegrationTests.csproj", "{D6B44DFB-E63C-44D3-82C8-0AD290800D93}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer4.EntityFramework.UnitTests", "src\EntityFramework.Storage\test\UnitTests\IdentityServer4.EntityFramework.UnitTests.csproj", "{9EC1AEE6-8AE3-4FEC-9F15-64D7E9AB256A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer4.EntityFramework.IntegrationTests", "src\EntityFramework.Storage\test\IntegrationTests\IdentityServer4.EntityFramework.IntegrationTests.csproj", "{2E7CC7A4-482F-4938-985A-BBFF8F78E773}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer4.EntityFramework.Tests", "src\EntityFramework\test\IdentityServer4.EntityFramework.Tests\IdentityServer4.EntityFramework.Tests.csproj", "{9BB5E9C0-96B9-4C09-A3C4-17E5E79F452E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{95E6BE6A-9EE0-42CD-B341-AB5119327085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95E6BE6A-9EE0-42CD-B341-AB5119327085}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95E6BE6A-9EE0-42CD-B341-AB5119327085}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95E6BE6A-9EE0-42CD-B341-AB5119327085}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19C53216-A194-4A67-B325-7C151B3123FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19C53216-A194-4A67-B325-7C151B3123FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19C53216-A194-4A67-B325-7C151B3123FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19C53216-A194-4A67-B325-7C151B3123FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{657D452F-CE20-492D-80D8-BF64587856D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{657D452F-CE20-492D-80D8-BF64587856D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{657D452F-CE20-492D-80D8-BF64587856D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{657D452F-CE20-492D-80D8-BF64587856D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21812066-32ED-4A27-B216-0B7D8407A256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21812066-32ED-4A27-B216-0B7D8407A256}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21812066-32ED-4A27-B216-0B7D8407A256}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21812066-32ED-4A27-B216-0B7D8407A256}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0630A5C-DE93-471C-843D-55F2F5CBBA94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0630A5C-DE93-471C-843D-55F2F5CBBA94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0630A5C-DE93-471C-843D-55F2F5CBBA94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0630A5C-DE93-471C-843D-55F2F5CBBA94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27C2B16B-6270-4AAA-9C9D-A36F31788E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27C2B16B-6270-4AAA-9C9D-A36F31788E45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27C2B16B-6270-4AAA-9C9D-A36F31788E45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27C2B16B-6270-4AAA-9C9D-A36F31788E45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6B44DFB-E63C-44D3-82C8-0AD290800D93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6B44DFB-E63C-44D3-82C8-0AD290800D93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6B44DFB-E63C-44D3-82C8-0AD290800D93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6B44DFB-E63C-44D3-82C8-0AD290800D93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EC1AEE6-8AE3-4FEC-9F15-64D7E9AB256A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EC1AEE6-8AE3-4FEC-9F15-64D7E9AB256A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EC1AEE6-8AE3-4FEC-9F15-64D7E9AB256A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EC1AEE6-8AE3-4FEC-9F15-64D7E9AB256A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E7CC7A4-482F-4938-985A-BBFF8F78E773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E7CC7A4-482F-4938-985A-BBFF8F78E773}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E7CC7A4-482F-4938-985A-BBFF8F78E773}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E7CC7A4-482F-4938-985A-BBFF8F78E773}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9BB5E9C0-96B9-4C09-A3C4-17E5E79F452E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9BB5E9C0-96B9-4C09-A3C4-17E5E79F452E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BB5E9C0-96B9-4C09-A3C4-17E5E79F452E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9BB5E9C0-96B9-4C09-A3C4-17E5E79F452E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{27C2B16B-6270-4AAA-9C9D-A36F31788E45} = {BC762CB2-A04C-4945-815A-C654EFCB46F4}
+		{D6B44DFB-E63C-44D3-82C8-0AD290800D93} = {BC762CB2-A04C-4945-815A-C654EFCB46F4}
+		{9EC1AEE6-8AE3-4FEC-9F15-64D7E9AB256A} = {BC762CB2-A04C-4945-815A-C654EFCB46F4}
+		{2E7CC7A4-482F-4938-985A-BBFF8F78E773} = {BC762CB2-A04C-4945-815A-C654EFCB46F4}
+		{9BB5E9C0-96B9-4C09-A3C4-17E5E79F452E} = {BC762CB2-A04C-4945-815A-C654EFCB46F4}
+	EndGlobalSection
+EndGlobal
diff --git a/src/AspNetIdentity/src/IdentityServer4.AspNetIdentity.csproj b/src/AspNetIdentity/src/IdentityServer4.AspNetIdentity.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageId>IdentityServer4.AspNetIdentity</PackageId>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 
     <Description>ASP.NET Core Identity Integration for IdentityServer4</Description>
     <Authors>Brock Allen;Dominick Baier</Authors>
@@ -39,9 +39,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityServer4" />
-
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\IdentityServer4\src\IdentityServer4.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -1,70 +1,78 @@
 <Project>
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
+        <FrameworkVersion >6.0.0</FrameworkVersion>
+        <ExtensionsVersion>6.0.0</ExtensionsVersion>
+        <EntityFrameworkVersion>7.0.11</EntityFrameworkVersion>
+        <IdentityServerVersion>4.1.2-*</IdentityServerVersion>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
+        <FrameworkVersion >7.0.0</FrameworkVersion>
+        <ExtensionsVersion>7.0.0</ExtensionsVersion>
+        <EntityFrameworkVersion>7.0.11</EntityFrameworkVersion>
+        <IdentityServerVersion>4.1.2-*</IdentityServerVersion>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
+        <FrameworkVersion >8.0.0-preview.7.23375.9</FrameworkVersion>
+        <ExtensionsVersion>8.0.0-preview.7.23375.9</ExtensionsVersion>
+        <EntityFrameworkVersion>7.0.11</EntityFrameworkVersion>
+        <IdentityServerVersion>4.1.2-*</IdentityServerVersion>
+    </PropertyGroup>
+    <ItemGroup>
+        <!--build related-->
+        <!-- <PackageReference Include="MinVer" Version="2.3.0" PrivateAssets="All" /> -->
+        <PackageReference Update="SimpleExec" Version="6.2.0"/>
+        <PackageReference Update="Bullseye" Version="3.3.0"/>
+        <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
 
-  <PropertyGroup>
-    <FrameworkVersion>3.1.0</FrameworkVersion>
-    <ExtensionsVersion>3.1.0</ExtensionsVersion>
-    <EntityFrameworkVersion>3.1.0</EntityFrameworkVersion>
-
-    <IdentityServerVersion>4.1.2-*</IdentityServerVersion>
-  </PropertyGroup>
+        <!--tests -->
+        <PackageReference Update="FluentAssertions" Version="6.8.0"/>
+        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.7.2"/>
+        <PackageReference Update="xunit" Version="2.4.1"/>
+        <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All"/>
 
-  <ItemGroup>
-    <!--build related-->
-    <!-- <PackageReference Include="MinVer" Version="2.3.0" PrivateAssets="All" /> -->
-    <PackageReference Update="SimpleExec" Version="6.2.0" />
-    <PackageReference Update="Bullseye" Version="3.3.0" />
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+        <!--our stuff -->
+        <PackageReference Update="IdentityModel" Version="6.0.0"/>
+        <PackageReference Update="IdentityServer4" Version="$(IdentityServerVersion)"/>
+        <PackageReference Update="IdentityServer4.AspNetIdentity" Version="$(IdentityServerVersion)"/>
+        <PackageReference Update="IdentityServer4.Storage" Version="$(IdentityServerVersion)"/>
+        <PackageReference Update="IdentityServer4.EntityFramework.Storage" Version="$(IdentityServerVersion)"/>
+        <PackageReference Update="IdentityServer4.EntityFramework" Version="$(IdentityServerVersion)"/>
 
-    <!--tests -->
-    <PackageReference Update="FluentAssertions" Version="5.10.2" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Update="xunit" Version="2.4.1" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
+        <!--microsoft extensions -->
+        <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="$(ExtensionsVersion)"/>
+        <PackageReference Update="Microsoft.Extensions.Http" Version="$(ExtensionsVersion)"/>
+        <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="$(ExtensionsVersion)"/>
+        <PackageReference Update="Microsoft.Extensions.Logging" Version="$(ExtensionsVersion)"/>
+        <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="$(ExtensionsVersion)"/>
+        <PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(ExtensionsVersion)"/>
 
-    <!--our stuff -->
-    <PackageReference Update="IdentityModel" Version="4.4.0" />
+        <!--misc -->
+        <PackageReference Update="Newtonsoft.Json" Version="13.0.2"/>
+        <PackageReference Update="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.32.3"/>
+        <PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.32.3"/>
+        <PackageReference Update="System.Security.Principal.Windows" Version="4.7.0"/>
+        <PackageReference Update="AutoMapper" Version="12.0.1"/>
 
-    <PackageReference Update="IdentityServer4" Version="$(IdentityServerVersion)" />
-    <PackageReference Update="IdentityServer4.AspNetIdentity" Version="$(IdentityServerVersion)" />
-    <PackageReference Update="IdentityServer4.Storage" Version="$(IdentityServerVersion)" />
-    <PackageReference Update="IdentityServer4.EntityFramework.Storage" Version="$(IdentityServerVersion)" />
-    <PackageReference Update="IdentityServer4.EntityFramework" Version="$(IdentityServerVersion)" />
+        <!--microsoft asp.net core -->
+        <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(FrameworkVersion)"/>
+        <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(FrameworkVersion)"/>
+        <PackageReference Update="Microsoft.AspNetCore.Identity" Version="$(FrameworkVersion)"/>
+        <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(FrameworkVersion)"/>
+        <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(FrameworkVersion)"/>
+        <PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate" Version="$(FrameworkVersion)"/>
 
-    <!--microsoft extensions -->
-    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="$(ExtensionsVersion)" />
-    <PackageReference Update="Microsoft.Extensions.Http" Version="$(ExtensionsVersion)" />
-    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="$(ExtensionsVersion)" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="$(ExtensionsVersion)" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="$(ExtensionsVersion)" />
-    <PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(ExtensionsVersion)" />
-
-    <!--misc -->
-    <PackageReference Update="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Update="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="5.6.0" />
-    <PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="[5.6.0,6.0)" />
-    <PackageReference Update="System.Security.Principal.Windows" Version="4.7.0" />
-    <PackageReference Update="AutoMapper" Version="[10.0.0,11.0)" />
-
-    <!--microsoft asp.net core -->
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(FrameworkVersion)" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(FrameworkVersion)" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity" Version="$(FrameworkVersion)" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(FrameworkVersion)" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(FrameworkVersion)" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate" Version="$(FrameworkVersion)"/>
-
-    <!--microsoft entity framework -->
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkVersion)" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkVersion)" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkVersion)" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkVersion)" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EntityFrameworkVersion)" PrivateAssets="All" />
+        <!--microsoft entity framework -->
+        <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkVersion)"/>
+        <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkVersion)"/>
+        <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkVersion)"/>
+        <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkVersion)"/>
+        <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EntityFrameworkVersion)" PrivateAssets="All"/>
 
-  </ItemGroup>
+    </ItemGroup>
 
-  <Target Name="SetAssemblyVersion" AfterTargets="MinVer">
-    <PropertyGroup>
-      <AssemblyVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</AssemblyVersion>
-    </PropertyGroup>
-  </Target>
+    <Target Name="SetAssemblyVersion" AfterTargets="MinVer">
+        <PropertyGroup>
+            <AssemblyVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</AssemblyVersion>
+        </PropertyGroup>
+    </Target>
 </Project>
diff --git a/src/EntityFramework.Storage/src/IdentityServer4.EntityFramework.Storage.csproj b/src/EntityFramework.Storage/src/IdentityServer4.EntityFramework.Storage.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageId>IdentityServer4.EntityFramework.Storage</PackageId>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 
     <Description>EntityFramework persistence layer for IdentityServer4</Description>
     <Authors>Brock Allen;Dominick Baier;Scott Brady</Authors>
@@ -32,12 +32,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityServer4.Storage" />
-
     <PackageReference Include="AutoMapper" />
-
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Storage\src\IdentityServer4.Storage.csproj" />
+  </ItemGroup>
 
 </Project>