diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/ci.yml
similarity index 93%
rename from .github/workflows/dotnet-core.yml
rename to .github/workflows/ci.yml
index 241315a7..e167f5b6 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/ci.yml
@@ -20,6 +20,15 @@ jobs:
solutionpath: src\Vetuviem.sln
unittestprojectpath: src\Vetuviem.UnitTests\Vetuviem.UnitTests.csproj
steps:
+ - name: Get Latest Visual Studio Version
+ shell: bash
+ run: |
+ dotnet tool update -g dotnet-vs
+ vs where release
+ vs update release Enterprise
+ vs modify release Enterprise +mobile +desktop +uwp +web
+ vs where release
+
- name: Checkout code
uses: actions/checkout@v3
with:
@@ -40,6 +49,12 @@ jobs:
with:
dotnet-version: 7.0.x
+ - name: Install DotNet workloads
+ shell: bash
+ run: |
+ dotnet workload install android ios tvos macos maui wasm-tools
+ dotnet workload list
+
- name: Install Windows SDK 10.0.16299
shell: pwsh
run: |
diff --git a/src/Directory.build.props b/src/Directory.build.props
index 0e7286c7..1fa871d1 100644
--- a/src/Directory.build.props
+++ b/src/Directory.build.props
@@ -60,12 +60,14 @@
-
-
+
diff --git a/src/ReactiveUI.Blazor.VetuviemGenerator/ReactiveUI.Blazor.VetuviemGenerator.csproj b/src/ReactiveUI.Blazor.VetuviemGenerator/ReactiveUI.Blazor.VetuviemGenerator.csproj
index b8d0c8f4..8096e290 100644
--- a/src/ReactiveUI.Blazor.VetuviemGenerator/ReactiveUI.Blazor.VetuviemGenerator.csproj
+++ b/src/ReactiveUI.Blazor.VetuviemGenerator/ReactiveUI.Blazor.VetuviemGenerator.csproj
@@ -7,6 +7,7 @@
True
true
False
+ true
diff --git a/src/ReactiveUI.Maui.VetuviemGenerator/ReactiveUI.Maui.VetuviemGenerator.csproj b/src/ReactiveUI.Maui.VetuviemGenerator/ReactiveUI.Maui.VetuviemGenerator.csproj
index b8d0c8f4..8096e290 100644
--- a/src/ReactiveUI.Maui.VetuviemGenerator/ReactiveUI.Maui.VetuviemGenerator.csproj
+++ b/src/ReactiveUI.Maui.VetuviemGenerator/ReactiveUI.Maui.VetuviemGenerator.csproj
@@ -7,6 +7,7 @@
True
true
False
+ true
diff --git a/src/ReactiveUI.UWP.VetuviemGenerator/ReactiveUI.UWP.VetuviemGenerator.csproj b/src/ReactiveUI.UWP.VetuviemGenerator/ReactiveUI.UWP.VetuviemGenerator.csproj
index 928991c0..ec72d451 100644
--- a/src/ReactiveUI.UWP.VetuviemGenerator/ReactiveUI.UWP.VetuviemGenerator.csproj
+++ b/src/ReactiveUI.UWP.VetuviemGenerator/ReactiveUI.UWP.VetuviemGenerator.csproj
@@ -7,6 +7,7 @@
True
true
False
+ true
diff --git a/src/ReactiveUI.WPF.VetuViemGenerator/ReactiveUI.WPF.VetuViemGenerator.csproj b/src/ReactiveUI.WPF.VetuViemGenerator/ReactiveUI.WPF.VetuViemGenerator.csproj
index 47cba583..cf33f884 100644
--- a/src/ReactiveUI.WPF.VetuViemGenerator/ReactiveUI.WPF.VetuViemGenerator.csproj
+++ b/src/ReactiveUI.WPF.VetuViemGenerator/ReactiveUI.WPF.VetuViemGenerator.csproj
@@ -7,6 +7,7 @@
True
true
False
+ true
diff --git a/src/ReactiveUI.WinUI3.VetuviemGenerator/ReactiveUI.WinUI3.VetuviemGenerator.csproj b/src/ReactiveUI.WinUI3.VetuviemGenerator/ReactiveUI.WinUI3.VetuviemGenerator.csproj
index 6bd8c460..60b3bc46 100644
--- a/src/ReactiveUI.WinUI3.VetuviemGenerator/ReactiveUI.WinUI3.VetuviemGenerator.csproj
+++ b/src/ReactiveUI.WinUI3.VetuviemGenerator/ReactiveUI.WinUI3.VetuviemGenerator.csproj
@@ -7,6 +7,7 @@
True
true
False
+ true
diff --git a/src/ReactiveUI.Winforms.VetuviemGenerator/ReactiveUI.Winforms.VetuviemGenerator.csproj b/src/ReactiveUI.Winforms.VetuviemGenerator/ReactiveUI.Winforms.VetuviemGenerator.csproj
index b8d0c8f4..8096e290 100644
--- a/src/ReactiveUI.Winforms.VetuviemGenerator/ReactiveUI.Winforms.VetuviemGenerator.csproj
+++ b/src/ReactiveUI.Winforms.VetuviemGenerator/ReactiveUI.Winforms.VetuviemGenerator.csproj
@@ -7,6 +7,7 @@
True
true
False
+ true
diff --git a/src/ReactiveUI.XamForms.VetuViemGenerator/ReactiveUI.XamForms.VetuViemGenerator.csproj b/src/ReactiveUI.XamForms.VetuViemGenerator/ReactiveUI.XamForms.VetuViemGenerator.csproj
index 22a491c4..cf47ce95 100644
--- a/src/ReactiveUI.XamForms.VetuViemGenerator/ReactiveUI.XamForms.VetuViemGenerator.csproj
+++ b/src/ReactiveUI.XamForms.VetuViemGenerator/ReactiveUI.XamForms.VetuViemGenerator.csproj
@@ -6,6 +6,7 @@
True
true
False
+ true
diff --git a/src/Vetuviem.SourceGenerator/Features/Core/ReportDiagnosticIds.cs b/src/Vetuviem.SourceGenerator/Features/Core/ReportDiagnosticIds.cs
index efec5c29..92fa6c61 100644
--- a/src/Vetuviem.SourceGenerator/Features/Core/ReportDiagnosticIds.cs
+++ b/src/Vetuviem.SourceGenerator/Features/Core/ReportDiagnosticIds.cs
@@ -12,76 +12,76 @@ public static class ReportDiagnosticIds
///
/// Diagnostic ID for when the source generator is being started.
///
- public const string StartingSourceGenerator = "VET-001";
+ public const string StartingSourceGenerator = "VET001";
///
/// Diagnostic ID for when there in a mismatch in the search for the references of interest.
///
- public const string ReferencesOfInterestCountMismatch = "VET-002";
+ public const string ReferencesOfInterestCountMismatch = "VET002";
///
/// Diagnostic ID for when a Base UI element for a framework has been matched.
///
- public const string MatchedBaseUiElement = "VET-003";
+ public const string MatchedBaseUiElement = "VET003";
///
/// Diagnostic ID for when an internal unhandled exception has occurred.
///
- public const string UnhandledException = "VET-004";
+ public const string UnhandledException = "VET004";
///
/// Diagnostic ID for when a type has a desired base type.
///
- public const string HasDesiredBaseType = "VET-005";
+ public const string HasDesiredBaseType = "VET005";
///
/// Diagnostic ID for when the scan of a namespace is starting.
///
- public const string StartingScanOfNamespace = "VET-006";
+ public const string StartingScanOfNamespace = "VET006";
///
/// Diagnostic ID for when a metadata reference is not an assembly symbol.
///
- public const string MetadataReferenceNotAssemblySymbol = "VET-007";
+ public const string MetadataReferenceNotAssemblySymbol = "VET007";
///
/// Diagnostic ID for when the scan of an assembly is started.
///
- public const string StartingScanOfAssembly = "VET-008";
+ public const string StartingScanOfAssembly = "VET008";
///
/// Diagnostic ID for when there is no assembly or module symbol.
///
- public const string NoAssemblyOrModuleSybmol = "VET-009";
+ public const string NoAssemblyOrModuleSybmol = "VET009";
///
/// Diagnostic ID for when there is no global namespace in an assembly or module.
///
- public const string NoGlobalNamespaceInAssemblyOrModule = "VET-010";
+ public const string NoGlobalNamespaceInAssemblyOrModule = "VET010";
///
/// Diagnostic ID for when the desired base type symbol is not an interface or class.
///
- public const string DesiredBaseTypeSymbolNotInterfaceOrClass = "VET-011";
+ public const string DesiredBaseTypeSymbolNotInterfaceOrClass = "VET011";
///
/// Diagnostic ID for when the scan of a type is starting.
///
- public const string StartingCheckOfType = "VET-012";
+ public const string StartingCheckOfType = "VET012";
///
/// Diagnostic ID for when the desired base type symbol has not been found during a search of the framework.
///
- public const string FailedToFindDesiredBaseTypeSymbol = "VET-013";
+ public const string FailedToFindDesiredBaseTypeSymbol = "VET013";
///
/// Diagnostic ID for when more than 1 result has been found during the desired base type search.
///
- public const string DesiredBaseTypeSymbolSearchResultNotUnique = "VET-014";
+ public const string DesiredBaseTypeSymbolSearchResultNotUnique = "VET014";
///
/// Diagnostic ID for when the desired base type symbol has not been found on a type.
///
- 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
index b344bdf9..90d17bac 100644
--- a/src/Vetuviem.SourceGenerator/Vetuviem.SourceGenerator.csproj
+++ b/src/Vetuviem.SourceGenerator/Vetuviem.SourceGenerator.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/src/Vetuviem.Testing/Vetuviem.Testing.csproj b/src/Vetuviem.Testing/Vetuviem.Testing.csproj
index 44c2624c..37ec00e5 100644
--- a/src/Vetuviem.Testing/Vetuviem.Testing.csproj
+++ b/src/Vetuviem.Testing/Vetuviem.Testing.csproj
@@ -8,8 +8,6 @@
-
-
diff --git a/src/Vetuviem.sln b/src/Vetuviem.sln
index 87c36580..5141aeaa 100644
--- 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,10 +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
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -511,52 +507,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
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Debug|ARM.Build.0 = Debug|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Debug|ARM64.Build.0 = Debug|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Debug|x64.ActiveCfg = Debug|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Debug|x64.Build.0 = Debug|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Debug|x86.ActiveCfg = Debug|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Debug|x86.Build.0 = Debug|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Release|Any CPU.Build.0 = Release|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Release|ARM.ActiveCfg = Release|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Release|ARM.Build.0 = Release|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Release|ARM64.ActiveCfg = Release|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Release|ARM64.Build.0 = Release|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Release|x64.ActiveCfg = Release|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Release|x64.Build.0 = Release|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Release|x86.ActiveCfg = Release|Any CPU
- {31F2F4DE-696F-46C3-9DCF-46B34083AF98}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -580,8 +530,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
SolutionGuid = {3C43A2D4-5AAF-4846-936D-75F742D25A81}