diff --git a/src/Analyzers/Internal.AspNetCore.Analyzers/src/Internal.AspNetCore.Analyzers.csproj b/src/Analyzers/Internal.AspNetCore.Analyzers/src/Internal.AspNetCore.Analyzers.csproj
index 1814c4c69f..09a66966e0 100644
--- a/src/Analyzers/Internal.AspNetCore.Analyzers/src/Internal.AspNetCore.Analyzers.csproj
+++ b/src/Analyzers/Internal.AspNetCore.Analyzers/src/Internal.AspNetCore.Analyzers.csproj
@@ -7,6 +7,7 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <EnableApiCheck>false</EnableApiCheck>
     <BuildOutputTargetFolder>analyzers/dotnet/cs/</BuildOutputTargetFolder>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj
index 15259c0539..988ca150cb 100644
--- a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj
+++ b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj
@@ -7,6 +7,8 @@
     <EnableApiCheck>false</EnableApiCheck>
     <!-- This package is internal, so we don't generate a package baseline. Always build against the latest dependencies. -->
     <UseLatestPackageReferences>true</UseLatestPackageReferences>
+    <IsPackable>true</IsPackable>
+    <IsShipping>false</IsShipping>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/TestSource.cs b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/TestSource.cs
index f88f68d767..726204e059 100644
--- a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/TestSource.cs
+++ b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/TestSource.cs
@@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Analyzer.Testing
         public static TestSource Read(string rawSource)
         {
             var testInput = new TestSource();
-            var lines = rawSource.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+            var lines = rawSource.Split(new[] { "\n", "\r\n" }, StringSplitOptions.None);
             for (var i = 0; i < lines.Length; i++)
             {
                 var line = lines[i];