Skip to content

Commit c73ed85

Browse files
LayoricLayoric
authored
Merge pull request #59 from ServiceStack/vs2022-cleanup
Cleanout templates and related custom wizard code.
2 parents 11c060e + abcaf5f commit c73ed85

File tree

830 files changed

+45
-162434
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

830 files changed

+45
-162434
lines changed

‎src/ServiceStackVS.TemplateTests/NpmTests.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎src/ServiceStackVS.TemplateTests/NuGetWizardTests.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/ServiceStackVS.TemplateTests/ProjectTemplateProjectFileTests.cs

Lines changed: 0 additions & 116 deletions
This file was deleted.

‎src/ServiceStackVS.TemplateTests/ServiceStackVS.Tests.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,13 @@
4747
<ItemGroup>
4848
<Compile Include="DocumentExtensionTests.cs" />
4949
<Compile Include="NativeTypeUrlTests.cs" />
50-
<Compile Include="NpmTests.cs" />
51-
<Compile Include="NuGetWizardTests.cs" />
52-
<Compile Include="ProjectTemplateProjectFileTests.cs" />
5350
<Compile Include="Properties\AssemblyInfo.cs" />
5451
</ItemGroup>
5552
<ItemGroup>
5653
<ProjectReference Include="..\ServiceStackVS.NativeTypes\ServiceStackVS.NativeTypes.csproj">
5754
<Project>{73f59cbf-dcf5-4c5a-83ab-0b7fd2576ac5}</Project>
5855
<Name>ServiceStackVS.NativeTypes</Name>
5956
</ProjectReference>
60-
<ProjectReference Include="..\ServiceStackVS.NPMInstallerWizard\ServiceStackVS.NPMInstallerWizard.csproj">
61-
<Project>{f15d55c1-633a-4344-84e5-ce9c95988507}</Project>
62-
<Name>ServiceStackVS.NPMInstallerWizard</Name>
63-
</ProjectReference>
6457
<ProjectReference Include="..\ServiceStackVS\ServiceStackVS.csproj">
6558
<Project>{05410bd6-c9bc-45da-b0aa-b73047bccf14}</Project>
6659
<Name>ServiceStackVS</Name>

‎src/ServiceStackVS.sln

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStackVS_IntegrationT
1515
EndProject
1616
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStackVS_UnitTests", "ServiceStackVS\VSServiceStack_UnitTests\ServiceStackVS_UnitTests.csproj", "{CBF2528D-A52E-48B6-AC52-F67A77424CED}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStackVS.NPMInstallerWizard", "ServiceStackVS.NPMInstallerWizard\ServiceStackVS.NPMInstallerWizard.csproj", "{F15D55C1-633A-4344-84E5-CE9C95988507}"
19-
EndProject
2018
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStackVS.NativeTypes", "ServiceStackVS.NativeTypes\ServiceStackVS.NativeTypes.csproj", "{73F59CBF-DCF5-4C5A-83AB-0B7FD2576AC5}"
2119
EndProject
2220
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStackVS.Tests", "ServiceStackVS.TemplateTests\ServiceStackVS.Tests.csproj", "{1933A6BA-3364-4F94-8015-1F029DCE9383}"
2321
EndProject
2422
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStackVS.NativeTypesWizard", "ServiceStackVS.NativeTypesWizard\ServiceStackVS.NativeTypesWizard.csproj", "{F5130CFD-C749-427E-A814-8115EEBDCA90}"
2523
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStackVS.BuildConfigWizard", "ServiceStackVS.BuildConfigWizard\ServiceStackVS.BuildConfigWizard.csproj", "{93DF1A6F-3981-42DF-8100-0692A3B0FF71}"
27-
EndProject
2824
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStackVS.Common", "ServiceStackVS.Common\ServiceStackVS.Common.csproj", "{05BF0855-569E-46D9-93BB-0A89E3866745}"
2925
EndProject
30-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStackVS.NuGetInstallerWizard", "ServiceStackVS.NuGetInstallerWizard\ServiceStackVS.NuGetInstallerWizard.csproj", "{7344DA1C-9297-49FD-BE37-568A3C4AB544}"
31-
EndProject
32-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStackVS.ExternalTemplateWizard", "ServiceStackVS.ExternalTemplateWizard\ServiceStackVS.ExternalTemplateWizard.csproj", "{E803E797-51CD-4ADE-87A3-27FBA70609C4}"
33-
EndProject
3426
Global
3527
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3628
Debug|Any CPU = Debug|Any CPU
@@ -47,10 +39,6 @@ Global
4739
{CBF2528D-A52E-48B6-AC52-F67A77424CED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4840
{CBF2528D-A52E-48B6-AC52-F67A77424CED}.Debug|Any CPU.Build.0 = Debug|Any CPU
4941
{CBF2528D-A52E-48B6-AC52-F67A77424CED}.Release|Any CPU.ActiveCfg = Release|Any CPU
50-
{F15D55C1-633A-4344-84E5-CE9C95988507}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51-
{F15D55C1-633A-4344-84E5-CE9C95988507}.Debug|Any CPU.Build.0 = Debug|Any CPU
52-
{F15D55C1-633A-4344-84E5-CE9C95988507}.Release|Any CPU.ActiveCfg = Release|Any CPU
53-
{F15D55C1-633A-4344-84E5-CE9C95988507}.Release|Any CPU.Build.0 = Release|Any CPU
5442
{73F59CBF-DCF5-4C5A-83AB-0B7FD2576AC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5543
{73F59CBF-DCF5-4C5A-83AB-0B7FD2576AC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
5644
{73F59CBF-DCF5-4C5A-83AB-0B7FD2576AC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -63,22 +51,10 @@ Global
6351
{F5130CFD-C749-427E-A814-8115EEBDCA90}.Debug|Any CPU.Build.0 = Debug|Any CPU
6452
{F5130CFD-C749-427E-A814-8115EEBDCA90}.Release|Any CPU.ActiveCfg = Release|Any CPU
6553
{F5130CFD-C749-427E-A814-8115EEBDCA90}.Release|Any CPU.Build.0 = Release|Any CPU
66-
{93DF1A6F-3981-42DF-8100-0692A3B0FF71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67-
{93DF1A6F-3981-42DF-8100-0692A3B0FF71}.Debug|Any CPU.Build.0 = Debug|Any CPU
68-
{93DF1A6F-3981-42DF-8100-0692A3B0FF71}.Release|Any CPU.ActiveCfg = Release|Any CPU
69-
{93DF1A6F-3981-42DF-8100-0692A3B0FF71}.Release|Any CPU.Build.0 = Release|Any CPU
7054
{05BF0855-569E-46D9-93BB-0A89E3866745}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7155
{05BF0855-569E-46D9-93BB-0A89E3866745}.Debug|Any CPU.Build.0 = Debug|Any CPU
7256
{05BF0855-569E-46D9-93BB-0A89E3866745}.Release|Any CPU.ActiveCfg = Release|Any CPU
7357
{05BF0855-569E-46D9-93BB-0A89E3866745}.Release|Any CPU.Build.0 = Release|Any CPU
74-
{7344DA1C-9297-49FD-BE37-568A3C4AB544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75-
{7344DA1C-9297-49FD-BE37-568A3C4AB544}.Debug|Any CPU.Build.0 = Debug|Any CPU
76-
{7344DA1C-9297-49FD-BE37-568A3C4AB544}.Release|Any CPU.ActiveCfg = Release|Any CPU
77-
{7344DA1C-9297-49FD-BE37-568A3C4AB544}.Release|Any CPU.Build.0 = Release|Any CPU
78-
{E803E797-51CD-4ADE-87A3-27FBA70609C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79-
{E803E797-51CD-4ADE-87A3-27FBA70609C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
80-
{E803E797-51CD-4ADE-87A3-27FBA70609C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
81-
{E803E797-51CD-4ADE-87A3-27FBA70609C4}.Release|Any CPU.Build.0 = Release|Any CPU
8258
EndGlobalSection
8359
GlobalSection(SolutionProperties) = preSolution
8460
HideSolutionNode = FALSE

‎src/ServiceStackVS/FileHandlers/DocumentSavedHandlers.cs

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@
66
using ServiceStack;
77
using ServiceStackVS.Common;
88
using ServiceStackVS.NativeTypes;
9-
using ServiceStackVS.NPMInstallerWizard;
109
using Task = System.Threading.Tasks.Task;
1110

1211
namespace ServiceStackVS.FileHandlers
1312
{
1413
public class DocumentSavedHandlers
1514
{
16-
private static bool _hasBowerInstalled;
17-
private static bool _hasNpmInstalled;
18-
1915
public static int MajorVisualStudioVersion
2016
{
2117
get { return int.Parse(Dte.Version.Substring(0, 2)); }
@@ -30,10 +26,6 @@ public static DTE Dte
3026
private static readonly Dictionary<Predicate<Document>, Action<Document, OutputWindowWriter>> FileWatchers =
3127
new Dictionary<Predicate<Document>, Action<Document, OutputWindowWriter>>
3228
{
33-
//NPM
34-
{NpmDocumentPredicate, NpmDocumentHandler},
35-
//Bower
36-
{BowerDocumentPredicate, BowerDocumentHandler},
3729
//CSharp DTO
3830
{CSharpDtoPredicate, (doc, writer) => HandleDtoUpdate(doc, NativeTypeHandlers.CSharpNativeTypesHandler, writer)},
3931
//FSharp DTO
@@ -42,57 +34,6 @@ public static DTE Dte
4234
{VbNetDtoPredicate, (doc, writer) => HandleDtoUpdate(doc, NativeTypeHandlers.VbNetNativeTypesHandler, writer)}
4335
};
4436

45-
private static bool NpmDocumentPredicate(Document document)
46-
{
47-
string path = document.GetProjectPath();
48-
return document.Name.EqualsIgnoreCase("package.json") && document.Path.EqualsIgnoreCase(path);
49-
}
50-
51-
private static void NpmDocumentHandler(Document document, OutputWindowWriter windowWriter)
52-
{
53-
if (document.IsNpmUpdateDisable() || MajorVisualStudioVersion == 14)
54-
{
55-
return;
56-
}
57-
58-
_hasNpmInstalled = _hasNpmInstalled
59-
? _hasNpmInstalled
60-
: NodePackageUtils.TryRegisterNpmFromDefaultLocation();
61-
62-
if (!_hasNpmInstalled)
63-
{
64-
windowWriter.Show();
65-
windowWriter.WriteLine("Node.js Installation not detected. Visit http://nodejs.org/ to download.");
66-
return;
67-
}
68-
document.TryRunNpmInstall(windowWriter);
69-
}
70-
71-
private static bool BowerDocumentPredicate(Document document)
72-
{
73-
string path = document.GetProjectPath();
74-
return document.Name.EqualsIgnoreCase("bower.json") && document.Path.EqualsIgnoreCase(path);
75-
}
76-
77-
private static void BowerDocumentHandler(Document document, OutputWindowWriter windowWriter)
78-
{
79-
if (document.IsBowerUpdateDisabled())
80-
{
81-
return;
82-
}
83-
84-
_hasBowerInstalled = _hasBowerInstalled ? _hasBowerInstalled : NodePackageUtils.HasBowerOnPath();
85-
86-
if (!_hasBowerInstalled)
87-
{
88-
windowWriter.Show();
89-
windowWriter.WriteLine(
90-
"Bower Installation not detected. Run npm install bower -g to install if Node.js/NPM already installed.");
91-
return;
92-
}
93-
document.TryBowerInstall(windowWriter);
94-
}
95-
9637
public static void HandleDocumentSaved(Document document, OutputWindowWriter windowWriter)
9738
{
9839
foreach (var filterWatcher in FileWatchers)

‎src/ServiceStackVS/ProjectTemplates/AppAngular/Host/AppHost.cs

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)