Merge pull request #141 from koenbeuk/remove-legacy-support

Removed V1/V2 support
koenbeuk · Mar 17, 2022 · a402e84 · a402e84
2 parents 634a441 + f734bb6
commit a402e84
Show file tree

Hide file tree

Showing 169 changed files with 81 additions and 672 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <Configurations>Debug;Release;DebugV1;ReleaseV1;DebugV2;ReleaseV2</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -23,22 +23,4 @@
     <MicrosoftExtensionsVersion>6.0.0</MicrosoftExtensionsVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'DebugV2' Or '$(Configuration)' == 'ReleaseV2' ">
-    <EFCoreTriggeredVersion>2</EFCoreTriggeredVersion>
-    <EFCorePackageVersion>5.0.0</EFCorePackageVersion>
-    <MicrosoftExtensionsVersion>5.0.0</MicrosoftExtensionsVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'DebugV1' Or '$(Configuration)' == 'ReleaseV1' ">
-    <EFCoreTriggeredVersion>1</EFCoreTriggeredVersion>
-    <EFCorePackageVersion>3.1.0</EFCorePackageVersion>
-    <MicrosoftExtensionsVersion>3.1.0</MicrosoftExtensionsVersion>
-  </PropertyGroup>
-
-  <Target Name="Debug">  
-    <Message Importance="High" Text="Configuration: $(Configuration)" />
-    <Message Importance="High" Text="EFCoreTriggeredVersion: $(EFCoreTriggeredVersion)" />
-    <Message Importance="High" Text="EFCorePackageVersion: $(EFCorePackageVersion)" />
-  </Target>
-
 </Project>
diff --git a/EntityFrameworkCore.Triggered.Samples.slnf b/EntityFrameworkCore.Triggered.Samples.slnf
@@ -2,13 +2,11 @@
   "solution": {
     "path": "EntityFrameworkCore.Triggered.sln",
     "projects": [
-      "samples\\v1\\1 - HelloWorld\\1 - HelloWorld.csproj",
-      "samples\\v2\\1 - HelloWorld\\1 - HelloWorld.csproj",
-      "samples\\v2\\2 - PrimarySchool\\2 - PrimarySchool.csproj",
-      "samples\\v2\\3 - StudentManagerAspNetCore\\3 - StudentManagerAspNetCore.csproj",
-      "samples\\v2\\4 - BlazorTests\\4 - BlazorTests.csproj",
+      "samples\\1 - HelloWorld\\1 - HelloWorld.csproj",
+      "samples\\2 - PrimarySchool\\2 - PrimarySchool.csproj",
+      "samples\\3 - StudentManagerAspNetCore\\3 - StudentManagerAspNetCore.csproj",
+      "samples\\4 - BlazorTests\\4 - BlazorTests.csproj",
       "src\\EntityFrameworkCore.Triggered.Abstractions\\EntityFrameworkCore.Triggered.Abstractions.csproj",
-      "src\\EntityFrameworkCore.Triggered.AspNetCore\\EntityFrameworkCore.Triggered.AspNetCore.csproj",
       "src\\EntityFrameworkCore.Triggered.Transactions.Abstractions\\EntityFrameworkCore.Triggered.Transactions.Abstractions.csproj",
       "src\\EntityFrameworkCore.Triggered.Transactions\\EntityFrameworkCore.Triggered.Transactions.csproj",
       "src\\EntityFrameworkCore.Triggered\\EntityFrameworkCore.Triggered.csproj"

diff --git a/EntityFrameworkCore.Triggered.sln b/EntityFrameworkCore.Triggered.sln
diff --git a/...s/v2/1 - HelloWorld/1 - HelloWorld.csproj → samples/1 - HelloWorld/1 - HelloWorld.csproj b/...s/v2/1 - HelloWorld/1 - HelloWorld.csproj → samples/1 - HelloWorld/1 - HelloWorld.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>HelloWorld</RootNamespace>
     <Nullable>disable</Nullable>
   </PropertyGroup>

diff --git a/...v2/1 - HelloWorld/ApplicationDbContext.cs → ...es/1 - HelloWorld/ApplicationDbContext.cs b/...v2/1 - HelloWorld/ApplicationDbContext.cs → ...es/1 - HelloWorld/ApplicationDbContext.cs
diff --git a/samples/v2/1 - HelloWorld/Program.cs → samples/1 - HelloWorld/Program.cs b/samples/v2/1 - HelloWorld/Program.cs → samples/1 - HelloWorld/Program.cs
diff --git a/samples/v1/1 - HelloWorld/README.MD → samples/1 - HelloWorld/README.MD b/samples/v1/1 - HelloWorld/README.MD → samples/1 - HelloWorld/README.MD
diff --git a/...Triggers/StudentAssignRegistrationDate.cs → ...Triggers/StudentAssignRegistrationDate.cs b/...Triggers/StudentAssignRegistrationDate.cs → ...Triggers/StudentAssignRegistrationDate.cs
diff --git a/... - PrimarySchool/2 - PrimarySchool.csproj → ... - PrimarySchool/2 - PrimarySchool.csproj b/... - PrimarySchool/2 - PrimarySchool.csproj → ... - PrimarySchool/2 - PrimarySchool.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>PrimarySchool</RootNamespace>
     <Nullable>disable</Nullable>
   </PropertyGroup>

diff --git a/...2 - PrimarySchool/ApplicationDbContext.cs → ...2 - PrimarySchool/ApplicationDbContext.cs b/...2 - PrimarySchool/ApplicationDbContext.cs → ...2 - PrimarySchool/ApplicationDbContext.cs
diff --git a/samples/v2/2 - PrimarySchool/Program.cs → samples/2 - PrimarySchool/Program.cs b/samples/v2/2 - PrimarySchool/Program.cs → samples/2 - PrimarySchool/Program.cs
diff --git a/samples/v2/2 - PrimarySchool/README.MD → samples/2 - PrimarySchool/README.MD b/samples/v2/2 - PrimarySchool/README.MD → samples/2 - PrimarySchool/README.MD
diff --git a/...iggers/StudentSignupToMandatoryCourses.cs → ...iggers/StudentSignupToMandatoryCourses.cs b/...iggers/StudentSignupToMandatoryCourses.cs → ...iggers/StudentSignupToMandatoryCourses.cs
diff --git a/...tCore/3 - StudentManagerAspNetCore.csproj → ...tCore/3 - StudentManagerAspNetCore.csproj b/...tCore/3 - StudentManagerAspNetCore.csproj → ...tCore/3 - StudentManagerAspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>StudentManager</RootNamespace>
     <Nullable>disable</Nullable>
   </PropertyGroup>

diff --git a/...ManagerAspNetCore/ApplicationDbContext.cs → ...ManagerAspNetCore/ApplicationDbContext.cs b/...ManagerAspNetCore/ApplicationDbContext.cs → ...ManagerAspNetCore/ApplicationDbContext.cs
diff --git a/...v2/3 - StudentManagerAspNetCore/Models.cs → ...es/3 - StudentManagerAspNetCore/Models.cs b/...v2/3 - StudentManagerAspNetCore/Models.cs → ...es/3 - StudentManagerAspNetCore/Models.cs
diff --git a/...nagerAspNetCore/Pages/Audits/Index.cshtml → ...nagerAspNetCore/Pages/Audits/Index.cshtml b/...nagerAspNetCore/Pages/Audits/Index.cshtml → ...nagerAspNetCore/Pages/Audits/Index.cshtml
diff --git a/...erAspNetCore/Pages/Audits/Index.cshtml.cs → ...erAspNetCore/Pages/Audits/Index.cshtml.cs b/...erAspNetCore/Pages/Audits/Index.cshtml.cs → ...erAspNetCore/Pages/Audits/Index.cshtml.cs
diff --git a/...gerAspNetCore/Pages/Courses/Create.cshtml → ...gerAspNetCore/Pages/Courses/Create.cshtml b/...gerAspNetCore/Pages/Courses/Create.cshtml → ...gerAspNetCore/Pages/Courses/Create.cshtml
diff --git a/...AspNetCore/Pages/Courses/Create.cshtml.cs → ...AspNetCore/Pages/Courses/Create.cshtml.cs b/...AspNetCore/Pages/Courses/Create.cshtml.cs → ...AspNetCore/Pages/Courses/Create.cshtml.cs
diff --git a/...gerAspNetCore/Pages/Courses/Delete.cshtml → ...gerAspNetCore/Pages/Courses/Delete.cshtml b/...gerAspNetCore/Pages/Courses/Delete.cshtml → ...gerAspNetCore/Pages/Courses/Delete.cshtml
diff --git a/...AspNetCore/Pages/Courses/Delete.cshtml.cs → ...AspNetCore/Pages/Courses/Delete.cshtml.cs b/...AspNetCore/Pages/Courses/Delete.cshtml.cs → ...AspNetCore/Pages/Courses/Delete.cshtml.cs
diff --git a/...erAspNetCore/Pages/Courses/Details.cshtml → ...erAspNetCore/Pages/Courses/Details.cshtml b/...erAspNetCore/Pages/Courses/Details.cshtml → ...erAspNetCore/Pages/Courses/Details.cshtml
diff --git a/...spNetCore/Pages/Courses/Details.cshtml.cs → ...spNetCore/Pages/Courses/Details.cshtml.cs b/...spNetCore/Pages/Courses/Details.cshtml.cs → ...spNetCore/Pages/Courses/Details.cshtml.cs
diff --git a/...nagerAspNetCore/Pages/Courses/Edit.cshtml → ...nagerAspNetCore/Pages/Courses/Edit.cshtml b/...nagerAspNetCore/Pages/Courses/Edit.cshtml → ...nagerAspNetCore/Pages/Courses/Edit.cshtml
diff --git a/...erAspNetCore/Pages/Courses/Edit.cshtml.cs → ...erAspNetCore/Pages/Courses/Edit.cshtml.cs b/...erAspNetCore/Pages/Courses/Edit.cshtml.cs → ...erAspNetCore/Pages/Courses/Edit.cshtml.cs
diff --git a/...agerAspNetCore/Pages/Courses/Index.cshtml → ...agerAspNetCore/Pages/Courses/Index.cshtml b/...agerAspNetCore/Pages/Courses/Index.cshtml → ...agerAspNetCore/Pages/Courses/Index.cshtml
diff --git a/...rAspNetCore/Pages/Courses/Index.cshtml.cs → ...rAspNetCore/Pages/Courses/Index.cshtml.cs b/...rAspNetCore/Pages/Courses/Index.cshtml.cs → ...rAspNetCore/Pages/Courses/Index.cshtml.cs
diff --git a/...udentManagerAspNetCore/Pages/Error.cshtml → ...udentManagerAspNetCore/Pages/Error.cshtml b/...udentManagerAspNetCore/Pages/Error.cshtml → ...udentManagerAspNetCore/Pages/Error.cshtml
diff --git a/...ntManagerAspNetCore/Pages/Error.cshtml.cs → ...ntManagerAspNetCore/Pages/Error.cshtml.cs b/...ntManagerAspNetCore/Pages/Error.cshtml.cs → ...ntManagerAspNetCore/Pages/Error.cshtml.cs
diff --git a/...udentManagerAspNetCore/Pages/Index.cshtml → ...udentManagerAspNetCore/Pages/Index.cshtml b/...udentManagerAspNetCore/Pages/Index.cshtml → ...udentManagerAspNetCore/Pages/Index.cshtml
diff --git a/...ntManagerAspNetCore/Pages/Index.cshtml.cs → ...ntManagerAspNetCore/Pages/Index.cshtml.cs b/...ntManagerAspNetCore/Pages/Index.cshtml.cs → ...ntManagerAspNetCore/Pages/Index.cshtml.cs
diff --git a/...gerAspNetCore/Pages/Shared/_Layout.cshtml → ...gerAspNetCore/Pages/Shared/_Layout.cshtml b/...gerAspNetCore/Pages/Shared/_Layout.cshtml → ...gerAspNetCore/Pages/Shared/_Layout.cshtml
diff --git a/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml b/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml
diff --git a/...erAspNetCore/Pages/Students/Create.cshtml → ...erAspNetCore/Pages/Students/Create.cshtml b/...erAspNetCore/Pages/Students/Create.cshtml → ...erAspNetCore/Pages/Students/Create.cshtml
diff --git a/...spNetCore/Pages/Students/Create.cshtml.cs → ...spNetCore/Pages/Students/Create.cshtml.cs b/...spNetCore/Pages/Students/Create.cshtml.cs → ...spNetCore/Pages/Students/Create.cshtml.cs
diff --git a/...erAspNetCore/Pages/Students/Delete.cshtml → ...erAspNetCore/Pages/Students/Delete.cshtml b/...erAspNetCore/Pages/Students/Delete.cshtml → ...erAspNetCore/Pages/Students/Delete.cshtml
diff --git a/...spNetCore/Pages/Students/Delete.cshtml.cs → ...spNetCore/Pages/Students/Delete.cshtml.cs b/...spNetCore/Pages/Students/Delete.cshtml.cs → ...spNetCore/Pages/Students/Delete.cshtml.cs
diff --git a/...rAspNetCore/Pages/Students/Details.cshtml → ...rAspNetCore/Pages/Students/Details.cshtml b/...rAspNetCore/Pages/Students/Details.cshtml → ...rAspNetCore/Pages/Students/Details.cshtml
diff --git a/...pNetCore/Pages/Students/Details.cshtml.cs → ...pNetCore/Pages/Students/Details.cshtml.cs b/...pNetCore/Pages/Students/Details.cshtml.cs → ...pNetCore/Pages/Students/Details.cshtml.cs
diff --git a/...agerAspNetCore/Pages/Students/Edit.cshtml → ...agerAspNetCore/Pages/Students/Edit.cshtml b/...agerAspNetCore/Pages/Students/Edit.cshtml → ...agerAspNetCore/Pages/Students/Edit.cshtml
diff --git a/...rAspNetCore/Pages/Students/Edit.cshtml.cs → ...rAspNetCore/Pages/Students/Edit.cshtml.cs b/...rAspNetCore/Pages/Students/Edit.cshtml.cs → ...rAspNetCore/Pages/Students/Edit.cshtml.cs
diff --git a/...gerAspNetCore/Pages/Students/Index.cshtml → ...gerAspNetCore/Pages/Students/Index.cshtml b/...gerAspNetCore/Pages/Students/Index.cshtml → ...gerAspNetCore/Pages/Students/Index.cshtml
diff --git a/...AspNetCore/Pages/Students/Index.cshtml.cs → ...AspNetCore/Pages/Students/Index.cshtml.cs b/...AspNetCore/Pages/Students/Index.cshtml.cs → ...AspNetCore/Pages/Students/Index.cshtml.cs
diff --git a/...nagerAspNetCore/Pages/_ViewImports.cshtml → ...nagerAspNetCore/Pages/_ViewImports.cshtml b/...nagerAspNetCore/Pages/_ViewImports.cshtml → ...nagerAspNetCore/Pages/_ViewImports.cshtml
diff --git a/...ManagerAspNetCore/Pages/_ViewStart.cshtml → ...ManagerAspNetCore/Pages/_ViewStart.cshtml b/...ManagerAspNetCore/Pages/_ViewStart.cshtml → ...ManagerAspNetCore/Pages/_ViewStart.cshtml
diff --git a/...2/3 - StudentManagerAspNetCore/Program.cs → ...s/3 - StudentManagerAspNetCore/Program.cs b/...2/3 - StudentManagerAspNetCore/Program.cs → ...s/3 - StudentManagerAspNetCore/Program.cs
diff --git a/...AspNetCore/Properties/launchSettings.json → ...AspNetCore/Properties/launchSettings.json b/...AspNetCore/Properties/launchSettings.json → ...AspNetCore/Properties/launchSettings.json
diff --git a/...v2/3 - StudentManagerAspNetCore/README.md → ...es/3 - StudentManagerAspNetCore/README.md b/...v2/3 - StudentManagerAspNetCore/README.md → ...es/3 - StudentManagerAspNetCore/README.md
diff --git a/...anagerAspNetCore/Services/EmailService.cs → ...anagerAspNetCore/Services/EmailService.cs b/...anagerAspNetCore/Services/EmailService.cs → ...anagerAspNetCore/Services/EmailService.cs
diff --git a/...2/3 - StudentManagerAspNetCore/Startup.cs → ...s/3 - StudentManagerAspNetCore/Startup.cs b/...2/3 - StudentManagerAspNetCore/Startup.cs → ...s/3 - StudentManagerAspNetCore/Startup.cs
diff --git a/...udentManagerAspNetCore/Traits/IAudited.cs → ...udentManagerAspNetCore/Traits/IAudited.cs b/...udentManagerAspNetCore/Traits/IAudited.cs → ...udentManagerAspNetCore/Traits/IAudited.cs
diff --git a/...ntManagerAspNetCore/Traits/ISoftDelete.cs → ...ntManagerAspNetCore/Traits/ISoftDelete.cs b/...ntManagerAspNetCore/Traits/ISoftDelete.cs → ...ntManagerAspNetCore/Traits/ISoftDelete.cs
diff --git a/...re/Triggers/Courses/AutoSignupStudents.cs → ...re/Triggers/Courses/AutoSignupStudents.cs b/...re/Triggers/Courses/AutoSignupStudents.cs → ...re/Triggers/Courses/AutoSignupStudents.cs
diff --git a/...rses/BlockRemovalWhenCourseIsMandatory.cs → ...rses/BlockRemovalWhenCourseIsMandatory.cs b/...rses/BlockRemovalWhenCourseIsMandatory.cs → ...rses/BlockRemovalWhenCourseIsMandatory.cs
diff --git a/...gers/StudentCourses/SendWelcomingEmail.cs → ...gers/StudentCourses/SendWelcomingEmail.cs b/...gers/StudentCourses/SendWelcomingEmail.cs → ...gers/StudentCourses/SendWelcomingEmail.cs
diff --git a/...iggers/Students/AssignRegistrationDate.cs → ...iggers/Students/AssignRegistrationDate.cs b/...iggers/Students/AssignRegistrationDate.cs → ...iggers/Students/AssignRegistrationDate.cs
diff --git a/...gers/Students/SignupToMandatoryCourses.cs → ...gers/Students/SignupToMandatoryCourses.cs b/...gers/Students/SignupToMandatoryCourses.cs → ...gers/Students/SignupToMandatoryCourses.cs
diff --git a/...ggers/Traits/Audited/CreateAuditRecord.cs → ...ggers/Traits/Audited/CreateAuditRecord.cs b/...ggers/Traits/Audited/CreateAuditRecord.cs → ...ggers/Traits/Audited/CreateAuditRecord.cs
diff --git a/...ers/Traits/SoftDelete/EnsureSoftDelete.cs → ...ers/Traits/SoftDelete/EnsureSoftDelete.cs b/...ers/Traits/SoftDelete/EnsureSoftDelete.cs → ...ers/Traits/SoftDelete/EnsureSoftDelete.cs
diff --git a/...erAspNetCore/appsettings.Development.json → ...erAspNetCore/appsettings.Development.json b/...erAspNetCore/appsettings.Development.json → ...erAspNetCore/appsettings.Development.json
diff --git a/...StudentManagerAspNetCore/appsettings.json → ...StudentManagerAspNetCore/appsettings.json b/...StudentManagerAspNetCore/appsettings.json → ...StudentManagerAspNetCore/appsettings.json
diff --git a/...entManagerAspNetCore/wwwroot/css/site.css → ...entManagerAspNetCore/wwwroot/css/site.css b/...entManagerAspNetCore/wwwroot/css/site.css → ...entManagerAspNetCore/wwwroot/css/site.css
diff --git a/...dentManagerAspNetCore/wwwroot/favicon.ico → ...dentManagerAspNetCore/wwwroot/favicon.ico b/...dentManagerAspNetCore/wwwroot/favicon.ico → ...dentManagerAspNetCore/wwwroot/favicon.ico
diff --git a/...udentManagerAspNetCore/wwwroot/js/site.js → ...udentManagerAspNetCore/wwwroot/js/site.js b/...udentManagerAspNetCore/wwwroot/js/site.js → ...udentManagerAspNetCore/wwwroot/js/site.js
diff --git a/...rAspNetCore/wwwroot/lib/bootstrap/LICENSE → ...rAspNetCore/wwwroot/lib/bootstrap/LICENSE b/...rAspNetCore/wwwroot/lib/bootstrap/LICENSE → ...rAspNetCore/wwwroot/lib/bootstrap/LICENSE
diff --git a/...lib/bootstrap/dist/css/bootstrap-grid.css → ...lib/bootstrap/dist/css/bootstrap-grid.css b/...lib/bootstrap/dist/css/bootstrap-grid.css → ...lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/...bootstrap/dist/css/bootstrap-grid.css.map → ...bootstrap/dist/css/bootstrap-grid.css.map b/...bootstrap/dist/css/bootstrap-grid.css.map → ...bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/...bootstrap/dist/css/bootstrap-grid.min.css → ...bootstrap/dist/css/bootstrap-grid.min.css b/...bootstrap/dist/css/bootstrap-grid.min.css → ...bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/...strap/dist/css/bootstrap-grid.min.css.map → ...strap/dist/css/bootstrap-grid.min.css.map b/...strap/dist/css/bootstrap-grid.min.css.map → ...strap/dist/css/bootstrap-grid.min.css.map
diff --git a/...b/bootstrap/dist/css/bootstrap-reboot.css → ...b/bootstrap/dist/css/bootstrap-reboot.css b/...b/bootstrap/dist/css/bootstrap-reboot.css → ...b/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/...otstrap/dist/css/bootstrap-reboot.css.map → ...otstrap/dist/css/bootstrap-reboot.css.map b/...otstrap/dist/css/bootstrap-reboot.css.map → ...otstrap/dist/css/bootstrap-reboot.css.map
diff --git a/...otstrap/dist/css/bootstrap-reboot.min.css → ...otstrap/dist/css/bootstrap-reboot.min.css b/...otstrap/dist/css/bootstrap-reboot.min.css → ...otstrap/dist/css/bootstrap-reboot.min.css
diff --git a/...rap/dist/css/bootstrap-reboot.min.css.map → ...rap/dist/css/bootstrap-reboot.min.css.map b/...rap/dist/css/bootstrap-reboot.min.css.map → ...rap/dist/css/bootstrap-reboot.min.css.map
diff --git a/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css b/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css
diff --git a/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map b/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css b/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map b/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map
diff --git a/...lib/bootstrap/dist/js/bootstrap.bundle.js → ...lib/bootstrap/dist/js/bootstrap.bundle.js b/...lib/bootstrap/dist/js/bootstrap.bundle.js → ...lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/...bootstrap/dist/js/bootstrap.bundle.js.map → ...bootstrap/dist/js/bootstrap.bundle.js.map b/...bootstrap/dist/js/bootstrap.bundle.js.map → ...bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/...bootstrap/dist/js/bootstrap.bundle.min.js → ...bootstrap/dist/js/bootstrap.bundle.min.js b/...bootstrap/dist/js/bootstrap.bundle.min.js → ...bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/...strap/dist/js/bootstrap.bundle.min.js.map → ...strap/dist/js/bootstrap.bundle.min.js.map b/...strap/dist/js/bootstrap.bundle.min.js.map → ...strap/dist/js/bootstrap.bundle.min.js.map
diff --git a/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js b/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/...ot/lib/bootstrap/dist/js/bootstrap.js.map → ...ot/lib/bootstrap/dist/js/bootstrap.js.map b/...ot/lib/bootstrap/dist/js/bootstrap.js.map → ...ot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js b/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/...ib/bootstrap/dist/js/bootstrap.min.js.map → ...ib/bootstrap/dist/js/bootstrap.min.js.map b/...ib/bootstrap/dist/js/bootstrap.min.js.map → ...ib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/...jquery-validation-unobtrusive/LICENSE.txt → ...jquery-validation-unobtrusive/LICENSE.txt b/...jquery-validation-unobtrusive/LICENSE.txt → ...jquery-validation-unobtrusive/LICENSE.txt
diff --git a/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js b/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js
diff --git a/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js b/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js
diff --git a/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md b/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js b/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js
diff --git a/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js b/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js
diff --git a/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js b/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js
diff --git a/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js b/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js
diff --git a/...AspNetCore/wwwroot/lib/jquery/LICENSE.txt → ...AspNetCore/wwwroot/lib/jquery/LICENSE.txt b/...AspNetCore/wwwroot/lib/jquery/LICENSE.txt → ...AspNetCore/wwwroot/lib/jquery/LICENSE.txt
diff --git a/...NetCore/wwwroot/lib/jquery/dist/jquery.js → ...NetCore/wwwroot/lib/jquery/dist/jquery.js b/...NetCore/wwwroot/lib/jquery/dist/jquery.js → ...NetCore/wwwroot/lib/jquery/dist/jquery.js
diff --git a/...ore/wwwroot/lib/jquery/dist/jquery.min.js → ...ore/wwwroot/lib/jquery/dist/jquery.min.js b/...ore/wwwroot/lib/jquery/dist/jquery.min.js → ...ore/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/...re/wwwroot/lib/jquery/dist/jquery.min.map → ...re/wwwroot/lib/jquery/dist/jquery.min.map b/...re/wwwroot/lib/jquery/dist/jquery.min.map → ...re/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/...v2/4 - BlazorTests/4 - BlazorTests.csproj → ...es/4 - BlazorTests/4 - BlazorTests.csproj b/...v2/4 - BlazorTests/4 - BlazorTests.csproj → ...es/4 - BlazorTests/4 - BlazorTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>BlazorTests</RootNamespace>
     <Nullable>disable</Nullable>
   </PropertyGroup>

diff --git a/samples/v2/4 - BlazorTests/App.razor → samples/4 - BlazorTests/App.razor b/samples/v2/4 - BlazorTests/App.razor → samples/4 - BlazorTests/App.razor
diff --git a/...2/4 - BlazorTests/ApplicationDbContext.cs → ...s/4 - BlazorTests/ApplicationDbContext.cs b/...2/4 - BlazorTests/ApplicationDbContext.cs → ...s/4 - BlazorTests/ApplicationDbContext.cs
diff --git a/...2/4 - BlazorTests/Data/WeatherForecast.cs → ...s/4 - BlazorTests/Data/WeatherForecast.cs b/...2/4 - BlazorTests/Data/WeatherForecast.cs → ...s/4 - BlazorTests/Data/WeatherForecast.cs
diff --git a/...lazorTests/Data/WeatherForecastService.cs → ...lazorTests/Data/WeatherForecastService.cs b/...lazorTests/Data/WeatherForecastService.cs → ...lazorTests/Data/WeatherForecastService.cs
diff --git a/...les/v2/4 - BlazorTests/EventAggregator.cs → samples/4 - BlazorTests/EventAggregator.cs b/...les/v2/4 - BlazorTests/EventAggregator.cs → samples/4 - BlazorTests/EventAggregator.cs
diff --git a/...es/v2/4 - BlazorTests/Pages/Counter.razor → samples/4 - BlazorTests/Pages/Counter.razor b/...es/v2/4 - BlazorTests/Pages/Counter.razor → samples/4 - BlazorTests/Pages/Counter.razor
diff --git a/...les/v2/4 - BlazorTests/Pages/Error.cshtml → samples/4 - BlazorTests/Pages/Error.cshtml b/...les/v2/4 - BlazorTests/Pages/Error.cshtml → samples/4 - BlazorTests/Pages/Error.cshtml
diff --git a/.../v2/4 - BlazorTests/Pages/Error.cshtml.cs → ...les/4 - BlazorTests/Pages/Error.cshtml.cs b/.../v2/4 - BlazorTests/Pages/Error.cshtml.cs → ...les/4 - BlazorTests/Pages/Error.cshtml.cs
diff --git a/samples/v2/4 - BlazorTests/Pages/Index.razor → samples/4 - BlazorTests/Pages/Index.razor b/samples/v2/4 - BlazorTests/Pages/Index.razor → samples/4 - BlazorTests/Pages/Index.razor
diff --git a/...les/v2/4 - BlazorTests/Pages/_Host.cshtml → samples/4 - BlazorTests/Pages/_Host.cshtml b/...les/v2/4 - BlazorTests/Pages/_Host.cshtml → samples/4 - BlazorTests/Pages/_Host.cshtml
diff --git a/samples/v2/4 - BlazorTests/Program.cs → samples/4 - BlazorTests/Program.cs b/samples/v2/4 - BlazorTests/Program.cs → samples/4 - BlazorTests/Program.cs
diff --git a/...lazorTests/Properties/launchSettings.json → ...lazorTests/Properties/launchSettings.json b/...lazorTests/Properties/launchSettings.json → ...lazorTests/Properties/launchSettings.json
diff --git a/samples/v2/4 - BlazorTests/README.md → samples/4 - BlazorTests/README.md b/samples/v2/4 - BlazorTests/README.md → samples/4 - BlazorTests/README.md
diff --git a/...2/4 - BlazorTests/Shared/MainLayout.razor → ...s/4 - BlazorTests/Shared/MainLayout.razor b/...2/4 - BlazorTests/Shared/MainLayout.razor → ...s/4 - BlazorTests/Shared/MainLayout.razor
diff --git a/...- BlazorTests/Shared/MainLayout.razor.css → ...- BlazorTests/Shared/MainLayout.razor.css b/...- BlazorTests/Shared/MainLayout.razor.css → ...- BlazorTests/Shared/MainLayout.razor.css
diff --git a/...s/v2/4 - BlazorTests/Shared/NavMenu.razor → samples/4 - BlazorTests/Shared/NavMenu.razor b/...s/v2/4 - BlazorTests/Shared/NavMenu.razor → samples/4 - BlazorTests/Shared/NavMenu.razor
diff --git a/.../4 - BlazorTests/Shared/NavMenu.razor.css → .../4 - BlazorTests/Shared/NavMenu.razor.css b/.../4 - BlazorTests/Shared/NavMenu.razor.css → .../4 - BlazorTests/Shared/NavMenu.razor.css
diff --git a/...4 - BlazorTests/Shared/SurveyPrompt.razor → ...4 - BlazorTests/Shared/SurveyPrompt.razor b/...4 - BlazorTests/Shared/SurveyPrompt.razor → ...4 - BlazorTests/Shared/SurveyPrompt.razor
diff --git a/samples/v2/4 - BlazorTests/Startup.cs → samples/4 - BlazorTests/Startup.cs b/samples/v2/4 - BlazorTests/Startup.cs → samples/4 - BlazorTests/Startup.cs
diff --git a/...Triggers/Counts/PublishCountAddedEvent.cs → ...Triggers/Counts/PublishCountAddedEvent.cs b/...Triggers/Counts/PublishCountAddedEvent.cs → ...Triggers/Counts/PublishCountAddedEvent.cs
diff --git a/...azorTests/Triggers/Counts/SetCreatedOn.cs → ...azorTests/Triggers/Counts/SetCreatedOn.cs b/...azorTests/Triggers/Counts/SetCreatedOn.cs → ...azorTests/Triggers/Counts/SetCreatedOn.cs
diff --git a/samples/v2/4 - BlazorTests/_Imports.razor → samples/4 - BlazorTests/_Imports.razor b/samples/v2/4 - BlazorTests/_Imports.razor → samples/4 - BlazorTests/_Imports.razor
diff --git a/... BlazorTests/appsettings.Development.json → ... BlazorTests/appsettings.Development.json b/... BlazorTests/appsettings.Development.json → ... BlazorTests/appsettings.Development.json
diff --git a/samples/v2/4 - BlazorTests/appsettings.json → samples/4 - BlazorTests/appsettings.json b/samples/v2/4 - BlazorTests/appsettings.json → samples/4 - BlazorTests/appsettings.json
diff --git a/...s/wwwroot/css/bootstrap/bootstrap.min.css → ...s/wwwroot/css/bootstrap/bootstrap.min.css b/...s/wwwroot/css/bootstrap/bootstrap.min.css → ...s/wwwroot/css/bootstrap/bootstrap.min.css
diff --git a/...wroot/css/bootstrap/bootstrap.min.css.map → ...wroot/css/bootstrap/bootstrap.min.css.map b/...wroot/css/bootstrap/bootstrap.min.css.map → ...wroot/css/bootstrap/bootstrap.min.css.map
diff --git a/...ests/wwwroot/css/open-iconic/FONT-LICENSE → ...ests/wwwroot/css/open-iconic/FONT-LICENSE b/...ests/wwwroot/css/open-iconic/FONT-LICENSE → ...ests/wwwroot/css/open-iconic/FONT-LICENSE
diff --git a/...ests/wwwroot/css/open-iconic/ICON-LICENSE → ...ests/wwwroot/css/open-iconic/ICON-LICENSE b/...ests/wwwroot/css/open-iconic/ICON-LICENSE → ...ests/wwwroot/css/open-iconic/ICON-LICENSE
diff --git a/...orTests/wwwroot/css/open-iconic/README.md → ...orTests/wwwroot/css/open-iconic/README.md b/...orTests/wwwroot/css/open-iconic/README.md → ...orTests/wwwroot/css/open-iconic/README.md
diff --git a/...ic/font/css/open-iconic-bootstrap.min.css → ...ic/font/css/open-iconic-bootstrap.min.css b/...ic/font/css/open-iconic-bootstrap.min.css → ...ic/font/css/open-iconic-bootstrap.min.css
diff --git a/...ss/open-iconic/font/fonts/open-iconic.eot → ...ss/open-iconic/font/fonts/open-iconic.eot b/...ss/open-iconic/font/fonts/open-iconic.eot → ...ss/open-iconic/font/fonts/open-iconic.eot
diff --git a/...ss/open-iconic/font/fonts/open-iconic.otf → ...ss/open-iconic/font/fonts/open-iconic.otf b/...ss/open-iconic/font/fonts/open-iconic.otf → ...ss/open-iconic/font/fonts/open-iconic.otf
diff --git a/...ss/open-iconic/font/fonts/open-iconic.svg → ...ss/open-iconic/font/fonts/open-iconic.svg b/...ss/open-iconic/font/fonts/open-iconic.svg → ...ss/open-iconic/font/fonts/open-iconic.svg
diff --git a/...ss/open-iconic/font/fonts/open-iconic.ttf → ...ss/open-iconic/font/fonts/open-iconic.ttf b/...ss/open-iconic/font/fonts/open-iconic.ttf → ...ss/open-iconic/font/fonts/open-iconic.ttf
diff --git a/...s/open-iconic/font/fonts/open-iconic.woff → ...s/open-iconic/font/fonts/open-iconic.woff b/...s/open-iconic/font/fonts/open-iconic.woff → ...s/open-iconic/font/fonts/open-iconic.woff
diff --git a/...s/v2/4 - BlazorTests/wwwroot/css/site.css → samples/4 - BlazorTests/wwwroot/css/site.css b/...s/v2/4 - BlazorTests/wwwroot/css/site.css → samples/4 - BlazorTests/wwwroot/css/site.css
diff --git a/...es/v2/4 - BlazorTests/wwwroot/favicon.ico → samples/4 - BlazorTests/wwwroot/favicon.ico b/...es/v2/4 - BlazorTests/wwwroot/favicon.ico → samples/4 - BlazorTests/wwwroot/favicon.ico
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <EFCorePackageVersion>6.0.0</EFCorePackageVersion>
+    <EFCoreTriggeredPackageVersion Condition=" '$(EFCoreTriggeredPackageVersion )'=='' ">3.0.0</EFCoreTriggeredPackageVersion>
+  </PropertyGroup>
+</Project>
diff --git a/samples/v1/1 - HelloWorld/1 - HelloWorld.csproj b/samples/v1/1 - HelloWorld/1 - HelloWorld.csproj
diff --git a/samples/v1/1 - HelloWorld/ApplicationContext.cs b/samples/v1/1 - HelloWorld/ApplicationContext.cs
diff --git a/samples/v1/1 - HelloWorld/Program.cs b/samples/v1/1 - HelloWorld/Program.cs
diff --git a/samples/v1/Directory.Build.props b/samples/v1/Directory.Build.props
diff --git a/samples/v2/1 - HelloWorld/README.MD b/samples/v2/1 - HelloWorld/README.MD
diff --git a/samples/v2/1 - HelloWorld/Triggers/StudentAssignRegistrationDate.cs b/samples/v2/1 - HelloWorld/Triggers/StudentAssignRegistrationDate.cs
diff --git a/samples/v2/Directory.Build.props b/samples/v2/Directory.Build.props
diff --git a/src/EntityFrameworkCore.Triggered.AspNetCore/EntityFrameworkCore.Triggered.AspNetCore.csproj b/src/EntityFrameworkCore.Triggered.AspNetCore/EntityFrameworkCore.Triggered.AspNetCore.csproj
diff --git a/src/EntityFrameworkCore.Triggered.AspNetCore/Extensions/ServiceCollectionExtensions.cs b/src/EntityFrameworkCore.Triggered.AspNetCore/Extensions/ServiceCollectionExtensions.cs
diff --git a/...yFrameworkCore.Triggered.AspNetCore/Extensions/TriggersContextOptionsBuilderExtensions.cs b/...yFrameworkCore.Triggered.AspNetCore/Extensions/TriggersContextOptionsBuilderExtensions.cs
diff --git a/src/EntityFrameworkCore.Triggered/Extensions/ServiceCollectionExtensions.cs b/src/EntityFrameworkCore.Triggered/Extensions/ServiceCollectionExtensions.cs
@@ -55,7 +55,6 @@ public static IServiceCollection AddTriggeredDbContextPool<TContext>(this IServi
             return serviceCollection;
         }
 
-#if EFCORETRIGGERED2 || EFCORETRIGGERED3
         public static IServiceCollection AddTriggeredDbContextFactory<TContext>(this IServiceCollection serviceCollection, Action<DbContextOptionsBuilder>? optionsAction = null, ServiceLifetime lifetime = ServiceLifetime.Singleton)
             where TContext : DbContext
         {
@@ -127,7 +126,6 @@ public static IServiceCollection AddTriggeredPooledDbContextFactory<TContext>(th
 
             var serviceDescriptor = serviceCollection.FirstOrDefault(x => x.ServiceType == typeof(IDbContextFactory<TContext>));
 
-#if EFCORETRIGGERED2
             if (serviceDescriptor?.ImplementationType != null)
             {
                 var triggeredFactoryType = typeof(TriggeredDbContextFactory<,>).MakeGenericType(typeof(TContext), serviceDescriptor.ImplementationType);
@@ -144,7 +142,7 @@ public static IServiceCollection AddTriggeredPooledDbContextFactory<TContext>(th
                     lifetime: ServiceLifetime.Scoped
                 ));
             }
-#elif EFCORETRIGGERED3
+            
             if (serviceDescriptor?.ImplementationFactory != null)
             {
                 var triggeredFactoryType = typeof(TriggeredDbContextFactory<>).MakeGenericType(typeof(TContext));
@@ -155,9 +153,7 @@ public static IServiceCollection AddTriggeredPooledDbContextFactory<TContext>(th
                     lifetime: ServiceLifetime.Scoped
                 ));
             }
-#endif
             return serviceCollection;
         }
-#endif
     }
 }
diff --git a/src/EntityFrameworkCore.Triggered/Infrastructure/Internal/TriggersOptionExtension.cs b/src/EntityFrameworkCore.Triggered/Infrastructure/Internal/TriggersOptionExtension.cs
@@ -50,7 +50,6 @@ public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)
                 debugInfo["Triggers:CascadeBehavior"] = Extension._cascadeBehavior.ToString();
             }
 
-#if EFCORETRIGGERED3
             public override int GetServiceProviderHashCode()
             {
                 var hashCode = new HashCode();
@@ -89,40 +88,6 @@ public override bool ShouldUseSameServiceProvider(DbContextOptionsExtensionInfo
                     && Extension._maxCascadeCycles == otherInfo.Extension._maxCascadeCycles
                     && Extension._cascadeBehavior == otherInfo.Extension._cascadeBehavior
                     && Extension._serviceProviderTransform == otherInfo.Extension._serviceProviderTransform;
-#else
-            public override long GetServiceProviderHashCode()
-            {
-                var hashCode = nameof(TriggersOptionExtension).GetHashCode();
-
-                var extension = (TriggersOptionExtension)Extension;
-
-                if (extension._triggers != null)
-                {
-                    foreach (var trigger in extension._triggers)
-                    {
-                        hashCode ^= trigger.GetHashCode();
-                    }
-                }
-
-                if (extension._triggerTypes != null)
-                {
-                    foreach (var triggerType in extension._triggerTypes)
-                    {
-                        hashCode ^= triggerType.GetHashCode();
-                    }
-                }
-
-                hashCode ^= extension._maxCascadeCycles.GetHashCode();
-                hashCode ^= extension._cascadeBehavior.GetHashCode();
-
-                if (extension._serviceProviderTransform != null)
-                {
-                    hashCode ^= extension._serviceProviderTransform.GetHashCode();
-                }
-
-                return hashCode;
-            }
-#endif
         }
 
         private ExtensionInfo? _info;
@@ -185,10 +150,7 @@ public void ApplyServices(IServiceCollection services)
 
             services.AddScoped<TriggerFactory>();
 
-#if EFCORETRIGGERED2 || EFCORETRIGGERED3
             services.TryAddScoped<IInterceptor, TriggerSessionSaveChangesInterceptor>();
-#endif
-
 
             services.Configure<TriggerOptions>(triggerServiceOptions => {
                 triggerServiceOptions.MaxCascadeCycles = _maxCascadeCycles;