Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Support for VS 2012 RC and latest R# 7 EAP (build 85).

  • Loading branch information...
commit 758d121e06af905c7ec30d731247341c0abbfb81 1 parent 5e31ef4
@sdekock authored
View
2  build.vs2012.bat
@@ -7,6 +7,6 @@ pushd lib\sl\StatLight\
powershell -NoProfile -Command "& { Import-Module .\psake.psm1; Invoke-psake .\default.ps1 "build-all" -framework 3.5x86 -parameters @{"build_configuration"='%Configuration%';} }"
popd
-msbuild src\AgUnit.vs2011.sln /p:Configuration=%Configuration% /t:Rebuild
+msbuild src\AgUnit.vs2012.sln /p:Configuration=%Configuration% /t:Rebuild
pause
View
41 src/AgUnit.Runner.Resharper61/UnitTestProvider/MSTest/SilverlightMsTestMetadataExplorer.cs
@@ -1,8 +1,9 @@
-extern alias mstestlegacy;
+#if !RS70
+
+extern alias mstestlegacy;
extern alias mstest10;
-#if RS70
extern alias mstest11;
-#endif
+
using System;
using System.Linq;
using AgUnit.Runner.Resharper61.Util;
@@ -25,20 +26,11 @@ public class SilverlightMsTestMetadataExplorer : IUnitTestMetadataExplorer
private readonly mstestlegacy::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestElementFactory msTestLegacyElementFactory;
private readonly mstest10::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestProvider msTest10Provider;
private readonly mstest10::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestElementFactory msTest10ElementFactory;
-#if RS70
- private readonly mstest11::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestProvider msTest11Provider;
- private readonly mstest11::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestElementFactory msTest11ElementFactory;
-#endif
public IUnitTestProvider Provider
{
get
{
-#if RS70
- if (msTest11Provider as IUnitTestProvider != null)
- return msTest11Provider as IUnitTestProvider;
-#endif
-
if (msTest10Provider as IUnitTestProvider != null)
return msTest10Provider as IUnitTestProvider;
@@ -50,23 +42,13 @@ public IUnitTestProvider Provider
mstestlegacy::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestProvider msTestLegacyProvider = null,
mstestlegacy::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestElementFactory msTestLegacyElementFactory = null,
mstest10::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestProvider msTest10Provider = null,
- mstest10::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestElementFactory msTest10ElementFactory = null
-#if RS70
-,
- mstest11::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestProvider msTest11Provider = null,
- mstest11::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestElementFactory msTest11ElementFactory = null
-#endif
-)
+ mstest10::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestElementFactory msTest10ElementFactory = null)
{
this.shellLocks = shellLocks;
this.msTestLegacyProvider = msTestLegacyProvider;
this.msTestLegacyElementFactory = msTestLegacyElementFactory;
this.msTest10Provider = msTest10Provider;
this.msTest10ElementFactory = msTest10ElementFactory;
-#if RS70
- this.msTest11Provider = msTest11Provider;
- this.msTest11ElementFactory = msTest11ElementFactory;
-#endif
}
public void ExploreAssembly(IProject project, IMetadataAssembly assembly, UnitTestElementConsumer consumer)
@@ -75,15 +57,9 @@ public void ExploreAssembly(IProject project, IMetadataAssembly assembly, UnitTe
{
var originalReferencedAssemblies = InjectMsTestIntoReferencedAssemblyNames(assembly);
+
try
{
-#if RS70
- if (msTest11Provider != null)
- {
- new mstest11::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestMetadataExplorer(msTest11ElementFactory, project, shellLocks, consumer).ExploreAssembly(assembly);
- }
- else
-#endif
if (msTest10Provider != null)
{
new mstest10::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestMetadataExplorer(msTest10ElementFactory, project, shellLocks, consumer).ExploreAssembly(assembly);
@@ -92,6 +68,7 @@ public void ExploreAssembly(IProject project, IMetadataAssembly assembly, UnitTe
{
new mstestlegacy::JetBrains.ReSharper.UnitTestProvider.MSTest.MsTestMetadataExplorer(msTestLegacyElementFactory, project, shellLocks, consumer).ExploreAssembly(assembly);
}
+
}
finally
{
@@ -118,4 +95,6 @@ private void SetReferencedAssemblyNames(IMetadataAssembly assembly, AssemblyName
assembly.SetField("myReferencedAssembliesNames", referencedAssemblyNames);
}
}
-}
+}
+
+#endif
View
5 src/AgUnit.Runner.Resharper61/Util/ReflectionExtensions.cs
@@ -70,6 +70,11 @@ private static T GetMemberInfo<T>(object target, string name, IDictionary<Tuple<
{
memberInfo = GetMemberInfoRecursive(name, targetType, getMemberInfo);
cache[cacheKey] = memberInfo;
+
+ if (memberInfo == null)
+ {
+ throw new Exception(string.Format("Member '{0}' not found on type '{1}'", name, targetType.FullName));
+ }
}
return memberInfo;
View
9 src/DummyTests/VS2010/DummyTests.Silverlight3/DummyTests.Silverlight3.csproj
@@ -12,7 +12,7 @@
<RootNamespace>DummyTests.Silverlight3</RootNamespace>
<AssemblyName>DummyTests.Silverlight3</AssemblyName>
<TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
- <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
<SilverlightApplication>true</SilverlightApplication>
<SupportedCultures>
@@ -31,6 +31,11 @@
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
<LinkedServerProject>
</LinkedServerProject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>4.0</OldToolsVersion>
</PropertyGroup>
<!-- This property group is only here to support building this project using the
MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs
@@ -86,6 +91,8 @@
<ApplicationDefinition Include="App.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</ApplicationDefinition>
</ItemGroup>
<ItemGroup>
View
7 ....TestDrivenProjectTemplate/DummyTests.Silverlight4.NUnit.TestDrivenProjectTemplate.csproj
@@ -14,14 +14,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DummyTests.Silverlight4.NUnit.TestDrivenProjectTemplate</RootNamespace>
<AssemblyName>DummyTests.Silverlight4.NUnit.TestDrivenProjectTemplate</AssemblyName>
- <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<SilverlightApplication>false</SilverlightApplication>
<TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
<SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
+ <OldToolsVersion>4.0</OldToolsVersion>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
View
60 src/DummyTests/VS2010/DummyTests.sln
@@ -1,6 +1,6 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DummyTests.Silverlight3", "DummyTests.Silverlight3\DummyTests.Silverlight3.csproj", "{63800EC6-99F5-43C4-9F0C-982EE5E35A02}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DummyTests.Silverlight4", "DummyTests.Silverlight4\DummyTests.Silverlight4.csproj", "{2EA79BEB-CD37-465B-A8DA-3E6724032708}"
@@ -35,10 +35,10 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {63800EC6-99F5-43C4-9F0C-982EE5E35A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {63800EC6-99F5-43C4-9F0C-982EE5E35A02}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {63800EC6-99F5-43C4-9F0C-982EE5E35A02}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {63800EC6-99F5-43C4-9F0C-982EE5E35A02}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2D935DC6-C397-414D-87BB-22D77068340E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2D935DC6-C397-414D-87BB-22D77068340E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2D935DC6-C397-414D-87BB-22D77068340E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2D935DC6-C397-414D-87BB-22D77068340E}.Release|Any CPU.Build.0 = Release|Any CPU
{2EA79BEB-CD37-465B-A8DA-3E6724032708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2EA79BEB-CD37-465B-A8DA-3E6724032708}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2EA79BEB-CD37-465B-A8DA-3E6724032708}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -47,22 +47,30 @@ Global
{36C29AE2-6BC7-4B44-839E-B864113CEB63}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36C29AE2-6BC7-4B44-839E-B864113CEB63}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36C29AE2-6BC7-4B44-839E-B864113CEB63}.Release|Any CPU.Build.0 = Release|Any CPU
- {A131F0E1-C4B9-494A-8DFD-17097EF563F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A131F0E1-C4B9-494A-8DFD-17097EF563F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A131F0E1-C4B9-494A-8DFD-17097EF563F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A131F0E1-C4B9-494A-8DFD-17097EF563F3}.Release|Any CPU.Build.0 = Release|Any CPU
- {E7821753-4C82-478C-9089-BE3EB0ABFDC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E7821753-4C82-478C-9089-BE3EB0ABFDC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E7821753-4C82-478C-9089-BE3EB0ABFDC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E7821753-4C82-478C-9089-BE3EB0ABFDC9}.Release|Any CPU.Build.0 = Release|Any CPU
- {2D935DC6-C397-414D-87BB-22D77068340E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2D935DC6-C397-414D-87BB-22D77068340E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2D935DC6-C397-414D-87BB-22D77068340E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2D935DC6-C397-414D-87BB-22D77068340E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4E397289-74AA-40B0-A1CF-09A45698A01B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4E397289-74AA-40B0-A1CF-09A45698A01B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4E397289-74AA-40B0-A1CF-09A45698A01B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4E397289-74AA-40B0-A1CF-09A45698A01B}.Release|Any CPU.Build.0 = Release|Any CPU
{50D495DE-3537-4A78-9152-5F965DCC1B94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{50D495DE-3537-4A78-9152-5F965DCC1B94}.Debug|Any CPU.Build.0 = Debug|Any CPU
{50D495DE-3537-4A78-9152-5F965DCC1B94}.Release|Any CPU.ActiveCfg = Release|Any CPU
{50D495DE-3537-4A78-9152-5F965DCC1B94}.Release|Any CPU.Build.0 = Release|Any CPU
+ {60F76431-8DB2-402F-8142-DA4747D26483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {60F76431-8DB2-402F-8142-DA4747D26483}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {60F76431-8DB2-402F-8142-DA4747D26483}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {60F76431-8DB2-402F-8142-DA4747D26483}.Release|Any CPU.Build.0 = Release|Any CPU
+ {63800EC6-99F5-43C4-9F0C-982EE5E35A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {63800EC6-99F5-43C4-9F0C-982EE5E35A02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {63800EC6-99F5-43C4-9F0C-982EE5E35A02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {63800EC6-99F5-43C4-9F0C-982EE5E35A02}.Release|Any CPU.Build.0 = Release|Any CPU
+ {98C4A7CB-A20C-45D9-A307-161DF0B38FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {98C4A7CB-A20C-45D9-A307-161DF0B38FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {98C4A7CB-A20C-45D9-A307-161DF0B38FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {98C4A7CB-A20C-45D9-A307-161DF0B38FB9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A131F0E1-C4B9-494A-8DFD-17097EF563F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A131F0E1-C4B9-494A-8DFD-17097EF563F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A131F0E1-C4B9-494A-8DFD-17097EF563F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A131F0E1-C4B9-494A-8DFD-17097EF563F3}.Release|Any CPU.Build.0 = Release|Any CPU
{A9B0AFBF-9000-4F07-86DB-0D499261D29A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A9B0AFBF-9000-4F07-86DB-0D499261D29A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A9B0AFBF-9000-4F07-86DB-0D499261D29A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -75,22 +83,14 @@ Global
{C9CCA388-1478-4CAB-BCCB-7686D544E640}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9CCA388-1478-4CAB-BCCB-7686D544E640}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9CCA388-1478-4CAB-BCCB-7686D544E640}.Release|Any CPU.Build.0 = Release|Any CPU
- {98C4A7CB-A20C-45D9-A307-161DF0B38FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {98C4A7CB-A20C-45D9-A307-161DF0B38FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {98C4A7CB-A20C-45D9-A307-161DF0B38FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {98C4A7CB-A20C-45D9-A307-161DF0B38FB9}.Release|Any CPU.Build.0 = Release|Any CPU
{DDE63C88-8ABE-4556-9DCA-387B43A23835}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DDE63C88-8ABE-4556-9DCA-387B43A23835}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DDE63C88-8ABE-4556-9DCA-387B43A23835}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DDE63C88-8ABE-4556-9DCA-387B43A23835}.Release|Any CPU.Build.0 = Release|Any CPU
- {4E397289-74AA-40B0-A1CF-09A45698A01B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4E397289-74AA-40B0-A1CF-09A45698A01B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4E397289-74AA-40B0-A1CF-09A45698A01B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4E397289-74AA-40B0-A1CF-09A45698A01B}.Release|Any CPU.Build.0 = Release|Any CPU
- {60F76431-8DB2-402F-8142-DA4747D26483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {60F76431-8DB2-402F-8142-DA4747D26483}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {60F76431-8DB2-402F-8142-DA4747D26483}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {60F76431-8DB2-402F-8142-DA4747D26483}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E7821753-4C82-478C-9089-BE3EB0ABFDC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E7821753-4C82-478C-9089-BE3EB0ABFDC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E7821753-4C82-478C-9089-BE3EB0ABFDC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E7821753-4C82-478C-9089-BE3EB0ABFDC9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Please sign in to comment.
Something went wrong with that request. Please try again.