Skip to content

Commit 17a2ce6

Browse files
carafonecarafone
committed
Changes to project files to VS 2017 format and multitarget .Net 4.0 and .Net Core 1.1
1 parent 4cf7c77 commit 17a2ce6

File tree

3 files changed

+62
-112
lines changed

3 files changed

+62
-112
lines changed

Diff for: ‎PowerAssert.sln

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26430.14
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerAssert", "PowerAssert\PowerAssert.csproj", "{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}"
57
EndProject
68
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerAssertTests", "PowerAssertTests\PowerAssertTests.csproj", "{665FDD28-99EF-4038-9469-1B27F778BF1D}"
@@ -13,22 +15,32 @@ EndProject
1315
Global
1416
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1517
Debug|Any CPU = Debug|Any CPU
18+
Debug-Core|Any CPU = Debug-Core|Any CPU
1619
NuPackRelease|Any CPU = NuPackRelease|Any CPU
1720
Release|Any CPU = Release|Any CPU
21+
Release-Core|Any CPU = Release-Core|Any CPU
1822
EndGlobalSection
1923
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2024
{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2125
{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}.NuPackRelease|Any CPU.ActiveCfg = NuPackRelease|Any CPU
23-
{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}.NuPackRelease|Any CPU.Build.0 = NuPackRelease|Any CPU
26+
{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}.Debug-Core|Any CPU.ActiveCfg = Debug-Core|Any CPU
27+
{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}.Debug-Core|Any CPU.Build.0 = Debug-Core|Any CPU
28+
{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}.NuPackRelease|Any CPU.ActiveCfg = Release|Any CPU
29+
{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}.NuPackRelease|Any CPU.Build.0 = Release|Any CPU
2430
{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
2531
{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}.Release-Core|Any CPU.ActiveCfg = Release-Core|Any CPU
33+
{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}.Release-Core|Any CPU.Build.0 = Release-Core|Any CPU
2634
{665FDD28-99EF-4038-9469-1B27F778BF1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2735
{665FDD28-99EF-4038-9469-1B27F778BF1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{665FDD28-99EF-4038-9469-1B27F778BF1D}.Debug-Core|Any CPU.ActiveCfg = Debug-Core|Any CPU
37+
{665FDD28-99EF-4038-9469-1B27F778BF1D}.Debug-Core|Any CPU.Build.0 = Debug-Core|Any CPU
2838
{665FDD28-99EF-4038-9469-1B27F778BF1D}.NuPackRelease|Any CPU.ActiveCfg = Release|Any CPU
2939
{665FDD28-99EF-4038-9469-1B27F778BF1D}.NuPackRelease|Any CPU.Build.0 = Release|Any CPU
3040
{665FDD28-99EF-4038-9469-1B27F778BF1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
3141
{665FDD28-99EF-4038-9469-1B27F778BF1D}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{665FDD28-99EF-4038-9469-1B27F778BF1D}.Release-Core|Any CPU.ActiveCfg = Release-Core|Any CPU
43+
{665FDD28-99EF-4038-9469-1B27F778BF1D}.Release-Core|Any CPU.Build.0 = Release-Core|Any CPU
3244
EndGlobalSection
3345
GlobalSection(SolutionProperties) = preSolution
3446
HideSolutionNode = FALSE

Diff for: ‎PowerAssert/PowerAssert.csproj

+29-109
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,40 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>PowerAssert</RootNamespace>
12-
<AssemblyName>PowerAssert</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
<TargetFrameworkProfile />
3+
<TargetFrameworks>netcoreapp1.1;net40</TargetFrameworks>
4+
<PackageId>PowerAssert</PackageId>
5+
<Authors>Rob Fonseca-Ensor, David Alpert, George Pollard, Anders Holmström, Josh Robb, Alex Henderson and Peter Goodman</Authors>
6+
<Description>When you make a unit test assertion with PowerAssert, your assertion messages become much more useful.</Description>
7+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
8+
<PackageLicenseUrl>https://github.com/PowerAssert/PowerAssert.Net/blob/master/LICENSE.txt</PackageLicenseUrl>
9+
<PackageProjectUrl>https://github.com/PowerAssert/PowerAssert.Net</PackageProjectUrl>
10+
<PackageTags>NUnit xUnit.NET mstest expression-tree</PackageTags>
1611
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
<Prefer32Bit>false</Prefer32Bit>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
<Prefer32Bit>false</Prefer32Bit>
35-
</PropertyGroup>
36-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NuPackRelease|AnyCPU'">
37-
<OutputPath>release\lib\</OutputPath>
38-
<DefineConstants>TRACE</DefineConstants>
39-
<Optimize>true</Optimize>
40-
<DebugType>none</DebugType>
41-
<PlatformTarget>AnyCPU</PlatformTarget>
42-
<CodeAnalysisLogFile>bin\Release\PowerAssert.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
43-
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
44-
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
45-
<ErrorReport>prompt</ErrorReport>
46-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
47-
<CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
48-
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
49-
<CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
50-
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
51-
<Prefer32Bit>false</Prefer32Bit>
12+
13+
<PropertyGroup>
14+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
5215
</PropertyGroup>
16+
17+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug-Core|netcoreapp1.1|AnyCPU'" />
18+
19+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release-Core|netcoreapp1.1|AnyCPU'" />
20+
5321
<ItemGroup>
54-
<Reference Include="Microsoft.CSharp" />
55-
<Reference Include="System" />
56-
<Reference Include="System.Core" />
57-
</ItemGroup>
58-
<ItemGroup>
59-
<Compile Include="Annotations.cs" />
60-
<Compile Include="Hints\BrokenEqualityHint.cs" />
61-
<Compile Include="Hints\EnumComparisonShowValuesHint.cs" />
62-
<Compile Include="Hints\TimeSpanTotalMistakesHint.cs" />
63-
<Compile Include="Hints\EnumerableEqualsHint.cs" />
64-
<Compile Include="Hints\DelegateShouldHaveBeenInvokedEqualsHint.cs" />
65-
<Compile Include="Hints\EnumerableOperatorEqualsHint.cs" />
66-
<Compile Include="Hints\FloatEqualityHint.cs" />
67-
<Compile Include="Hints\HintUtils.cs" />
68-
<Compile Include="Hints\IHint.cs" />
69-
<Compile Include="Hints\MethodEqualsInsteadOfOperatorEqualsHint.cs" />
70-
<Compile Include="Hints\MultiHint.cs" />
71-
<Compile Include="Hints\OperatorEqualsHintBase.cs" />
72-
<Compile Include="Hints\SequenceEqualHint.cs" />
73-
<Compile Include="Hints\StringEqualsHint.cs" />
74-
<Compile Include="Hints\StringOperatorEqualsHint.cs" />
75-
<Compile Include="Infrastructure\ExpressionParser.cs" />
76-
<Compile Include="Infrastructure\Nodes\InvocationNode.cs" />
77-
<Compile Include="Infrastructure\NodeFormatter.cs" />
78-
<Compile Include="Infrastructure\Nodes\ArrayIndexNode.cs" />
79-
<Compile Include="Infrastructure\Nodes\BinaryNode.cs" />
80-
<Compile Include="Infrastructure\Nodes\ConditionalNode.cs" />
81-
<Compile Include="Infrastructure\Nodes\ConstantNode.cs" />
82-
<Compile Include="Infrastructure\Nodes\MemberAccessNode.cs" />
83-
<Compile Include="Infrastructure\Nodes\MethodCallNode.cs" />
84-
<Compile Include="Infrastructure\Nodes\NewArrayNode.cs" />
85-
<Compile Include="Infrastructure\Nodes\NewObjectNode.cs" />
86-
<Compile Include="Infrastructure\Nodes\Node.cs" />
87-
<Compile Include="Infrastructure\Nodes\UnaryNode.cs" />
88-
<Compile Include="Infrastructure\ObjectFormatter.cs" />
89-
<Compile Include="Infrastructure\ReplacementVisitor.cs" />
90-
<Compile Include="Infrastructure\Util.Generated.cs">
91-
<AutoGen>True</AutoGen>
92-
<DesignTime>True</DesignTime>
93-
<DependentUpon>Util.tt</DependentUpon>
94-
</Compile>
95-
<Compile Include="MultipleAssertions\Error.cs" />
96-
<Compile Include="MultipleAssertions\PolyAssert.cs" />
97-
<Compile Include="MultipleAssertions\PolyAssertException.cs" />
98-
<Compile Include="PAssert.cs" />
99-
<Compile Include="Properties\AssemblyInfo.cs" />
100-
</ItemGroup>
101-
<ItemGroup>
102-
<None Include="Infrastructure\Util.tt">
22+
<None Update="Infrastructure\Util.tt">
10323
<Generator>TextTemplatingFileGenerator</Generator>
10424
<LastGenOutput>Util.Generated.cs</LastGenOutput>
10525
</None>
106-
<None Include="powerassert.nuspec" />
10726
</ItemGroup>
27+
28+
<ItemGroup>
29+
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
30+
</ItemGroup>
31+
10832
<ItemGroup>
109-
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
33+
<Compile Update="Infrastructure\Util.Generated.cs">
34+
<DesignTime>True</DesignTime>
35+
<AutoGen>True</AutoGen>
36+
<DependentUpon>Util.tt</DependentUpon>
37+
</Compile>
11038
</ItemGroup>
111-
<ItemGroup />
112-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
113-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
114-
Other similar extension points exist, see Microsoft.Common.targets.
115-
<Target Name="BeforeBuild">
116-
</Target>
117-
<Target Name="AfterBuild">
118-
</Target>
119-
-->
39+
12040
</Project>

Diff for: ‎PowerAssertTests/PowerAssertTests.csproj

+18
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,24 @@
3434
<WarningLevel>4</WarningLevel>
3535
<Prefer32Bit>false</Prefer32Bit>
3636
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-Core|AnyCPU'">
38+
<DebugSymbols>true</DebugSymbols>
39+
<OutputPath>bin\Debug-Core\</OutputPath>
40+
<DefineConstants>DEBUG;TRACE</DefineConstants>
41+
<DebugType>full</DebugType>
42+
<PlatformTarget>AnyCPU</PlatformTarget>
43+
<ErrorReport>prompt</ErrorReport>
44+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
45+
</PropertyGroup>
46+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-Core|AnyCPU'">
47+
<OutputPath>bin\Release-Core\</OutputPath>
48+
<DefineConstants>TRACE</DefineConstants>
49+
<Optimize>true</Optimize>
50+
<DebugType>pdbonly</DebugType>
51+
<PlatformTarget>AnyCPU</PlatformTarget>
52+
<ErrorReport>prompt</ErrorReport>
53+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
54+
</PropertyGroup>
3755
<ItemGroup>
3856
<Reference Include="ApprovalTests">
3957
<HintPath>..\packages\ApprovalTests.3.0.7\lib\net40\ApprovalTests.dll</HintPath>

0 commit comments

Comments
 (0)