Skip to content

Commit

Permalink
Improve handling of configuration file changes
Browse files Browse the repository at this point in the history
  • Loading branch information
MortenHoustonLudvigsen committed Apr 3, 2015
1 parent c754697 commit 86d25d3
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 23 deletions.
32 changes: 16 additions & 16 deletions JasmineNodeTestAdapter/JasmineNodeTestAdapter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,27 +55,27 @@
<ItemGroup>
<Reference Include="JsTestAdapter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\JsTestAdapter.1.0.13\lib\net45\JsTestAdapter.dll</HintPath>
<HintPath>..\packages\JsTestAdapter.1.0.14\lib\net45\JsTestAdapter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
<HintPath>..\packages\JsTestAdapter.1.0.13\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll</HintPath>
<HintPath>..\packages\JsTestAdapter.1.0.14\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
<HintPath>..\packages\JsTestAdapter.1.0.13\lib\net45\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
<HintPath>..\packages\JsTestAdapter.1.0.14\lib\net45\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Private>False</Private>
<HintPath>..\packages\JsTestAdapter.1.0.13\lib\net45\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
<HintPath>..\packages\JsTestAdapter.1.0.14\lib\net45\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel">
<HintPath>..\packages\JsTestAdapter.1.0.13\lib\net45\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
<HintPath>..\packages\JsTestAdapter.1.0.14\lib\net45\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces">
<HintPath>..\packages\JsTestAdapter.1.0.13\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
<HintPath>..\packages\JsTestAdapter.1.0.14\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
Expand All @@ -84,7 +84,7 @@
</Reference>
<Reference Include="NpmProxy, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\JsTestAdapter.1.0.13\lib\net45\NpmProxy.dll</HintPath>
<HintPath>..\packages\JsTestAdapter.1.0.14\lib\net45\NpmProxy.dll</HintPath>
</Reference>
<Reference Include="ProcessRunner, Version=1.0.4.18316, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -285,6 +285,15 @@
<Content Include="JasmineTestServer\Timer.js.map">
<DependentUpon>Timer.ts</DependentUpon>
</Content>
<Content Include="JasmineTestServer\Server.js.map">
<DependentUpon>Server.ts</DependentUpon>
</Content>
<Content Include="JasmineTestServer\Runner.js.map">
<DependentUpon>Runner.ts</DependentUpon>
</Content>
<Content Include="JasmineTestServer\Start.js.map">
<DependentUpon>Start.ts</DependentUpon>
</Content>
<Content Include="TestServer\TextFile.js.map">
<DependentUpon>TextFile.ts</DependentUpon>
</Content>
Expand Down Expand Up @@ -339,15 +348,6 @@
<Content Include="Grunt\CreateContentTypes.js.map">
<DependentUpon>CreateContentTypes.ts</DependentUpon>
</Content>
<Content Include="JasmineTestServer\Server.js.map">
<DependentUpon>Server.ts</DependentUpon>
</Content>
<Content Include="JasmineTestServer\Runner.js.map">
<DependentUpon>Runner.ts</DependentUpon>
</Content>
<Content Include="JasmineTestServer\Start.js.map">
<DependentUpon>Start.ts</DependentUpon>
</Content>
<None Include="web.Debug.config">
<DependentUpon>web.config</DependentUpon>
</None>
Expand Down
4 changes: 2 additions & 2 deletions JasmineNodeTestAdapter/JsTestAdapter.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"InstallPath": "../packages/JsTestAdapter.1.0.13",
"ToolsPath": "../packages/JsTestAdapter.1.0.13/Tools"
"InstallPath": "../packages/JsTestAdapter.1.0.14",
"ToolsPath": "../packages/JsTestAdapter.1.0.14/Tools"
}
4 changes: 2 additions & 2 deletions JasmineNodeTestAdapter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "JasmineNodeTestAdapter",
"version": "1.0.0",
"version": "1.0.1",
"private": true,
"devDependencies": {
"flatten-packages": "^0.1.4",
Expand Down Expand Up @@ -30,4 +30,4 @@
"stackframe": "^0.2.2",
"yargs": "^3.5.4"
}
}
}
2 changes: 1 addition & 1 deletion JasmineNodeTestAdapter/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="JsTestAdapter" version="1.0.13" targetFramework="net45" />
<package id="JsTestAdapter" version="1.0.14" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="ProcessRunner" version="1.0.8" targetFramework="net45" />
<package id="ReactiveSockets" version="0.2.6" targetFramework="net45" />
Expand Down
4 changes: 2 additions & 2 deletions JasmineNodeTestAdapter/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011">
<Metadata>
<Identity Id="JasmineNodeTestAdapter.25d980f5-bb63-4cae-8dd4-b165922e9c98" Version="x.x.x" Language="en-US" Publisher="Morten Houston Ludvigsen" />
<DisplayName>JasmineNodeTestAdapter</DisplayName>
<Description xml:space="preserve">JasmineNodeTestAdapter</Description>
<DisplayName>Jasmine Node Test Adapter</DisplayName>
<Description xml:space="preserve">A Visual Studio test explorer adapter for running Jasmine specs in Node.js</Description>
<MoreInfo>https://github.com/MortenHoustonLudvigsen/JasmineNodeTestAdapter</MoreInfo>
<License>LICENSE</License>
</Metadata>
Expand Down
3 changes: 3 additions & 0 deletions TestProjects/TypescriptTests/TypescriptTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@
<ItemGroup>
<Content Include="JasmineNodeTestAdapter.json" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<TypeScriptModuleKind>commonjs</TypeScriptModuleKind>
</PropertyGroup>
Expand Down

0 comments on commit 86d25d3

Please sign in to comment.