fix build

dpvreony · Aug 22, 2023 · 9058f03 · 9058f03
1 parent 8acf09b
commit 9058f03
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 51 deletions.
diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -60,12 +60,14 @@
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />	
   </ItemGroup>
 
-  <ItemGroup Condition="$(IsWasmProject) != 'true'">
-    <PackageReference Include="Dhgms.QualityAssurancePack" Version="2.3.117" PrivateAssets="All" />
+  <!--
+  <ItemGroup Condition="$(IsWasmProject) != ''">
+    <PackageReference Include="Dhgms.QualityAssurancePack" Version="2.3.117" PrivateAssets="All" DevelopmentDependency="true" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
   </ItemGroup>
+  -->
 
   <ItemGroup>
     <None Include="..\..\readme.md" Pack="true" PackagePath="\"/>

diff --git a/src/Vetuviem.SourceGenerator/Features/Core/ReportDiagnosticIds.cs b/src/Vetuviem.SourceGenerator/Features/Core/ReportDiagnosticIds.cs
@@ -12,76 +12,76 @@ public static class ReportDiagnosticIds
         /// <summary>
         /// Diagnostic ID for when the source generator is being started.
         /// </summary>
-        public const string StartingSourceGenerator = "VET-001";
+        public const string StartingSourceGenerator = "VET001";
 
         /// <summary>
         /// Diagnostic ID for when there in a mismatch in the search for the references of interest.
         /// </summary>
-        public const string ReferencesOfInterestCountMismatch = "VET-002";
+        public const string ReferencesOfInterestCountMismatch = "VET002";
 
         /// <summary>
         /// Diagnostic ID for when a Base UI element for a framework has been matched.
         /// </summary>
-        public const string MatchedBaseUiElement = "VET-003";
+        public const string MatchedBaseUiElement = "VET003";
 
         /// <summary>
         /// Diagnostic ID for when an internal unhandled exception has occurred.
         /// </summary>
-        public const string UnhandledException = "VET-004";
+        public const string UnhandledException = "VET004";
 
         /// <summary>
         /// Diagnostic ID for when a type has a desired base type.
         /// </summary>
-        public const string HasDesiredBaseType = "VET-005";
+        public const string HasDesiredBaseType = "VET005";
 
         /// <summary>
         /// Diagnostic ID for when the scan of a namespace is starting.
         /// </summary>
-        public const string StartingScanOfNamespace = "VET-006";
+        public const string StartingScanOfNamespace = "VET006";
 
         /// <summary>
         /// Diagnostic ID for when a metadata reference is not an assembly symbol.
         /// </summary>
-        public const string MetadataReferenceNotAssemblySymbol = "VET-007";
+        public const string MetadataReferenceNotAssemblySymbol = "VET007";
 
         /// <summary>
         /// Diagnostic ID for when the scan of an assembly is started.
         /// </summary>
-        public const string StartingScanOfAssembly = "VET-008";
+        public const string StartingScanOfAssembly = "VET008";
 
         /// <summary>
         /// Diagnostic ID for when there is no assembly or module symbol.
         /// </summary>
-        public const string NoAssemblyOrModuleSybmol = "VET-009";
+        public const string NoAssemblyOrModuleSybmol = "VET009";
 
         /// <summary>
         /// Diagnostic ID for when there is no global namespace in an assembly or module.
         /// </summary>
-        public const string NoGlobalNamespaceInAssemblyOrModule = "VET-010";
+        public const string NoGlobalNamespaceInAssemblyOrModule = "VET010";
 
         /// <summary>
         /// Diagnostic ID for when the desired base type symbol is not an interface or class.
         /// </summary>
-        public const string DesiredBaseTypeSymbolNotInterfaceOrClass = "VET-011";
+        public const string DesiredBaseTypeSymbolNotInterfaceOrClass = "VET011";
 
         /// <summary>
         /// Diagnostic ID for when the scan of a type is starting.
         /// </summary>
-        public const string StartingCheckOfType = "VET-012";
+        public const string StartingCheckOfType = "VET012";
 
         /// <summary>
         /// Diagnostic ID for when the desired base type symbol has not been found during a search of the framework.
         /// </summary>
-        public const string FailedToFindDesiredBaseTypeSymbol = "VET-013";
+        public const string FailedToFindDesiredBaseTypeSymbol = "VET013";
 
         /// <summary>
         /// Diagnostic ID for when more than 1 result has been found during the desired base type search.
         /// </summary>
-        public const string DesiredBaseTypeSymbolSearchResultNotUnique = "VET-014";
+        public const string DesiredBaseTypeSymbolSearchResultNotUnique = "VET014";
 
         /// <summary>
         /// Diagnostic ID for when the desired base type symbol has not been found on a type.
         /// </summary>
-        public const string DesiredBaseTypeSymbolSearchNotNamedTypeSymbol = "VET-015";
+        public const string DesiredBaseTypeSymbolSearchNotNamedTypeSymbol = "VET015";
     }
 }
diff --git a/src/Vetuviem.SourceGenerator/Vetuviem.SourceGenerator.csproj b/src/Vetuviem.SourceGenerator/Vetuviem.SourceGenerator.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" PrivateAssets="none" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" PrivateAssets="none" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Vetuviem.Testing/Vetuviem.Testing.csproj b/src/Vetuviem.Testing/Vetuviem.Testing.csproj
@@ -8,8 +8,6 @@
 
   <ItemGroup>
     <PackageReference Include="Foundatio.Xunit" Version="10.6.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.6.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
     <PackageReference Include="Moq" Version="4.20.69" />
     <PackageReference Include="NetTestRegimentation" Version="1.7.2" />
     <PackageReference Include="xunit.assert" Version="2.5.0" />

diff --git a/src/Vetuviem.sln b/src/Vetuviem.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31129.286
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34009.444
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vetuviem.Benchmarks", "Vetuviem.Benchmarks\Vetuviem.Benchmarks.csproj", "{FE53BA05-B021-4E6D-AF66-7B7A4FF78A25}"
 EndProject
@@ -53,8 +53,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{106C
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{501219CE-ED6E-4F1F-B7EE-8BE7A6E954B0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.VetuviemSample.UwpApp", "ReactiveUI.VetuviemSample.UwpApp\ReactiveUI.VetuviemSample.UwpApp.csproj", "{76A7CF2A-0476-4AA0-BC64-97E140DF9394}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.VetuviemSample.BlazorApp", "ReactiveUI.VetuviemSample.BlazorApp\ReactiveUI.VetuviemSample.BlazorApp.csproj", "{31F2F4DE-696F-46C3-9DCF-46B34083AF98}"
 EndProject
 Global
@@ -511,32 +509,6 @@ Global
 		{D8E39D69-FD9A-4ACF-8743-048EF199884C}.Release|x64.Build.0 = Release|Any CPU
 		{D8E39D69-FD9A-4ACF-8743-048EF199884C}.Release|x86.ActiveCfg = Release|Any CPU
 		{D8E39D69-FD9A-4ACF-8743-048EF199884C}.Release|x86.Build.0 = Release|Any CPU
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|ARM.ActiveCfg = Debug|ARM
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|ARM.Build.0 = Debug|ARM
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|ARM.Deploy.0 = Debug|ARM
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|ARM64.Build.0 = Debug|ARM64
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|x64.ActiveCfg = Debug|x64
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|x64.Build.0 = Debug|x64
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|x64.Deploy.0 = Debug|x64
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|x86.ActiveCfg = Debug|x86
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|x86.Build.0 = Debug|x86
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Debug|x86.Deploy.0 = Debug|x86
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|Any CPU.ActiveCfg = Release|x86
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|ARM.ActiveCfg = Release|ARM
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|ARM.Build.0 = Release|ARM
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|ARM.Deploy.0 = Release|ARM
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|ARM64.ActiveCfg = Release|ARM64
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|ARM64.Build.0 = Release|ARM64
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|ARM64.Deploy.0 = Release|ARM64
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|x64.ActiveCfg = Release|x64
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|x64.Build.0 = Release|x64
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|x64.Deploy.0 = Release|x64
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|x86.ActiveCfg = Release|x86
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|x86.Build.0 = Release|x86
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394}.Release|x86.Deploy.0 = Release|x86
 		{31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -580,7 +552,6 @@ Global
 		{BBE4966F-761D-4E88-8AC0-D48DE02F3018} = {1B3AF279-0165-4820-947C-222B1AE379D9}
 		{3AA61E19-4EC3-4B5E-B7DB-3AB65F931F6C} = {1B3AF279-0165-4820-947C-222B1AE379D9}
 		{D8E39D69-FD9A-4ACF-8743-048EF199884C} = {106C1632-9789-48A3-B7D0-FE793EC46DB8}
-		{76A7CF2A-0476-4AA0-BC64-97E140DF9394} = {106C1632-9789-48A3-B7D0-FE793EC46DB8}
 		{31F2F4DE-696F-46C3-9DCF-46B34083AF98} = {106C1632-9789-48A3-B7D0-FE793EC46DB8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution