forked from spring-projects/spring-net
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixing broken build; reworked build script so that VS2008 (.NET 2.0) …
…MSTest and VS2010 SP1 (.NET 4.0) MSTest tests can co-exist
- Loading branch information
Showing
12 changed files
with
200 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <TestSettings name="Local" id="2b14d0ab-7736-40a9-910f-8b34e8989d90" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010"> | ||
| <Description>These are default test settings for a local test run.</Description> | ||
| <Deployment enabled="false" /> | ||
| <Execution> | ||
| <TestTypeSpecific /> | ||
| <AgentRule name="Execution Agents"> | ||
| </AgentRule> | ||
| </Execution> | ||
| </TestSettings> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010"> | ||
| <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6"> | ||
| <RunConfiguration id="2b14d0ab-7736-40a9-910f-8b34e8989d90" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> | ||
| </TestList> | ||
| </TestLists> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010"> | ||
| <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6"> | ||
| <RunConfiguration id="6b7dd465-21e6-4d48-9f37-5f838b994193" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> | ||
| </TestList> | ||
| </TestLists> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <TestSettings name="Trace and Test Impact" id="00eab3a9-565d-4b89-993f-7b0c4cb7d4b9" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010"> | ||
| <Description>These are test settings for Trace and Test Impact.</Description> | ||
| <Execution> | ||
| <TestTypeSpecific /> | ||
| <AgentRule name="Execution Agents"> | ||
| <DataCollectors> | ||
| <DataCollector uri="datacollector://microsoft/SystemInfo/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.SystemInfoDataCollector, Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="System Information"> | ||
| </DataCollector> | ||
| <DataCollector uri="datacollector://microsoft/ActionLog/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.ManualTest.ActionLog.ActionLogPlugin, Microsoft.VisualStudio.TestTools.ManualTest.ActionLog, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Actions"> | ||
| </DataCollector> | ||
| <DataCollector uri="datacollector://microsoft/HttpProxy/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.HttpProxyCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="ASP.NET Client Proxy for IntelliTrace and Test Impact"> | ||
| </DataCollector> | ||
| <DataCollector uri="datacollector://microsoft/TestImpact/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TestImpactDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Test Impact"> | ||
| </DataCollector> | ||
| <DataCollector uri="datacollector://microsoft/TraceDebugger/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TraceDebuggerDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="IntelliTrace"> | ||
| </DataCollector> | ||
| </DataCollectors> | ||
| </AgentRule> | ||
| </Execution> | ||
| </TestSettings> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.2010.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProductVersion>9.0.30729</ProductVersion> | ||
| <SchemaVersion>2.0</SchemaVersion> | ||
| <ProjectGuid>{7321149A-47C6-4FBA-9D1A-26FD6815381B}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>Spring</RootNamespace> | ||
| <AssemblyName>Spring.Testing.Microsoft.Tests</AssemblyName> | ||
| <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <FileUpgradeFlags> | ||
| </FileUpgradeFlags> | ||
| <OldToolsVersion>3.5</OldToolsVersion> | ||
| <UpgradeBackupLocation /> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e"> | ||
| <SpecificVersion>False</SpecificVersion> | ||
| <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> | ||
| <SpecificVersion>False</SpecificVersion> | ||
| </Reference> | ||
| <Reference Include="System" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="AssemblyInfo.cs" /> | ||
| <Compile Include="Testing\Microsoft\AbstractDependencyInjectionSpringContextTestsTests.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="app.config" /> | ||
| <None Include="Spring.Testing.Microsoft.Tests.dll.config" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <EmbeddedResource Include="Testing\Microsoft\TestApplicationContext.xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj"> | ||
| <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project> | ||
| <Name>Spring.Core.2010</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj"> | ||
| <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project> | ||
| <Name>Spring.Data.2010</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.Microsoft\Spring.Testing.Microsoft.2010.csproj"> | ||
| <Project>{2E10A8D3-B8FF-4699-90B8-E621659C58DD}</Project> | ||
| <Name>Spring.Testing.Microsoft.2010</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj"> | ||
| <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project> | ||
| <Name>Spring.Core.Tests.2010</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2010.csproj"> | ||
| <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project> | ||
| <Name>Spring.Data.Tests.2010</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Folder Include="Properties\" /> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
| <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
| Other similar extension points exist, see Microsoft.Common.targets. | ||
| <Target Name="BeforeBuild"> | ||
| </Target> | ||
| <Target Name="AfterBuild"> | ||
| </Target> | ||
| --> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters