Merge pull request #32 from nunit/release-ctp3

Prep for CTP3 Release
nunit · May 22, 2015 · 75d3cce · 75d3cce
2 parents 179d903 + 6ef4ab7
commit 75d3cce
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/nunit3-vs-adapter.build b/nunit3-vs-adapter.build
@@ -7,7 +7,7 @@
 
 
  <!-- Set version number for package -->
- <property name="package.version" value="3.0.1-ctp-2"/>
+ <property name="package.version" value="3.0.2-ctp-3"/>
 
  <!-- Define package name, including version -->
  <property name="package.base.name" value="NUnit3TestAdapter"/>

diff --git a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs
@@ -21,5 +21,5 @@
 [assembly: ComVisible(false)]
 
 [assembly: Guid("c0aad5e4-b486-49bc-b3e8-31e01be6fefe")]
-[assembly: AssemblyVersion("3.0.1.0")]
-[assembly: AssemblyFileVersion("3.0.1.0")]
+[assembly: AssemblyVersion("3.0.2.0")]
+[assembly: AssemblyFileVersion("3.0.2.0")]
diff --git a/src/NUnitTestAdapterInstall/source.extension.vsixmanifest b/src/NUnitTestAdapterInstall/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
  <Identifier Id="NUnit.NUnit3TestAdapter">
  <Name>NUnit3 Test Adapter</Name>
  <Author>Charlie Poole</Author>
- <Version>3.0.1.0</Version>
+ <Version>3.0.2.0</Version>
  <Description xml:space="preserve">NUnit 3.0 adapter for integrated test execution under Visual Studio 2012 (all updates), Visual Studio 2013 (all updates), and the Visual Studio 2015 Preview and CTPs. Compatible with NUnit 3.0.</Description>
  <Locale>1033</Locale>
  <MoreInfoUrl>http://nunit.org/index.php?p=vsTestAdapter&amp;r=3.0</MoreInfoUrl>

diff --git a/src/NUnitTestAdapterTests/NUnit3TestAdapterTests.csproj b/src/NUnitTestAdapterTests/NUnit3TestAdapterTests.csproj
@@ -38,7 +38,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel">
  <SpecificVersion>False</SpecificVersion>
- <HintPath>$(MSBuildProgramFiles32)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
+ <HintPath>$(MSBuildProgramFiles32)\Microsoft Visual Studio 11.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
  </Reference>
  <Reference Include="mock-assembly">
  <HintPath>..\mock-assembly\bin\Release\mock-assembly.dll</HintPath>

diff --git a/src/mock-assembly/mock-assembly.csproj b/src/mock-assembly/mock-assembly.csproj
@@ -79,9 +79,9 @@
  <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
- <Reference Include="nunit.framework, Version=3.0.5562.31842, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>packages\NUnit.3.0.0-beta-1\lib\net45\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework, Version=3.0.5610.33194, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+ <HintPath>packages\NUnit.3.0.0-beta-2\lib\net45\nunit.framework.dll</HintPath>
+ <Private>True</Private>
  </Reference>
  <Reference Include="System">
  <Name>System</Name>

diff --git a/src/mock-assembly/packages.config b/src/mock-assembly/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
- <package id="NUnit" version="3.0.0-beta-1" targetFramework="net45" />
+ <package id="NUnit" version="3.0.0-beta-2" targetFramework="net45" />
 </packages>