Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quick fixes #39

Merged
merged 4 commits into from
Mar 4, 2017
Merged

Quick fixes #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7c7a40
For template release v1.3.3
alexdresko Mar 4, 2017
c44f3a2
Better script separation
alexdresko Mar 4, 2017
2eca2b5
Adds test-template.ps1 helper
alexdresko Mar 4, 2017
8330d09
Building HomeSeerTemplates runs test-template.ps1
alexdresko Mar 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions HSPI.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Templates/HSPIPluginB.Dev/HSPIPluginB.Dev.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions Templates/HomeSeerTemplates/HomeSeerTemplates.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Binary file modified Templates/HomeSeerTemplates/Packages/HSPI.1.0.0.nupkg
View file
Open in desktop
Binary file not shown.
62 changes: 31 additions & 31 deletions Templates/HomeSeerTemplates/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 0 additions & 3 deletions prep-template.ps1 → copy-devtotemplate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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", "")
Expand Down
2 changes: 2 additions & 0 deletions package-nuget.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nuget pack $PsScriptRoot\hspi -verbosity detailed
copy $PsScriptRoot\HSPI.1.0.0.nupkg $PsScriptRoot\Templates\HomeSeerTemplates\Packages -Verbose
9 changes: 9 additions & 0 deletions package-template.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 3 additions & 0 deletions test-template.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
. $PsScriptRoot\copy-devtotemplate.ps1

. $PsScriptRoot\package-nuget.ps1
10 changes: 10 additions & 0 deletions update-vsixversion.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)