From d3160882fb380f00ef13eb254f80c2e28bb212b5 Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Sat, 29 Mar 2014 08:43:54 +0100 Subject: [PATCH 1/4] Hardcopied in not to shallowcopy --- src/NUnitTestAdapter/AssemblyRunner.cs | 2 +- src/NUnitTestAdapter/NUnitTestDiscoverer.cs | 1 + src/NUnitTestAdapter/Properties/AssemblyInfo.cs | 4 ++-- src/NUnitTestAdapterInstall/source.extension.vsixmanifest | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/NUnitTestAdapter/AssemblyRunner.cs b/src/NUnitTestAdapter/AssemblyRunner.cs index 52e8976..7743a9e 100644 --- a/src/NUnitTestAdapter/AssemblyRunner.cs +++ b/src/NUnitTestAdapter/AssemblyRunner.cs @@ -153,7 +153,7 @@ namespace NUnit.VisualStudio.TestAdapter private bool TryLoadAssembly() { var package = new TestPackage(assemblyName); - + package.Settings["ShadowCopyFiles"] = false; if (!runner.Load(package)) return false; diff --git a/src/NUnitTestAdapter/NUnitTestDiscoverer.cs b/src/NUnitTestAdapter/NUnitTestDiscoverer.cs index 1ea10ce..a7bc62b 100644 --- a/src/NUnitTestAdapter/NUnitTestDiscoverer.cs +++ b/src/NUnitTestAdapter/NUnitTestDiscoverer.cs @@ -35,6 +35,7 @@ namespace NUnit.VisualStudio.TestAdapter TestRunner runner = new TestDomain(); TestPackage package = new TestPackage(sourceAssembly); + package.Settings["ShadowCopyFiles"] = false; TestConverter testConverter = null; try { diff --git a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs index 0b88e1d..d8172c7 100644 --- a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs +++ b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs @@ -21,5 +21,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: Guid("c0aad5e4-b486-49bc-b3e8-31e01be6fefe")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.0.1")] +[assembly: AssemblyFileVersion("1.0.0.1")] diff --git a/src/NUnitTestAdapterInstall/source.extension.vsixmanifest b/src/NUnitTestAdapterInstall/source.extension.vsixmanifest index a4e044c..758a174 100644 --- a/src/NUnitTestAdapterInstall/source.extension.vsixmanifest +++ b/src/NUnitTestAdapterInstall/source.extension.vsixmanifest @@ -3,7 +3,7 @@ NUnit Test Adapter Charlie Poole - 1.0.0.0 + 1.0.0.1 NUnit adapter for integrated test execution under Visual Studio 2012 RTM, Update 1-4,and Visual Studio 2013 Preview. Compatible with NUnit 2.0 through 2.6.2. 1033 http://nunit.org/index.php?p=vsTestAdapter&r=2.6.2 From e50f11fd9460fafbe3f616969589b8cc24a920e8 Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Sat, 29 Mar 2014 14:10:06 +0100 Subject: [PATCH 2/4] Temporary hardcoded in disabling of shadowcopy --- src/NUnitTestAdapter/AssemblyRunner.cs | 1 + .../Properties/AssemblyInfo.cs | 4 ++-- .../source.extension.vsixmanifest | 4 ++-- .../ExperimentalTests.cs | 20 +++++++++++++++++++ .../NUnitTestAdapterTests.csproj | 1 + 5 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 src/NUnitTestAdapterTests/ExperimentalTests.cs diff --git a/src/NUnitTestAdapter/AssemblyRunner.cs b/src/NUnitTestAdapter/AssemblyRunner.cs index 7743a9e..24f4e1a 100644 --- a/src/NUnitTestAdapter/AssemblyRunner.cs +++ b/src/NUnitTestAdapter/AssemblyRunner.cs @@ -154,6 +154,7 @@ namespace NUnit.VisualStudio.TestAdapter { var package = new TestPackage(assemblyName); package.Settings["ShadowCopyFiles"] = false; + logger.SendDebugMessage("ShadowCopyFiles is set to :" + package.Settings["ShadowCopyFiles"]); if (!runner.Load(package)) return false; diff --git a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs index d8172c7..493fb1f 100644 --- a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs +++ b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs @@ -21,5 +21,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: Guid("c0aad5e4-b486-49bc-b3e8-31e01be6fefe")] -[assembly: AssemblyVersion("1.0.0.1")] -[assembly: AssemblyFileVersion("1.0.0.1")] +[assembly: AssemblyVersion("1.0.0.3")] +[assembly: AssemblyFileVersion("1.0.0.3")] diff --git a/src/NUnitTestAdapterInstall/source.extension.vsixmanifest b/src/NUnitTestAdapterInstall/source.extension.vsixmanifest index 758a174..b6a7d14 100644 --- a/src/NUnitTestAdapterInstall/source.extension.vsixmanifest +++ b/src/NUnitTestAdapterInstall/source.extension.vsixmanifest @@ -3,8 +3,8 @@ NUnit Test Adapter Charlie Poole - 1.0.0.1 - NUnit adapter for integrated test execution under Visual Studio 2012 RTM, Update 1-4,and Visual Studio 2013 Preview. Compatible with NUnit 2.0 through 2.6.2. + 1.0.0.3 + NUnit adapter for integrated test execution under Visual Studio 2012 (all updates),and Visual Studio 2013 (all updates). Compatible with NUnit 2.0 through 2.6.3. 1033 http://nunit.org/index.php?p=vsTestAdapter&r=2.6.2 license.rtf diff --git a/src/NUnitTestAdapterTests/ExperimentalTests.cs b/src/NUnitTestAdapterTests/ExperimentalTests.cs new file mode 100644 index 0000000..8c1f7b1 --- /dev/null +++ b/src/NUnitTestAdapterTests/ExperimentalTests.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; +using NUnit.Framework; + +namespace NUnit.VisualStudio.TestAdapter.Tests +{ + [TestFixture] + public class ExperimentalTests + { + [Test] + public void LocationTest() + { + var location = Assembly.GetExecutingAssembly().Location; + } + } +} diff --git a/src/NUnitTestAdapterTests/NUnitTestAdapterTests.csproj b/src/NUnitTestAdapterTests/NUnitTestAdapterTests.csproj index 337f02f..b85f62b 100644 --- a/src/NUnitTestAdapterTests/NUnitTestAdapterTests.csproj +++ b/src/NUnitTestAdapterTests/NUnitTestAdapterTests.csproj @@ -64,6 +64,7 @@ + From 5a4076bcc0afd897b34e38cd8fca7effc6b55f33 Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Sat, 29 Mar 2014 14:42:07 +0100 Subject: [PATCH 3/4] Updated version numbers --- src/NUnitTestAdapter/Properties/AssemblyInfo.cs | 4 ++-- src/NUnitTestAdapterInstall/source.extension.vsixmanifest | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs index 493fb1f..1b2428a 100644 --- a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs +++ b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs @@ -21,5 +21,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: Guid("c0aad5e4-b486-49bc-b3e8-31e01be6fefe")] -[assembly: AssemblyVersion("1.0.0.3")] -[assembly: AssemblyFileVersion("1.0.0.3")] +[assembly: AssemblyVersion("1.0.0.10")] +[assembly: AssemblyFileVersion("1.0.0.10")] diff --git a/src/NUnitTestAdapterInstall/source.extension.vsixmanifest b/src/NUnitTestAdapterInstall/source.extension.vsixmanifest index b6a7d14..0072539 100644 --- a/src/NUnitTestAdapterInstall/source.extension.vsixmanifest +++ b/src/NUnitTestAdapterInstall/source.extension.vsixmanifest @@ -3,7 +3,7 @@ NUnit Test Adapter Charlie Poole - 1.0.0.3 + 1.0.0.10 NUnit adapter for integrated test execution under Visual Studio 2012 (all updates),and Visual Studio 2013 (all updates). Compatible with NUnit 2.0 through 2.6.3. 1033 http://nunit.org/index.php?p=vsTestAdapter&r=2.6.2 From fcd198b460982c22e3ab192e22391ce0e7063183 Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Sun, 6 Apr 2014 00:08:35 +0200 Subject: [PATCH 4/4] Updated gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 8868dfd..c90de59 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,6 @@ $RECYCLE.BIN/ # Mac desktop service store files .DS_Store +*.chk +*.jrs +*.ide