Merge branch 'agc93-feature/GH-12' into develop

cake-build · Sep 27, 2016 · 882e949 · 882e949
2 parents 024d48d + 98559f2
commit 882e949
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 9 deletions.
diff --git a/src/Cake.VisualStudio.csproj b/src/Cake.VisualStudio.csproj
@@ -113,41 +113,59 @@
       <SubType>Designer</SubType>
     </Content>
     <None Include="packages.config" />
-    <Content Include="Packages\cake.core.0.16.0.nupkg">
+    <Content Include="..\packages\cake.core.0.16.0\cake.core.0.16.0.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
+      <VSIXSubPath>Packages</VSIXSubPath>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <InProject>false</InProject>
     </Content>
-    <Content Include="Packages\cake.testing.0.16.0.nupkg">
+    <Content Include="..\packages\Cake.Testing.0.16.0\cake.testing.0.16.0.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
+      <VSIXSubPath>Packages</VSIXSubPath>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <InProject>false</InProject>
     </Content>
-    <Content Include="Packages\xunit.2.1.0.nupkg">
+    <Content Include="..\packages\xunit.2.1.0\xunit.2.1.0.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
+      <VSIXSubPath>Packages</VSIXSubPath>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <InProject>false</InProject>
     </Content>
-    <Content Include="Packages\xunit.runner.visualstudio.2.1.0.nupkg">
+    <Content Include="..\packages\xunit.runner.visualstudio.2.1.0\xunit.runner.visualstudio.2.1.0.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
+      <VSIXSubPath>Packages</VSIXSubPath>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <InProject>false</InProject>
     </Content>
-    <Content Include="Packages\xunit.abstractions.2.0.1.nupkg">
+    <Content Include="..\packages\xunit.abstractions.2.0.1\xunit.abstractions.2.0.1.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
+      <VSIXSubPath>Packages</VSIXSubPath>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <InProject>false</InProject>
     </Content>
-    <Content Include="Packages\xunit.assert.2.1.0.nupkg">
+    <Content Include="..\packages\xunit.assert.2.1.0\xunit.assert.2.1.0.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
+      <VSIXSubPath>Packages</VSIXSubPath>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <InProject>false</InProject>
     </Content>
-    <Content Include="Packages\xunit.core.2.1.0.nupkg">
+    <Content Include="..\packages\xunit.core.2.1.0\xunit.core.2.1.0.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
+      <VSIXSubPath>Packages</VSIXSubPath>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <InProject>false</InProject>
     </Content>
-    <Content Include="Packages\xunit.extensibility.core.2.1.0.nupkg">
+    <Content Include="..\packages\xunit.extensibility.core.2.1.0\xunit.extensibility.core.2.1.0.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
+      <VSIXSubPath>Packages</VSIXSubPath>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <InProject>false</InProject>
     </Content>
-    <Content Include="Packages\xunit.extensibility.execution.2.1.0.nupkg">
+    <Content Include="..\packages\xunit.extensibility.execution.2.1.0\xunit.extensibility.execution.2.1.0.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
+      <VSIXSubPath>Packages</VSIXSubPath>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <InProject>false</InProject>
     </Content>
     <None Include="Properties\template-builder.props" />
     <None Include="Snippets\Cake\cake-task.snippet" />

diff --git a/src/Packages/cake.core.0.16.0.nupkg b/src/Packages/cake.core.0.16.0.nupkg
diff --git a/src/Packages/cake.testing.0.16.0.nupkg b/src/Packages/cake.testing.0.16.0.nupkg
diff --git a/src/Packages/xunit.2.1.0.nupkg b/src/Packages/xunit.2.1.0.nupkg
diff --git a/src/Packages/xunit.abstractions.2.0.1.nupkg b/src/Packages/xunit.abstractions.2.0.1.nupkg
diff --git a/src/Packages/xunit.assert.2.1.0.nupkg b/src/Packages/xunit.assert.2.1.0.nupkg
diff --git a/src/Packages/xunit.core.2.1.0.nupkg b/src/Packages/xunit.core.2.1.0.nupkg
diff --git a/src/Packages/xunit.extensibility.core.2.1.0.nupkg b/src/Packages/xunit.extensibility.core.2.1.0.nupkg
diff --git a/src/Packages/xunit.extensibility.execution.2.1.0.nupkg b/src/Packages/xunit.extensibility.execution.2.1.0.nupkg
diff --git a/src/Packages/xunit.runner.visualstudio.2.1.0.nupkg b/src/Packages/xunit.runner.visualstudio.2.1.0.nupkg
diff --git a/src/packages.config b/src/packages.config
@@ -26,4 +26,13 @@
   <package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net451" />
   <package id="Microsoft.VSSDK.BuildTools" version="14.2.25201" targetFramework="net451" developmentDependency="true" />
   <package id="TemplateBuilder" version="1.1.4.5-beta" targetFramework="net451" />
+  <package id="Cake.Core" version="0.16.0" targetFramework="net451" developmentDependency="true" />
+  <package id="Cake.Testing" version="0.16.0" targetFramework="net451" developmentDependency="true" />
+  <package id="xunit" version="2.1.0" targetFramework="net451" developmentDependency="true" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net451" developmentDependency="true" />
+  <package id="xunit.assert" version="2.1.0" targetFramework="net451" developmentDependency="true" />
+  <package id="xunit.core" version="2.1.0" targetFramework="net451" developmentDependency="true" />
+  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" developmentDependency="true" />
+  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" developmentDependency="true" />
+  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net451" developmentDependency="true" />
 </packages>