Skip to content

Commit

Permalink
Merge pull request #97 from alexdresko/fixes
Browse files Browse the repository at this point in the history
Fixes
  • Loading branch information
alexdresko committed Oct 28, 2018
2 parents fd29c53 + fbc6a50 commit ea26c42
Show file tree
Hide file tree
Showing 22 changed files with 136 additions and 23 deletions.
48 changes: 48 additions & 0 deletions .vscode/launch.json
@@ -0,0 +1,48 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "PowerShell",
"request": "launch",
"name": "PowerShell Launch Current File",
"script": "${file}",
"args": [],
"cwd": "${file}"
},
{
"type": "PowerShell",
"request": "launch",
"name": "PowerShell Launch Current File in Temporary Console",
"script": "${file}",
"args": [],
"cwd": "${file}",
"createTemporaryIntegratedConsole": true
},
{
"type": "PowerShell",
"request": "launch",
"name": "PowerShell Launch Current File w/Args Prompt",
"script": "${file}",
"args": [
"${command:SpecifyScriptArgs}"
],
"cwd": "${file}"
},
{
"type": "PowerShell",
"request": "attach",
"name": "PowerShell Attach to Host Process",
"processId": "${command:PickPSHostProcess}",
"runspaceId": 1
},
{
"type": "PowerShell",
"request": "launch",
"name": "PowerShell Interactive Session",
"cwd": ""
}
]
}
4 changes: 3 additions & 1 deletion .vscode/settings.json
Expand Up @@ -7,6 +7,8 @@
"restructuredtext.builtDocumentationPath": "${workspaceRoot}/docs/build/html",
"cSpell.words": [
"HSPI",
"repo"
"alexdresko",
"repo",
"thealexdresko"
]
}
1 change: 1 addition & 0 deletions HSPI.sln
Expand Up @@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Default.ruleset = Default.ruleset
package-nuget.ps1 = package-nuget.ps1
package-template.ps1 = package-template.ps1
publish-vsix.ps1 = publish-vsix.ps1
test-template.ps1 = test-template.ps1
update-vsixversion.ps1 = update-vsixversion.ps1
EndProjectSection
Expand Down
3 changes: 2 additions & 1 deletion HSPI.sln.DotSettings
Expand Up @@ -107,4 +107,5 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Postback/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=projectname/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=safeprojectname/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Szolkowski/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Szolkowski/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=thealexdresko/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
4 changes: 2 additions & 2 deletions Templates/HSPIPluginA.Dev/App.config
Expand Up @@ -6,8 +6,8 @@
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- TODO: <probing privatePath="bin\$safeprojectname$" /> -->
<probing privatePath="bin\PluginA.Dev" />
<!-- TODO: <probing privatePath="bin/$safeprojectname$" /> -->
<probing privatePath="bin/PluginA.Dev" />
</assemblyBinding>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion Templates/HSPIPluginA/App.config
Expand Up @@ -6,6 +6,6 @@
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="bin\$safeprojectname$" /> </assemblyBinding>
<probing privatePath="bin/$safeprojectname$" /> </assemblyBinding>
</runtime>
</configuration>
4 changes: 2 additions & 2 deletions Templates/HSPIPluginB.Dev/App.config
Expand Up @@ -6,8 +6,8 @@
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- TODO: <probing privatePath="bin\$safeprojectname$" /> -->
<probing privatePath="bin\PluginB.Dev" />
<!-- TODO: <probing privatePath="bin/$safeprojectname$" /> -->
<probing privatePath="bin/PluginB.Dev" />
</assemblyBinding>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion Templates/HSPIPluginB/App.config
Expand Up @@ -6,6 +6,6 @@
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="bin\$safeprojectname$" /> </assemblyBinding>
<probing privatePath="bin/$safeprojectname$" /> </assemblyBinding>
</runtime>
</configuration>
7 changes: 7 additions & 0 deletions Templates/HomeSeerTemplates/HomeSeerTemplates.csproj
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.props')" />
<PropertyGroup>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
Expand Down Expand Up @@ -52,6 +53,7 @@
<ItemGroup>
<Content Include="HS-Button_400x400.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\Homeseer.1.0.0.nupkg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand All @@ -65,7 +67,9 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="overview.md" />
<None Include="packages.config" />
<None Include="publish-manifest.json" />
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
Expand Down Expand Up @@ -132,8 +136,11 @@
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets'))" />
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.7.71\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.7.71\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props'))" />
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.7.71\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.7.71\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets'))" />
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.props'))" />
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets'))" />
</Target>
<Import Project="..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" />
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets')" />
<!-- 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
22 changes: 22 additions & 0 deletions Templates/HomeSeerTemplates/overview.md
@@ -0,0 +1,22 @@
HSPI aims to make extending HomeSeer significantly easier by empowering developers with awesome tools and a collaborative community. Learn more at [https://github.com/alexdresko/HSPI](https://github.com/alexdresko/HSPI)

* **New to HSPI and looking for documentation?** We’ve got that.

[http://hspi.readthedocs.io/en/latest/](http://hspi.readthedocs.io/en/latest/)

* **Got a question about HSPI?** Ask on Stack Overflow and tag with “HSPI”. We’re watching and waiting for your questions.

[http://stackoverflow.com/questions/ask?tags=HSPI](http://stackoverflow.com/questions/ask?tags=HSPI)

_Using Stack Overflow, as opposed to the HomeSeer forums, allow us to more easily track questions related to HSPI and their status._

* **Found a bug or want to submit a feature request?** We’re actively improving this thing.

[https://github.com/alexdresko/HSPI/issues](https://github.com/alexdresko/HSPI/issues)

_Using the Github issues, as opposed to the HomeSeer forums, allows us to more easily track issues and their status._


* **Want to chat in real time with other HSPI developers or view a real-time feed of everything happening in HSPI?** The live feed is especially cool.

[https://gitter.im/HSPI/Lobby](https://gitter.im/HSPI/Lobby)
1 change: 1 addition & 0 deletions Templates/HomeSeerTemplates/packages.config
Expand Up @@ -3,4 +3,5 @@
<package id="Microsoft.VisualStudio.SDK.Analyzers" version="15.8.33" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" version="14.7.71" targetFramework="net461" developmentDependency="true" />
<package id="Microsoft.VisualStudio.Threading.Analyzers" version="15.8.145" targetFramework="net461" />
<package id="Microsoft.VSSDK.BuildTools" version="15.8.3252" targetFramework="net461" developmentDependency="true" />
</packages>
13 changes: 13 additions & 0 deletions Templates/HomeSeerTemplates/publish-manifest.json
@@ -0,0 +1,13 @@
{
"$schema": "http://json.schemastore.org/vsix-publish",
"categories": [ "Security", "Scaffolding", "Other" ],
"identity": {
"internalName": "HomeSeerTemplates2"
},
"overview": "overview.md",
"priceCategory": "free",
"publisher": "thealexdresko",
"private": false,
"qna": true,
"repo": "https://github.com/alexdresko/hspi"
}
7 changes: 4 additions & 3 deletions Templates/HomeSeerTemplates/source.extension.vsixmanifest
Expand Up @@ -3,7 +3,7 @@
<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.4.0"
<Identity Id="HomeSeerTemplates2" Version="1.4.2"
Language="en-US" Publisher="Alex Dresko" />
<DisplayName>HomeSeer Templates</DisplayName>
<Description xml:space="preserve">Visual Studio templates for HomeSeer development</Description>
Expand All @@ -14,8 +14,9 @@
<GalleryFlags>Public</GalleryFlags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
Expand Down
4 changes: 2 additions & 2 deletions Templates/HspiSample.Dev/app.config
Expand Up @@ -28,8 +28,8 @@
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- TODO: <probing privatePath="bin\$safeprojectname$" /> -->
<probing privatePath="bin\Sample.Dev" />
<!-- TODO: <probing privatePath="bin/$safeprojectname$" /> -->
<probing privatePath="bin/Sample.Dev" />
</assemblyBinding>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion Templates/HspiSample/app.config
Expand Up @@ -28,6 +28,6 @@
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="bin\$safeprojectname$" /> </assemblyBinding>
<probing privatePath="bin/$safeprojectname$" /> </assemblyBinding>
</runtime>
</configuration>
4 changes: 2 additions & 2 deletions Templates/HspiSampleBasic.Dev/app.config
Expand Up @@ -28,8 +28,8 @@
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- TODO: <probing privatePath="bin\$safeprojectname$" /> -->
<probing privatePath="bin\SampleBasic.Dev" />
<!-- TODO: <probing privatePath="bin/$safeprojectname$" /> -->
<probing privatePath="bin/SampleBasic.Dev" />
</assemblyBinding>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion Templates/HspiSampleBasic/app.config
Expand Up @@ -28,6 +28,6 @@
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="bin\$safeprojectname$" /> </assemblyBinding>
<probing privatePath="bin/$safeprojectname$" /> </assemblyBinding>
</runtime>
</configuration>
4 changes: 2 additions & 2 deletions Templates/HspiSampleMultipleInstance.Dev/app.config
Expand Up @@ -28,8 +28,8 @@
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- TODO: <probing privatePath="bin\$safeprojectname$" /> -->
<probing privatePath="bin\SampleMultipleInstance.Dev" />
<!-- TODO: <probing privatePath="bin/$safeprojectname$" /> -->
<probing privatePath="bin/SampleMultipleInstance.Dev" />
</assemblyBinding>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion Templates/HspiSampleMultipleInstance/app.config
Expand Up @@ -28,6 +28,6 @@
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="bin\$safeprojectname$" /> </assemblyBinding>
<probing privatePath="bin/$safeprojectname$" /> </assemblyBinding>
</runtime>
</configuration>
4 changes: 2 additions & 2 deletions Templates/HspiSampleTemplate.Dev/app.config
Expand Up @@ -28,8 +28,8 @@
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- TODO: <probing privatePath="bin\$safeprojectname$" /> -->
<probing privatePath="bin\SampleTemplate.Dev" />
<!-- TODO: <probing privatePath="bin/$safeprojectname$" /> -->
<probing privatePath="bin/SampleTemplate.Dev" />
</assemblyBinding>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion Templates/HspiSampleTemplate/app.config
Expand Up @@ -28,6 +28,6 @@
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="bin\$safeprojectname$" /> </assemblyBinding>
<probing privatePath="bin/$safeprojectname$" /> </assemblyBinding>
</runtime>
</configuration>
17 changes: 17 additions & 0 deletions publish-vsix.ps1
@@ -0,0 +1,17 @@
$vsixpublish = Get-ChildItem -File .\packages -recurse |
Where-Object { $_.Name -eq "VsixPublisher.exe" } |
Sort-Object -Descending -Property CreationTime |
Select-Object -First 1 -ExpandProperty FullName

. $vsixpublish login -publisherName alexdresko -personalAccessToken $env:homeseertemplatespublish

$overview = (Get-Item .\Templates\HomeSeerTemplates\overview.md).FullName
$manifest = (Get-Item .\Templates\HomeSeerTemplates\publish-manifest.json).FullName
$vsix = (Get-Item .\Templates\HomeSeerTemplates\bin\Debug\HomeSeerTemplates.vsix).FullName
Write-Host "vsix: $vsix"
Write-Host "manifest: $manifest"
Write-Host "overview: $overview"

# . $vsixpublish deleteExtension -extensionName "HomeSeerTemplates" -publisherName "thealexdresko"

. $vsixpublish publish -payload "$vsix" -publishManifest "$manifest"

0 comments on commit ea26c42

Please sign in to comment.