diff --git a/samples/core/CompiledQueries/CompiledQueries.csproj b/samples/core/CompiledQueries/CompiledQueries.csproj
index 5d0d319656..967b60a067 100644
--- a/samples/core/CompiledQueries/CompiledQueries.csproj
+++ b/samples/core/CompiledQueries/CompiledQueries.csproj
@@ -5,6 +5,6 @@
Samples
-
+
diff --git a/samples/core/Cosmos/Cosmos.csproj b/samples/core/Cosmos/Cosmos.csproj
index e77625b54a..b813ab7336 100644
--- a/samples/core/Cosmos/Cosmos.csproj
+++ b/samples/core/Cosmos/Cosmos.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/samples/core/DbContextPooling/DbContextPooling.csproj b/samples/core/DbContextPooling/DbContextPooling.csproj
index 5d0d319656..967b60a067 100644
--- a/samples/core/DbContextPooling/DbContextPooling.csproj
+++ b/samples/core/DbContextPooling/DbContextPooling.csproj
@@ -5,6 +5,6 @@
Samples
-
+
diff --git a/samples/core/DynamicModel/DynamicModel.csproj b/samples/core/DynamicModel/DynamicModel.csproj
index 036d5458a5..26b34a8850 100644
--- a/samples/core/DynamicModel/DynamicModel.csproj
+++ b/samples/core/DynamicModel/DynamicModel.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/samples/core/GetStarted/EFGetStarted.csproj b/samples/core/GetStarted/EFGetStarted.csproj
index b5a0eefdcf..e9feb3fdfb 100644
--- a/samples/core/GetStarted/EFGetStarted.csproj
+++ b/samples/core/GetStarted/EFGetStarted.csproj
@@ -7,8 +7,8 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/samples/core/KeylessEntityTypes/KeylessEntityTypes.csproj b/samples/core/KeylessEntityTypes/KeylessEntityTypes.csproj
index a62d3280f5..b36e656024 100644
--- a/samples/core/KeylessEntityTypes/KeylessEntityTypes.csproj
+++ b/samples/core/KeylessEntityTypes/KeylessEntityTypes.csproj
@@ -5,7 +5,7 @@
Samples
-
-
+
+
diff --git a/samples/core/Miscellaneous/ConnectionResiliency/ConnectionResiliency.csproj b/samples/core/Miscellaneous/ConnectionResiliency/ConnectionResiliency.csproj
index 513a3db28d..59c5227df1 100644
--- a/samples/core/Miscellaneous/ConnectionResiliency/ConnectionResiliency.csproj
+++ b/samples/core/Miscellaneous/ConnectionResiliency/ConnectionResiliency.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/samples/core/Miscellaneous/Logging/Logging/Logging.csproj b/samples/core/Miscellaneous/Logging/Logging/Logging.csproj
index ece5d85660..175d2f6f8f 100644
--- a/samples/core/Miscellaneous/Logging/Logging/Logging.csproj
+++ b/samples/core/Miscellaneous/Logging/Logging/Logging.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/core/Miscellaneous/Testing/BusinessLogic/BusinessLogic.csproj b/samples/core/Miscellaneous/Testing/BusinessLogic/BusinessLogic.csproj
index 649d8e4210..d12c7864a0 100644
--- a/samples/core/Miscellaneous/Testing/BusinessLogic/BusinessLogic.csproj
+++ b/samples/core/Miscellaneous/Testing/BusinessLogic/BusinessLogic.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/samples/core/Miscellaneous/Testing/TestProject/TestProject.csproj b/samples/core/Miscellaneous/Testing/TestProject/TestProject.csproj
index bc2bc717ad..904be981bd 100644
--- a/samples/core/Miscellaneous/Testing/TestProject/TestProject.csproj
+++ b/samples/core/Miscellaneous/Testing/TestProject/TestProject.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/samples/core/Modeling/Conventions/Conventions.csproj b/samples/core/Modeling/Conventions/Conventions.csproj
index d3cb97a1b5..f07b5ba22e 100644
--- a/samples/core/Modeling/Conventions/Conventions.csproj
+++ b/samples/core/Modeling/Conventions/Conventions.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/samples/core/Modeling/DataAnnotations/DataAnnotations.csproj b/samples/core/Modeling/DataAnnotations/DataAnnotations.csproj
index cb5909bcbc..c806c79a6d 100644
--- a/samples/core/Modeling/DataAnnotations/DataAnnotations.csproj
+++ b/samples/core/Modeling/DataAnnotations/DataAnnotations.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/samples/core/Modeling/DataSeeding/DataSeeding.csproj b/samples/core/Modeling/DataSeeding/DataSeeding.csproj
index 96efeaa9ae..776171be0e 100644
--- a/samples/core/Modeling/DataSeeding/DataSeeding.csproj
+++ b/samples/core/Modeling/DataSeeding/DataSeeding.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/core/Modeling/FluentAPI/FluentAPI.csproj b/samples/core/Modeling/FluentAPI/FluentAPI.csproj
index e6fec9e931..d50f5d0353 100644
--- a/samples/core/Modeling/FluentAPI/FluentAPI.csproj
+++ b/samples/core/Modeling/FluentAPI/FluentAPI.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/samples/core/Modeling/OwnedEntities/OwnedEntities.csproj b/samples/core/Modeling/OwnedEntities/OwnedEntities.csproj
index f2273bb532..d020c55673 100644
--- a/samples/core/Modeling/OwnedEntities/OwnedEntities.csproj
+++ b/samples/core/Modeling/OwnedEntities/OwnedEntities.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/core/Modeling/TableSplitting/TableSplitting.csproj b/samples/core/Modeling/TableSplitting/TableSplitting.csproj
index f14513e058..96b04c7000 100644
--- a/samples/core/Modeling/TableSplitting/TableSplitting.csproj
+++ b/samples/core/Modeling/TableSplitting/TableSplitting.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/core/QueryFilters/QueryFilters.csproj b/samples/core/QueryFilters/QueryFilters.csproj
index a62d3280f5..b36e656024 100644
--- a/samples/core/QueryFilters/QueryFilters.csproj
+++ b/samples/core/QueryFilters/QueryFilters.csproj
@@ -5,7 +5,7 @@
Samples
-
-
+
+
diff --git a/samples/core/Saving/Saving.csproj b/samples/core/Saving/Saving.csproj
index a3d8385f5a..cc892711ab 100644
--- a/samples/core/Saving/Saving.csproj
+++ b/samples/core/Saving/Saving.csproj
@@ -8,7 +8,7 @@
-
+