diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index c4476af0..36551691 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
     <LangVersion>latest</LangVersion>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
-    <Version>1.8.0</Version>
+    <Version>1.9.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <DebugType>embedded</DebugType>
diff --git a/src/SetStartupProjects/Guard.cs b/src/SetStartupProjects/Guard.cs
index 364d9b2e..4604d07c 100644
--- a/src/SetStartupProjects/Guard.cs
+++ b/src/SetStartupProjects/Guard.cs
@@ -13,14 +13,6 @@ public static void AgainstNullAndEmpty(string value, string argumentName)
         }
     }
 
-    public static void AgainstNull(object value, string argumentName)
-    {
-        if (value == null)
-        {
-            throw new ArgumentNullException(argumentName);
-        }
-    }
-
     public static void AgainstNonExistingFile(string file, string argumentName)
     {
         if (!File.Exists(file))
diff --git a/src/SetStartupProjects/SetStartupProjects.csproj b/src/SetStartupProjects/SetStartupProjects.csproj
index 8059ff57..795553bd 100644
--- a/src/SetStartupProjects/SetStartupProjects.csproj
+++ b/src/SetStartupProjects/SetStartupProjects.csproj
@@ -10,11 +10,7 @@
   <ItemGroup>
     <PackageReference Include="ProjectDefaults" Version="1.0.58" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
-    <EmbeddedResource Include="Solution2012.suotemplate" />
-    <EmbeddedResource Include="Solution2013.suotemplate" />
-    <EmbeddedResource Include="Solution2015.suotemplate" />
-    <EmbeddedResource Include="Solution2017.suotemplate" />
-    <EmbeddedResource Include="Solution2019.suotemplate" />
+    <EmbeddedResource Include="*.suotemplate" />
     <PackageReference Condition="$(Configuration) == 'Release'" Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="OpenMcdf" Version="2.2.1.9" />
   </ItemGroup>
diff --git a/src/SetStartupProjects/Solution2022.suotemplate b/src/SetStartupProjects/Solution2022.suotemplate
new file mode 100644
index 00000000..6497891c
Binary files /dev/null and b/src/SetStartupProjects/Solution2022.suotemplate differ
diff --git a/src/SetStartupProjects/StartProjectSuoCreator.cs b/src/SetStartupProjects/StartProjectSuoCreator.cs
index a913b697..b51e4d4a 100644
--- a/src/SetStartupProjects/StartProjectSuoCreator.cs
+++ b/src/SetStartupProjects/StartProjectSuoCreator.cs
@@ -21,7 +21,6 @@ public class StartProjectSuoCreator
         public void CreateForSolutionFile(string solutionFilePath, List<string> startupProjectGuids, VisualStudioVersions visualStudioVersions = VisualStudioVersions.All)
         {
             Guard.AgainstNullAndEmpty(solutionFilePath, nameof(solutionFilePath));
-            Guard.AgainstNull(startupProjectGuids, nameof(startupProjectGuids));
             Guard.AgainstNonExistingFile(solutionFilePath, nameof(solutionFilePath));
             if (startupProjectGuids.Count == 0)
             {
diff --git a/src/SetStartupProjects/VisualStudioVersions.cs b/src/SetStartupProjects/VisualStudioVersions.cs
index 49c4eba9..ce594377 100644
--- a/src/SetStartupProjects/VisualStudioVersions.cs
+++ b/src/SetStartupProjects/VisualStudioVersions.cs
@@ -29,8 +29,12 @@ public enum VisualStudioVersions
         /// </summary>
         Vs2019 = 16,
         /// <summary>
-        /// Target suo creation for Visual Studio versions 2012, 2013, 2015 and 2017.
+        /// Target suo creation for Visual Studio 2022.
         /// </summary>
-        All = Vs2012 | Vs2013 | Vs2015 | Vs2017 | Vs2019,
+        Vs2022 = 32,
+        /// <summary>
+        /// Target suo creation for Visual Studio versions 2012, 2013, 2015, 2017, 2019, and 2022.
+        /// </summary>
+        All = Vs2012 | Vs2013 | Vs2015 | Vs2017 | Vs2019 | Vs2022,
     }
 }
\ No newline at end of file