diff --git a/src/System.Waf/Samples/BookLibrary/BookLibrary.Library.Applications/BookLibrary.Library.Applications.csproj b/src/System.Waf/Samples/BookLibrary/BookLibrary.Library.Applications/BookLibrary.Library.Applications.csproj
index a90bda24..cb10001a 100644
--- a/src/System.Waf/Samples/BookLibrary/BookLibrary.Library.Applications/BookLibrary.Library.Applications.csproj
+++ b/src/System.Waf/Samples/BookLibrary/BookLibrary.Library.Applications/BookLibrary.Library.Applications.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.BookLibrary.Library.Applications</RootNamespace>
     <AssemblyName>Waf.BookLibrary.Library.Applications</AssemblyName>
     <UseWPF>true</UseWPF>
diff --git a/src/System.Waf/Samples/BookLibrary/BookLibrary.Library.Presentation/BookLibrary.Library.Presentation.csproj b/src/System.Waf/Samples/BookLibrary/BookLibrary.Library.Presentation/BookLibrary.Library.Presentation.csproj
index 7dd555b8..a8ae5400 100644
--- a/src/System.Waf/Samples/BookLibrary/BookLibrary.Library.Presentation/BookLibrary.Library.Presentation.csproj
+++ b/src/System.Waf/Samples/BookLibrary/BookLibrary.Library.Presentation/BookLibrary.Library.Presentation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.BookLibrary.Library.Presentation</RootNamespace>
     <AssemblyName>BookLibrary</AssemblyName>
     <UseWPF>true</UseWPF>
diff --git a/src/System.Waf/Samples/BookLibrary/BookLibrary.Reporting.Applications/BookLibrary.Reporting.Applications.csproj b/src/System.Waf/Samples/BookLibrary/BookLibrary.Reporting.Applications/BookLibrary.Reporting.Applications.csproj
index 75565d7e..2c33da37 100644
--- a/src/System.Waf/Samples/BookLibrary/BookLibrary.Reporting.Applications/BookLibrary.Reporting.Applications.csproj
+++ b/src/System.Waf/Samples/BookLibrary/BookLibrary.Reporting.Applications/BookLibrary.Reporting.Applications.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.BookLibrary.Reporting.Applications</RootNamespace>
     <AssemblyName>Waf.BookLibrary.Reporting.Applications</AssemblyName>
   </PropertyGroup>
diff --git a/src/System.Waf/Samples/BookLibrary/BookLibrary.Reporting.Presentation/BookLibrary.Reporting.Presentation.csproj b/src/System.Waf/Samples/BookLibrary/BookLibrary.Reporting.Presentation/BookLibrary.Reporting.Presentation.csproj
index 6f2b1ace..99c70325 100644
--- a/src/System.Waf/Samples/BookLibrary/BookLibrary.Reporting.Presentation/BookLibrary.Reporting.Presentation.csproj
+++ b/src/System.Waf/Samples/BookLibrary/BookLibrary.Reporting.Presentation/BookLibrary.Reporting.Presentation.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.BookLibrary.Reporting.Presentation</RootNamespace>
     <AssemblyName>Waf.BookLibrary.Reporting.Presentation</AssemblyName>
     <UseWPF>true</UseWPF>
diff --git a/src/System.Waf/Samples/InformationManager/AddressBook.Modules.Applications/AddressBook.Modules.Applications.csproj b/src/System.Waf/Samples/InformationManager/AddressBook.Modules.Applications/AddressBook.Modules.Applications.csproj
index f3acbd9d..16097d61 100644
--- a/src/System.Waf/Samples/InformationManager/AddressBook.Modules.Applications/AddressBook.Modules.Applications.csproj
+++ b/src/System.Waf/Samples/InformationManager/AddressBook.Modules.Applications/AddressBook.Modules.Applications.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.InformationManager.AddressBook.Modules.Applications</RootNamespace>
     <AssemblyName>Waf.InformationManager.AddressBook.Modules.Applications</AssemblyName>
   </PropertyGroup>
diff --git a/src/System.Waf/Samples/InformationManager/AddressBook.Modules.Presentation/AddressBook.Modules.Presentation.csproj b/src/System.Waf/Samples/InformationManager/AddressBook.Modules.Presentation/AddressBook.Modules.Presentation.csproj
index 3dd88c43..02ad298f 100644
--- a/src/System.Waf/Samples/InformationManager/AddressBook.Modules.Presentation/AddressBook.Modules.Presentation.csproj
+++ b/src/System.Waf/Samples/InformationManager/AddressBook.Modules.Presentation/AddressBook.Modules.Presentation.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.InformationManager.AddressBook.Modules.Presentation</RootNamespace>
     <AssemblyName>Waf.InformationManager.AddressBook.Modules.Presentation</AssemblyName>
     <UseWPF>true</UseWPF>
diff --git a/src/System.Waf/Samples/InformationManager/Assembler/Assembler.csproj b/src/System.Waf/Samples/InformationManager/Assembler/Assembler.csproj
index 0457e4b4..025a77b6 100644
--- a/src/System.Waf/Samples/InformationManager/Assembler/Assembler.csproj
+++ b/src/System.Waf/Samples/InformationManager/Assembler/Assembler.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.InformationManager.Assembler</RootNamespace>
     <AssemblyName>InformationManager</AssemblyName>
     <UseWPF>true</UseWPF>
diff --git a/src/System.Waf/Samples/InformationManager/Common.Applications/Common.Applications.csproj b/src/System.Waf/Samples/InformationManager/Common.Applications/Common.Applications.csproj
index cf4e771a..8f100224 100644
--- a/src/System.Waf/Samples/InformationManager/Common.Applications/Common.Applications.csproj
+++ b/src/System.Waf/Samples/InformationManager/Common.Applications/Common.Applications.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.InformationManager.Common.Applications</RootNamespace>
     <AssemblyName>Waf.InformationManager.Common.Applications</AssemblyName>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/System.Waf/Samples/InformationManager/Common.Presentation/Common.Presentation.csproj b/src/System.Waf/Samples/InformationManager/Common.Presentation/Common.Presentation.csproj
index 45d117e7..b9b2126f 100644
--- a/src/System.Waf/Samples/InformationManager/Common.Presentation/Common.Presentation.csproj
+++ b/src/System.Waf/Samples/InformationManager/Common.Presentation/Common.Presentation.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.InformationManager.Common.Presentation</RootNamespace>
     <AssemblyName>Waf.InformationManager.Common.Presentation</AssemblyName>
     <UseWPF>true</UseWPF>
diff --git a/src/System.Waf/Samples/InformationManager/EmailClient.Modules.Applications/EmailClient.Modules.Applications.csproj b/src/System.Waf/Samples/InformationManager/EmailClient.Modules.Applications/EmailClient.Modules.Applications.csproj
index b8236195..7bd804a4 100644
--- a/src/System.Waf/Samples/InformationManager/EmailClient.Modules.Applications/EmailClient.Modules.Applications.csproj
+++ b/src/System.Waf/Samples/InformationManager/EmailClient.Modules.Applications/EmailClient.Modules.Applications.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.InformationManager.EmailClient.Modules.Applications</RootNamespace>
     <AssemblyName>Waf.InformationManager.EmailClient.Modules.Applications</AssemblyName>
   </PropertyGroup>
diff --git a/src/System.Waf/Samples/InformationManager/EmailClient.Modules.Presentation/EmailClient.Modules.Presentation.csproj b/src/System.Waf/Samples/InformationManager/EmailClient.Modules.Presentation/EmailClient.Modules.Presentation.csproj
index f09263f9..92e8ca65 100644
--- a/src/System.Waf/Samples/InformationManager/EmailClient.Modules.Presentation/EmailClient.Modules.Presentation.csproj
+++ b/src/System.Waf/Samples/InformationManager/EmailClient.Modules.Presentation/EmailClient.Modules.Presentation.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.InformationManager.EmailClient.Modules.Presentation</RootNamespace>
     <AssemblyName>Waf.InformationManager.EmailClient.Modules.Presentation</AssemblyName>
     <UseWPF>true</UseWPF>
diff --git a/src/System.Waf/Samples/InformationManager/Infrastructure.Modules.Applications/Infrastructure.Modules.Applications.csproj b/src/System.Waf/Samples/InformationManager/Infrastructure.Modules.Applications/Infrastructure.Modules.Applications.csproj
index 5402bd11..1359b91a 100644
--- a/src/System.Waf/Samples/InformationManager/Infrastructure.Modules.Applications/Infrastructure.Modules.Applications.csproj
+++ b/src/System.Waf/Samples/InformationManager/Infrastructure.Modules.Applications/Infrastructure.Modules.Applications.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.InformationManager.Infrastructure.Modules.Applications</RootNamespace>
     <AssemblyName>Waf.InformationManager.Infrastructure.Modules.Applications</AssemblyName>
   </PropertyGroup>
diff --git a/src/System.Waf/Samples/InformationManager/Infrastructure.Modules.Presentation/Infrastructure.Modules.Presentation.csproj b/src/System.Waf/Samples/InformationManager/Infrastructure.Modules.Presentation/Infrastructure.Modules.Presentation.csproj
index b441e145..506c7552 100644
--- a/src/System.Waf/Samples/InformationManager/Infrastructure.Modules.Presentation/Infrastructure.Modules.Presentation.csproj
+++ b/src/System.Waf/Samples/InformationManager/Infrastructure.Modules.Presentation/Infrastructure.Modules.Presentation.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.InformationManager.Infrastructure.Modules.Presentation</RootNamespace>
     <AssemblyName>Waf.InformationManager.Infrastructure.Modules.Presentation</AssemblyName>
     <UseWPF>true</UseWPF>
diff --git a/src/System.Waf/Samples/Localization/LocalizationSample/LocalizationSample.csproj b/src/System.Waf/Samples/Localization/LocalizationSample/LocalizationSample.csproj
index e2b95a28..acd7d796 100644
--- a/src/System.Waf/Samples/Localization/LocalizationSample/LocalizationSample.csproj
+++ b/src/System.Waf/Samples/Localization/LocalizationSample/LocalizationSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <Product>Waf Localization Sample</Product>
   </PropertyGroup>
diff --git a/src/System.Waf/Samples/Writer/Writer.Applications/Writer.Applications.csproj b/src/System.Waf/Samples/Writer/Writer.Applications/Writer.Applications.csproj
index c4760209..d9b42627 100644
--- a/src/System.Waf/Samples/Writer/Writer.Applications/Writer.Applications.csproj
+++ b/src/System.Waf/Samples/Writer/Writer.Applications/Writer.Applications.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.Writer.Applications</RootNamespace>
     <AssemblyName>Waf.Writer.Applications</AssemblyName>
   </PropertyGroup>
diff --git a/src/System.Waf/Samples/Writer/Writer.Presentation/Writer.Presentation.csproj b/src/System.Waf/Samples/Writer/Writer.Presentation/Writer.Presentation.csproj
index 6f15383c..64728858 100644
--- a/src/System.Waf/Samples/Writer/Writer.Presentation/Writer.Presentation.csproj
+++ b/src/System.Waf/Samples/Writer/Writer.Presentation/Writer.Presentation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <RootNamespace>Waf.Writer.Presentation</RootNamespace>
     <AssemblyName>Writer</AssemblyName>
     <UseWPF>true</UseWPF>