updated

AdaskoTheBeAsT · Mar 10, 2024 · 673de92 · 673de92
1 parent 2e7dd7c
commit 673de92
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 98 deletions.
diff --git a/Buildalyzer b/Buildalyzer
diff --git a/src/CodeModel/.vs/Typewriter.CodeModel.csproj.dtbcache.json b/src/CodeModel/.vs/Typewriter.CodeModel.csproj.dtbcache.json
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -9,28 +9,28 @@
 
   <ItemGroup>
     <!-- Add reference to analyzers to all projects  -->
-    <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="all" />
-    <PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="all" />
-    <PackageReference Include="codecracker.CSharp" Version="1.1.0" PrivateAssets="all" />
-    <PackageReference Include="ConcurrencyLab.ParallelChecker" Version="2.7.0" PrivateAssets="all" />
-    <PackageReference Include="IDisposableAnalyzers" Version="4.0.7" PrivateAssets="all" />
-    <!--<PackageReference Include="Meziantou.Analyzer" Version="2.0.121" PrivateAssets="all" />-->
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23525.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14" PrivateAssets="all" />
-    <PackageReference Include="Puma.Security.Rules.2022" Version="2.4.23" PrivateAssets="all" />
-    <PackageReference Include="Roslynator.Analyzers" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.9.0" PrivateAssets="all" />
-    <!--<PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="all" />-->
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.16.0.82469" PrivateAssets="all" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
+    <PackageReference Include="AdaskoTheBeAsT.AsyncFixer" Version="1.6.0.4" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="AdaskoTheBeAsT.Asyncify" Version="0.9.7.3" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="AdaskoTheBeAsT.CodeCracker.CSharp" Version="1.1.0.22" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="AdaskoTheBeAsT.ConcurrencyLab.ParallelChecker" Version="2.7.0.3" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="AdaskoTheBeAsT.IDisposableAnalyzers" Version="4.0.7.3" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="AdaskoTheBeAsT.Puma.Security.Rules.2022" Version="2.3.1.5" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="AdaskoTheBeAsT.SecurityCodeScan.VS2022" Version="5.6.7.19" PrivateAssets="all" ExcludeAssets="runtime" />
+    <!--<PackageReference Include="Meziantou.Analyzer" Version="2.0.141" PrivateAssets="all" ExcludeAssets="runtime" />-->
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.9.2" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24072.1" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.9.2" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.9.2" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28" PrivateAssets="all"  ExcludeAssets="runtime"/>
+	<!--<PackageReference Include="Roslynator.Analyzers" Version="4.11.0" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.11.0" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.11.0" PrivateAssets="all" ExcludeAssets="runtime" />-->
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.21.0.86780" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" ExcludeAssets="runtime" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ItemTemplates/.vs/Typewriter.ItemTemplates.csproj.dtbcache.json b/src/ItemTemplates/.vs/Typewriter.ItemTemplates.csproj.dtbcache.json
diff --git a/src/Roslyn/.vs/Typewriter.Metadata.Roslyn.csproj.dtbcache.json b/src/Roslyn/.vs/Typewriter.Metadata.Roslyn.csproj.dtbcache.json
diff --git a/src/Roslyn/RoslynFileMetadata.cs b/src/Roslyn/RoslynFileMetadata.cs
@@ -54,10 +54,12 @@ private void LoadDocument(Document document)
         private IEnumerable<INamedTypeSymbol> GetNamespaceChildNodes<T>()
             where T : SyntaxNode
         {
+#pragma warning disable RS1039 // This call to 'SemanticModel.GetDeclaredSymbol()' will always return 'null'
             var symbols = _root.ChildNodes().OfType<T>().Concat(
                 _root.ChildNodes().OfType<NamespaceDeclarationSyntax>().SelectMany(n => n.ChildNodes().OfType<T>())).Concat(
                     _root.ChildNodes().OfType<FileScopedNamespaceDeclarationSyntax>().SelectMany(n => n.ChildNodes().OfType<T>()))
                 .Select(c => _semanticModel.GetDeclaredSymbol(c) as INamedTypeSymbol);
+#pragma warning restore RS1039 // This call to 'SemanticModel.GetDeclaredSymbol()' will always return 'null'
 
             if (Settings.PartialRenderingMode == PartialRenderingMode.Combined)
             {

diff --git a/src/Roslyn/Typewriter.Metadata.Roslyn.csproj b/src/Roslyn/Typewriter.Metadata.Roslyn.csproj
@@ -77,31 +77,20 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
-      <Version>3.11.0-beta1.23525.2</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common">
-      <Version>4.8.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp">
-      <Version>4.8.0</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Debugger.Contracts">
       <Version>17.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.LanguageServices">
-      <Version>4.8.0</Version>
+      <Version>4.9.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK">
-      <Version>17.8.37222</Version>
+      <Version>17.9.37000</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="StreamJsonRpc">
-      <Version>2.17.8</Version>
+      <Version>2.17.11</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/Tests/.vs/Typewriter.Tests.csproj.dtbcache.json b/src/Tests/.vs/Typewriter.Tests.csproj.dtbcache.json
diff --git a/src/Tests/App.config b/src/Tests/App.config
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<runtime>
+		<assemblyBinding>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.CodeAnalysis"
+				                  publicKeyToken="32ab4ba45e0a69a1"
+				                  culture="neutral" />
+
+				<bindingRedirect oldVersion="0.0.0.0-4.8.0.0" newVersion="4.8.0.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>
diff --git a/src/Tests/Typewriter.Tests.csproj b/src/Tests/Typewriter.Tests.csproj
@@ -120,6 +120,9 @@
     <Compile Include="TestInfrastructure\RoslynMetadataProviderStub.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="App.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Render\RoutedApiController\BooksController.result" />
     <None Include="Render\RoutedApiController\BooksController.tstemplate" />
     <None Include="Render\WebApiControllerTests\SingleFile.result" />
@@ -162,27 +165,16 @@
       <Version>6.12.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Build">
-      <Version>17.8.3</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis">
-      <Version>4.8.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common">
-      <Version>4.8.0</Version>
+      <Version>17.9.5</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common">
-      <Version>4.8.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
-      <Version>3.11.0-beta1.23525.2</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild">
+      <Version>4.9.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Debugger.Contracts">
       <Version>17.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.LanguageServices">
-      <Version>4.8.0</Version>
+      <Version>4.9.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Sdk.TestFramework">
       <Version>17.6.16</Version>
@@ -191,7 +183,7 @@
       <Version>17.6.16</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Shell.Framework">
-      <Version>17.8.37221</Version>
+      <Version>17.9.37000</Version>
     </PackageReference>
     <PackageReference Include="NSubstitute">
       <Version>5.1.0</Version>
@@ -200,34 +192,33 @@
       <Version>1.1.20</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.Annotations">
-      <Version>6.0.0-preview.4.21253.7</Version>
+      <Version>5.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.Reflection.TypeExtensions">
       <Version>4.7.0</Version>
     </PackageReference>
     <PackageReference Include="xunit">
-      <Version>2.6.5</Version>
+      <Version>2.7.0</Version>
     </PackageReference>
     <PackageReference Include="xunit.core">
-      <Version>2.6.5</Version>
+      <Version>2.7.0</Version>
     </PackageReference>
     <PackageReference Include="xunit.runner.console">
-      <Version>2.6.5</Version>
+      <Version>2.7.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="xunit.runner.msbuild">
-      <Version>2.6.5</Version>
+      <Version>2.7.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="xunit.runner.visualstudio">
-      <Version>2.5.6</Version>
+      <Version>2.5.7</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/src/Tests/xunit.runner.json b/src/Tests/xunit.runner.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
-    "maxParallelThreads": 1,
-    "parallelizeAssembly": false,
-    "parallelizeTestCollections": false
+    "maxParallelThreads": -1,
+    "parallelizeAssembly": true,
+    "parallelizeTestCollections": true
 }
diff --git a/src/Typewriter/.vs/Typewriter.csproj.dtbcache.json b/src/Typewriter/.vs/Typewriter.csproj.dtbcache.json
diff --git a/src/Typewriter/Typewriter.csproj b/src/Typewriter/Typewriter.csproj
@@ -229,16 +229,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.8.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0" />
     <PackageReference Include="Microsoft.VisualStudio.Debugger.Contracts" Version="17.2.0" />
-    <PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="4.8.0" />
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.8.37222" ExcludeAssets="runtime">
+    <PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="4.9.2" />
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.9.37000" ExcludeAssets="runtime">
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.8.2365">
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.9.3168">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>