Skip to content

Commit

Permalink
Merge branch 'agc93-feature/gh-50' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
agc93 committed Apr 24, 2017
2 parents 405719d + 1e4d869 commit 8bb3aa5
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/Cake.VisualStudio.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@
<SubType>Designer</SubType>
</Content>
<None Include="packages.config" />
<Content Include="..\packages\cake.core.0.17.0\cake.core.0.17.0.nupkg">
<Content Include="..\packages\cake.core.0.19.4\cake.core.0.19.4.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
<VSIXSubPath>Packages</VSIXSubPath>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<InProject>false</InProject>
</Content>
<Content Include="..\packages\Cake.Testing.0.17.1\cake.testing.0.17.1.nupkg">
<Content Include="..\packages\Cake.Testing.0.19.4\cake.testing.0.19.4.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
<VSIXSubPath>Packages</VSIXSubPath>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down
4 changes: 2 additions & 2 deletions src/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake.Core" version="0.17.0" targetFramework="net451" developmentDependency="true" />
<package id="Cake.Testing" version="0.17.1" targetFramework="net451" developmentDependency="true" />
<package id="ini-parser" version="2.3.0" targetFramework="net451" />
<package id="Microsoft.VisualStudio.CoreUtility" version="14.2.25123" targetFramework="net451" />
<package id="Microsoft.VisualStudio.Imaging" version="14.2.25123" targetFramework="net451" />
Expand All @@ -28,6 +26,8 @@
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net451" />
<package id="Microsoft.VSSDK.BuildTools" version="15.0.26201" targetFramework="net451" developmentDependency="true" />
<package id="TemplateBuilder" version="1.1.4.5-beta" targetFramework="net451" />
<package id="Cake.Core" version="0.19.4" targetFramework="net451" developmentDependency="true" />
<package id="Cake.Testing" version="0.19.4" targetFramework="net451" developmentDependency="true" />
<package id="xunit" version="2.1.0" targetFramework="net451" developmentDependency="true" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net451" developmentDependency="true" />
<package id="xunit.assert" version="2.1.0" targetFramework="net451" developmentDependency="true" />
Expand Down
4 changes: 2 additions & 2 deletions src/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Snippets\snippets.pkgdef" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="ContentType\icons.pkgdef" />
<Asset Type="cake.core.0.17.0.nupkg" d:Source="File" Path="Packages\cake.core.0.17.0.nupkg" d:VsixSubPath="Packages" />
<Asset Type="cake.testing.0.17.1.nupkg" d:Source="File" Path="Packages\cake.testing.0.17.1.nupkg" d:VsixSubPath="Packages" />
<Asset Type="cake.core.0.19.4.nupkg" d:Source="File" Path="Packages\cake.core.0.19.4.nupkg" d:VsixSubPath="Packages" />
<Asset Type="cake.testing.0.19.4.nupkg" d:Source="File" Path="Packages\cake.testing.0.19.4.nupkg" d:VsixSubPath="Packages" />
<Asset Type="xunit.2.1.0.nupkg" d:Source="File" Path="Packages\xunit.2.1.0.nupkg" d:VsixSubPath="Packages" />
<Asset Type="xunit.abstractions.2.0.1.nupkg" d:Source="File" Path="Packages\xunit.abstractions.2.0.1.nupkg" d:VsixSubPath="Packages" />
<Asset Type="xunit.assert.2.1.0.nupkg" d:Source="File" Path="Packages\xunit.assert.2.1.0.nupkg" d:VsixSubPath="Packages" />
Expand Down
2 changes: 1 addition & 1 deletion template/AddinTemplate/AddinTemplate.vstemplate
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="3cf9b016-d63f-44ee-849d-6f3efc996134">
<package id="Cake.Core" version="0.17.0" />
<package id="Cake.Core" version="0.19.4" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="3cf9b016-d63f-44ee-849d-6f3efc996134">
<package id="Cake.Core" version="0.17.0" />
<package id="Cake.Testing" version="0.17.1" />
<package id="Cake.Core" version="0.19.4" />
<package id="Cake.Testing" version="0.19.4" />
<package id="xunit" version="2.1.0" targetFramework="net452" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
<package id="xunit.assert" version="2.1.0" targetFramework="net452" />
Expand Down
4 changes: 2 additions & 2 deletions template/AddinTestTemplate/AddinTestTemplate.vstemplate
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="3cf9b016-d63f-44ee-849d-6f3efc996134">
<package id="Cake.Core" version="0.17.0" />
<package id="Cake.Testing" version="0.17.1" />
<package id="Cake.Core" version="0.19.4" />
<package id="Cake.Testing" version="0.19.4" />
<package id="xunit" version="2.1.0" targetFramework="net452" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
<package id="xunit.assert" version="2.1.0" targetFramework="net452" />
Expand Down
2 changes: 1 addition & 1 deletion template/ModuleTemplate/ModuleTemplate.vstemplate
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="3cf9b016-d63f-44ee-849d-6f3efc996134">
<package id="Cake.Core" version="0.17.0" />
<package id="Cake.Core" version="0.19.4" />
</packages>
</WizardData>
</VSTemplate>

0 comments on commit 8bb3aa5

Please sign in to comment.