Cleaned up previous VS 2013 support:

- Removed tests that were identical to VS 2012, and didn't cover new code
- Fixed Visual Studio version in comment header
- Added to change log
This commit is contained in:
Jason Perkins 2013-08-17 14:31:52 -04:00
parent 219f0df11a
commit e593172691
6 changed files with 2 additions and 135 deletions

View File

@ -117,6 +117,7 @@
* Pull 11: Add support for Visual Studio 2012 (Oliver Schneider)
* Bug 171: ImpLib used incorrectly in dependency paths
* Bug 176: Target prefix breaks GCC linking
* Initial support for Visual Studio 2013 (Igor Karatayev)
-------

View File

@ -1,6 +1,6 @@
--
-- actions/vstudio/vs2013.lua
-- Extend the existing exporters with support for Visual Studio 2012.
-- Extend the existing exporters with support for Visual Studio 2013.
-- Copyright (c) 2013 Jason Perkins and the Premake project
--

View File

@ -1,38 +0,0 @@
--
-- tests/actions/vs2013/test_csproj_common_props.lua
-- Check Visual Studio 2013 extensions to the project properties block.
-- Copyright (c) 2013 Jason Perkins and the Premake project
--
local suite = test.declare("vs2013_csproj_common_props")
local cs2005 = premake.vstudio.cs2005
--
-- Setup
--
local sln, prj
function suite.setup()
_ACTION = "vs2013"
sln = test.createsolution()
language "C#"
end
local function prepare()
prj = premake.solution.getproject_ng(sln, 1)
cs2005.commonProperties(prj)
end
---
-- Visual Studio 2013 omits <ProductVersion> and <SchemaVersion>.
---
function suite.onDefaultCommonProps()
prepare()
test.capture [[
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
]]
end

View File

@ -1,48 +0,0 @@
--
-- tests/actions/vs2013/test_csproj_project_props.lua
-- Check Visual Studio 2013 extensions to the project properties block.
-- Copyright (c) 2013 Jason Perkins and the Premake project
--
local suite = test.declare("vs2013_csproj_project_props")
local cs2005 = premake.vstudio.cs2005
--
-- Setup
--
local sln, prj
function suite.setup()
_ACTION = "vs2013"
sln = test.createsolution()
language "C#"
end
local function prepare()
prj = premake.solution.getproject_ng(sln, 1)
cs2005.projectProperties(prj)
end
---
-- Visual Studio 2013 omits ProductVersion and SchemaVersion.
---
function suite.onDefaultProps()
prepare()
test.capture [[
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyProject</RootNamespace>
<AssemblyName>MyProject</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
]]
end

View File

@ -1,45 +0,0 @@
--
-- tests/actions/vs2013/test_csproj_targets.lua
-- Check Visual Studio 2013 extensions to the targets block.
-- Copyright (c) 2013 Jason Perkins and the Premake project
--
local suite = test.declare("vs2013_csproj_targets")
local cs2005 = premake.vstudio.cs2005
--
-- Setup
--
local sln, prj
function suite.setup()
_ACTION = "vs2013"
sln = test.createsolution()
language "C#"
end
local function prepare()
prj = premake.solution.getproject_ng(sln, 1)
cs2005.targets(prj)
end
---
-- Visual Studio 2013 changes the MS Build path slightly.
---
function suite.onDefaultCommonProps()
prepare()
test.capture [[
<Import Project="$(MSBuildToolsPath)\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>
-->
]]
end

View File

@ -157,10 +157,7 @@
dofile("actions/vs2012/test_vcxproj_config_props.lua")
-- Visual Studio 2013
dofile("actions/vs2013/test_csproj_common_props.lua")
dofile("actions/vs2013/test_csproj_project_element.lua")
dofile("actions/vs2013/test_csproj_project_props.lua")
dofile("actions/vs2013/test_csproj_targets.lua")
dofile("actions/vs2013/test_sln_header.lua")
dofile("actions/vs2013/test_vcxproj_config_props.lua")