Merge pull request #39 from alexdresko/quick_fixes

Quick fixes
alexdresko · Mar 4, 2017 · eac5d99 · eac5d99
2 parents 983ee1f + 8330d09
commit eac5d99
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 35 deletions.
diff --git a/HSPI.sln b/HSPI.sln
@@ -6,6 +6,13 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HSPI", "HSPI\HSPI.csproj", "{5A16BE5F-4498-4AF1-9C59-3DB79662EBD7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C3AF5F1F-6760-4728-B04D-753404501E48}"
+	ProjectSection(SolutionItems) = preProject
+		copy-devtotemplate.ps1 = copy-devtotemplate.ps1
+		package-nuget.ps1 = package-nuget.ps1
+		package-template.ps1 = package-template.ps1
+		test-template.ps1 = test-template.ps1
+		update-vsixversion.ps1 = update-vsixversion.ps1
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{85A80E33-7B0C-4913-A709-F98A7F32829A}"
 EndProject

diff --git a/Templates/HSPIPluginB.Dev/HSPIPluginB.Dev.csproj b/Templates/HSPIPluginB.Dev/HSPIPluginB.Dev.csproj
@@ -24,7 +24,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>

diff --git a/Templates/HomeSeerTemplates/HomeSeerTemplates.csproj b/Templates/HomeSeerTemplates/HomeSeerTemplates.csproj
@@ -96,6 +96,9 @@
     <Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets'))" />
   </Target>
   <Import Project="..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" />
+  <PropertyGroup>
+    <PreBuildEvent>powershell -file $(SolutionDir)test-template.ps1</PreBuildEvent>
+  </PropertyGroup>
   <!-- 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.
   <Target Name="BeforeBuild">

diff --git a/Templates/HomeSeerTemplates/Packages/HSPI.1.0.0.nupkg b/Templates/HomeSeerTemplates/Packages/HSPI.1.0.0.nupkg
diff --git a/Templates/HomeSeerTemplates/source.extension.vsixmanifest b/Templates/HomeSeerTemplates/source.extension.vsixmanifest
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-    <Metadata>
-        <Identity Id="HomeSeerTemplates.Alex Dresko.82028f47-9623-4359-a6bf-244390c19608" Version="1.3" Language="en-US" Publisher="Alex Dresko" />
-        <DisplayName>HomeSeer Templates</DisplayName>
-        <Description xml:space="preserve">Visual Studio templates for HomeSeer development</Description>
-        <MoreInfo>https://github.com/alexdresko/HSPI</MoreInfo>
-        <Icon>HS-Button_400x400.png</Icon>
-        <PreviewImage>HS-Button_400x400.png</PreviewImage>
-        <Tags>homeseer home automation hspi</Tags>
-    </Metadata>
-    <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
-    </Installation>
-    <Dependencies>
-        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-        <!--<Dependency d:Source="Installed" Id="NuGet.0d421874-a3b2-4f67-b53a-ecfce878063b" DisplayName="NuGet Package Manager for Visual Studio 2015" Version="[3.5.0.1484,4.0)" />-->
-    </Dependencies>
-    <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.NuGet" Version="[15.0,16.0)" DisplayName="NuGet package manager" />
-        <Prerequisite Id="Microsoft.VisualStudio.Workload.ManagedDesktop" Version="[15.0,16.0)" DisplayName=".NET desktop development" />
-    </Prerequisites>
-    <Assets>
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="HSPIPluginA" d:TargetPath="|HSPIPluginA;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
-        <Asset Type="Homeseer.1.0.0.nupkg" d:Source="File" Path="Packages\Homeseer.1.0.0.nupkg" d:VsixSubPath="Packages" />
-        <Asset Type="HSPI.1.0.0.nupkg" d:Source="File" Path="Packages\HSPI.1.0.0.nupkg" d:VsixSubPath="Packages" />
-        <Asset Type="CommandLineParser.1.9.71.nupkg" d:Source="File" Path="Packages\CommandLineParser.1.9.71.nupkg" d:VsixSubPath="Packages" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="HSPIPluginB" d:TargetPath="|HSPIPluginB;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
-    </Assets>
-</PackageManifest>
+  <Metadata>
+    <Identity Id="HomeSeerTemplates.Alex Dresko.82028f47-9623-4359-a6bf-244390c19608" Version="1.3.3" Language="en-US" Publisher="Alex Dresko" />
+    <DisplayName>HomeSeer Templates</DisplayName>
+    <Description xml:space="preserve">Visual Studio templates for HomeSeer development</Description>
+    <MoreInfo>https://github.com/alexdresko/HSPI</MoreInfo>
+    <Icon>HS-Button_400x400.png</Icon>
+    <PreviewImage>HS-Button_400x400.png</PreviewImage>
+    <Tags>homeseer home automation hspi</Tags>
+  </Metadata>
+  <Installation>
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
+  </Installation>
+  <Dependencies>
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    <!--<Dependency d:Source="Installed" Id="NuGet.0d421874-a3b2-4f67-b53a-ecfce878063b" DisplayName="NuGet Package Manager for Visual Studio 2015" Version="[3.5.0.1484,4.0)" />-->
+  </Dependencies>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.NuGet" Version="[15.0,16.0)" DisplayName="NuGet package manager" />
+    <Prerequisite Id="Microsoft.VisualStudio.Workload.ManagedDesktop" Version="[15.0,16.0)" DisplayName=".NET desktop development" />
+  </Prerequisites>
+  <Assets>
+    <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="HSPIPluginA" d:TargetPath="|HSPIPluginA;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+    <Asset Type="Homeseer.1.0.0.nupkg" d:Source="File" Path="Packages\Homeseer.1.0.0.nupkg" d:VsixSubPath="Packages" />
+    <Asset Type="HSPI.1.0.0.nupkg" d:Source="File" Path="Packages\HSPI.1.0.0.nupkg" d:VsixSubPath="Packages" />
+    <Asset Type="CommandLineParser.1.9.71.nupkg" d:Source="File" Path="Packages\CommandLineParser.1.9.71.nupkg" d:VsixSubPath="Packages" />
+    <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="HSPIPluginB" d:TargetPath="|HSPIPluginB;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+  </Assets>
+</PackageManifest>
diff --git a/prep-template.ps1 → copy-devtotemplate.ps1 b/prep-template.ps1 → copy-devtotemplate.ps1
@@ -1,8 +1,5 @@
 cd $PSScriptRoot
 
-nuget pack hspi -build -verbosity detailed
-copy .\HSPI.1.0.0.nupkg .\Templates\HomeSeerTemplates\Packages -Verbose
-
 gci templates\*.dev -Directory | foreach {
     $sourceDirectory = $_.FullName
     $destinationDirectory = $sourceDirectory.Replace(".Dev", "")

diff --git a/package-nuget.ps1 b/package-nuget.ps1
@@ -0,0 +1,2 @@
+nuget pack $PsScriptRoot\hspi -verbosity detailed
+copy $PsScriptRoot\HSPI.1.0.0.nupkg $PsScriptRoot\Templates\HomeSeerTemplates\Packages -Verbose
diff --git a/package-template.ps1 b/package-template.ps1
@@ -0,0 +1,9 @@
+.\copy-devtotemplate.ps1
+
+.\package-nuget.ps1
+
+.\update-vsixversion.ps1
+
+& 'C:\Program Files (x86)\MSBuild\14.0\bin\MSBuild.exe' /t:Build /p:Configuration=Release
+
+"Updated $file to $newVersion"
diff --git a/test-template.ps1 b/test-template.ps1
@@ -0,0 +1,3 @@
+. $PsScriptRoot\copy-devtotemplate.ps1
+
+. $PsScriptRoot\package-nuget.ps1
diff --git a/update-vsixversion.ps1 b/update-vsixversion.ps1
@@ -0,0 +1,10 @@
+$file = "$PSScriptRoot\Templates\HomeSeerTemplates\source.extension.vsixmanifest"
+
+[xml]$xml = get-content -Path $file
+$version = [System.Version]::Parse($xml.PackageManifest.Metadata.Identity.Version)
+
+$newVersion = "$($version.Major).$($version.Minor).$($version.Build + 1)"
+
+$xml.PackageManifest.Metadata.Identity.Version = $newVersion
+
+$xml.Save($file)