Cleaned up target framework reference

koenbeuk · koenbeuk · commit 1fbe52cd5d59 · 2024-02-11T17:42:50.000Z
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
 
   <PropertyGroup>
+	<TargetFramework>net6.0</TargetFramework>
 	<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	<LangVersion>9.0</LangVersion>
 	<Nullable>enable</Nullable>
diff --git a/EntityFrameworkCore.Triggered.sln b/EntityFrameworkCore.Triggered.sln
@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.0.31710.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EDFABD48-3C79-47AE-B84C-47CE2A52C20D}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0FAE4F6A-93BB-453C-8FB4-B24A9F30DA59}"
 EndProject
diff --git a/benchmarks/Directory.Build.props b/benchmarks/Directory.Build.props
diff --git a/benchmarks/EntityFrameworkCore.Triggered.Benchmarks/EntityFrameworkCore.Triggered.Benchmarks.csproj b/benchmarks/EntityFrameworkCore.Triggered.Benchmarks/EntityFrameworkCore.Triggered.Benchmarks.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
+	<Nullable>disable</Nullable>
   </PropertyGroup>
   <PropertyGroup>
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/samples/1 - HelloWorld/1 - HelloWorld.csproj b/samples/1 - HelloWorld/1 - HelloWorld.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>HelloWorld</RootNamespace>
     <Nullable>disable</Nullable>
   </PropertyGroup>
diff --git a/samples/2 - PrimarySchool/2 - PrimarySchool.csproj b/samples/2 - PrimarySchool/2 - PrimarySchool.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>PrimarySchool</RootNamespace>
     <Nullable>disable</Nullable>
   </PropertyGroup>
diff --git a/samples/3 - StudentManagerAspNetCore/3 - StudentManagerAspNetCore.csproj b/samples/3 - StudentManagerAspNetCore/3 - StudentManagerAspNetCore.csproj
@@ -1,7 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>StudentManager</RootNamespace>
     <Nullable>disable</Nullable>
   </PropertyGroup>
diff --git a/samples/4 - BlazorTests/4 - BlazorTests.csproj b/samples/4 - BlazorTests/4 - BlazorTests.csproj
@@ -1,7 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>BlazorTests</RootNamespace>
     <Nullable>disable</Nullable>
   </PropertyGroup>
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,21 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <DefineConstants>EFCORETRIGGERED3</DefineConstants>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition=" '$(EFCoreTriggeredVersion)' == '2' ">
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <DefineConstants>EFCORETRIGGERED2</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(EFCoreTriggeredVersion)' == '1' ">
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <DefineConstants>EFCORETRIGGERED1</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
diff --git a/test/EntityFrameworkCore.Triggered.Extensions.Tests/EntityFrameworkCore.Triggered.Extensions.Tests.csproj b/test/EntityFrameworkCore.Triggered.Extensions.Tests/EntityFrameworkCore.Triggered.Extensions.Tests.csproj
@@ -1,8 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <IsPackable>false</IsPackable>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 
diff --git a/test/EntityFrameworkCore.Triggered.IntegrationTests/EntityFrameworkCore.Triggered.IntegrationTests.csproj b/test/EntityFrameworkCore.Triggered.IntegrationTests/EntityFrameworkCore.Triggered.IntegrationTests.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <IsPackable>false</IsPackable>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 
diff --git a/test/EntityFrameworkCore.Triggered.Tests/EntityFrameworkCore.Triggered.Tests.csproj b/test/EntityFrameworkCore.Triggered.Tests/EntityFrameworkCore.Triggered.Tests.csproj
@@ -1,8 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFramework>net6.0</TargetFramework>
-	<IsPackable>false</IsPackable>
 	<Nullable>disable</Nullable>
   </PropertyGroup>
 
diff --git a/test/EntityFrameworkCore.Triggered.Tests/Infrastructure/ServiceCollectionExtensionsTests.cs b/test/EntityFrameworkCore.Triggered.Tests/Infrastructure/ServiceCollectionExtensionsTests.cs
@@ -164,7 +164,6 @@ public void AddTriggeredDbContextPool_SupportAContractType()
             Assert.Equal(context1, context1);
         }
 
-#if EFCORETRIGGERED2 || EFCORETRIGGERED3
         [Fact]
         public void AddTriggeredDbContextFactory_ReusesScopedServiceProvider()
         {
@@ -189,7 +188,7 @@ public void AddTriggeredDbContextFactory_ReusesScopedServiceProvider()
 
             var triggerStub = scope.ServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;
             Assert.NotNull(triggerStub);
-            Assert.Equal(1, triggerStub.BeforeSaveInvocations.Count);
+            Assert.Single(triggerStub.BeforeSaveInvocations);
         }
 
         [Fact]
@@ -217,7 +216,7 @@ public void AddTriggeredDbContextFactory_WithCustomFactory_ReusesScopedServicePr
 
             var triggerStub = scope.ServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;
             Assert.NotNull(triggerStub);
-            Assert.Equal(1, triggerStub.BeforeSaveInvocations.Count);
+            Assert.Single(triggerStub.BeforeSaveInvocations);
         }
 
         [Fact]
@@ -244,8 +243,7 @@ public void AddTriggeredPooledDbContextFactory_ReusesScopedServiceProvider()
 
             var triggerStub = scope.ServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;
             Assert.NotNull(triggerStub);
-            Assert.Equal(1, triggerStub.BeforeSaveInvocations.Count);
+            Assert.Single(triggerStub.BeforeSaveInvocations);
         }
-#endif
     }
 }
diff --git a/test/EntityFrameworkCore.Triggered.Transactions.Tests/EntityFrameworkCore.Triggered.Transactions.Tests.csproj b/test/EntityFrameworkCore.Triggered.Transactions.Tests/EntityFrameworkCore.Triggered.Transactions.Tests.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <IsPackable>false</IsPackable>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 
