Skip to content

Commit cceebf1

Browse files
robferobfe
authored
Merge pull request #43 from kmcc049/update-to-netstandard2.0
Update to netstandard2.0
2 parents d7fbddc + 77206ba commit cceebf1

File tree

10 files changed

+14
-257
lines changed

10 files changed

+14
-257
lines changed

‎PowerAssert/PowerAssert.csproj

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp1.1;net40</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp1.1;net40;netstandard2.0</TargetFrameworks>
44
<PackageId>PowerAssert</PackageId>
55
<Authors>Rob Fonseca-Ensor, David Alpert, George Pollard, Anders Holmström, Josh Robb, Alex Henderson and Peter Goodman</Authors>
66
<Description>When you make a unit test assertion with PowerAssert, your assertion messages become much more useful.</Description>
@@ -28,7 +28,11 @@
2828
<Reference Include="System" />
2929
<Reference Include="System.Core" />
3030
</ItemGroup>
31-
31+
32+
<ItemGroup Condition="'$(TargetFramework)' != 'net40'">
33+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
34+
</ItemGroup>
35+
3236
<ItemGroup>
3337
<None Update="Infrastructure\Util.tt">
3438
<Generator>TextTemplatingFileGenerator</Generator>

‎PowerAssertTests/PowerAssertTests.csproj

+8-142
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>
7-
</ProductVersion>
8-
<SchemaVersion>2.0</SchemaVersion>
9-
<ProjectGuid>{665FDD28-99EF-4038-9469-1B27F778BF1D}</ProjectGuid>
10-
<OutputType>Library</OutputType>
11-
<AppDesignerFolder>Properties</AppDesignerFolder>
12-
<RootNamespace>PowerAssertTests</RootNamespace>
13-
<AssemblyName>PowerAssertTests</AssemblyName>
14-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
15-
<FileAlignment>512</FileAlignment>
16-
<TargetFrameworkProfile />
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
<Prefer32Bit>false</Prefer32Bit>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
<Prefer32Bit>false</Prefer32Bit>
36-
</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>
4+
<TargetFrameworks>net45</TargetFrameworks>
545
</PropertyGroup>
6+
557
<ItemGroup>
56-
<Reference Include="ApprovalTests">
57-
<HintPath>..\packages\ApprovalTests.3.0.7\lib\net40\ApprovalTests.dll</HintPath>
58-
</Reference>
59-
<Reference Include="ApprovalUtilities">
60-
<HintPath>..\packages\ApprovalUtilities.3.0.7\lib\net35\ApprovalUtilities.dll</HintPath>
61-
</Reference>
62-
<Reference Include="nunit.framework">
63-
<HintPath>..\lib\nunit.framework.dll</HintPath>
64-
</Reference>
658
<Reference Include="System" />
669
<Reference Include="System.Core">
6710
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -72,94 +15,17 @@
7215
<Visible>False</Visible>
7316
</CodeAnalysisDependentAssemblyPaths>
7417
</ItemGroup>
75-
<ItemGroup>
76-
<Compile Include="Approvals\ApprovalTestExtensions\CiReporter.cs" />
77-
<Compile Include="Approvals\ApprovalTestExtensions\HappyDiffReporter.cs" />
78-
<Compile Include="Approvals\ApprovalTestExtensions\OverwriteReporter.cs" />
79-
<Compile Include="Hints\BrokenEqualityHintTests.cs" />
80-
<Compile Include="Hints\DelegateShouldHaveBeenInvokedEqualsHintTests.cs" />
81-
<Compile Include="Hints\EnumerableEqualsHintTests.cs" />
82-
<Compile Include="Hints\EnumerableOperatorEqualsHintTests.cs" />
83-
<Compile Include="Hints\FloatEqualityHintTests.cs" />
84-
<Compile Include="Hints\MethodEqualsInsteadOfOperatorEqualsHintTests.cs" />
85-
<Compile Include="Hints\SequenceEqualsHintTests.cs" />
86-
<Compile Include="Hints\StringEqualsHintTests.cs" />
87-
<Compile Include="Hints\StringOperatorEqualsHint.cs" />
88-
<Compile Include="Hints\TimeSpanTotalMistakesHintTests.cs" />
89-
<Compile Include="NodeFormatterTest.cs" />
90-
<Compile Include="ParserTest.cs" />
91-
<Compile Include="Properties\AssemblyInfo.cs" />
92-
<Compile Include="Approvals\EndToEndTest.cs" />
93-
<Compile Include="ThrowsTest.cs" />
94-
</ItemGroup>
9518
<ItemGroup>
9619
<ProjectReference Include="..\PowerAssert\PowerAssert.csproj">
9720
<Project>{7E9D2DB4-78FE-41BD-9566-15F68D42E4D9}</Project>
9821
<Name>PowerAssert</Name>
9922
</ProjectReference>
10023
</ItemGroup>
10124
<ItemGroup>
102-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
103-
</ItemGroup>
104-
<ItemGroup>
105-
<None Include="packages.config" />
106-
</ItemGroup>
107-
<ItemGroup>
108-
<Content Include="Approvals\EndToEndTest.ArrayIndexOfBinary.approved.txt" />
109-
<Content Include="Approvals\EndToEndTest.ArrayLength.approved.txt" />
110-
<Content Include="Approvals\EndToEndTest.BinaryArguments.approved.txt" />
111-
<Content Include="Approvals\EndToEndTest.BinaryArrayElement.approved.txt" />
112-
<Content Include="Approvals\EndToEndTest.BrokenEqualityTestInstanceEquals.approved.txt" />
113-
<Content Include="Approvals\EndToEndTest.Casting.approved.txt" />
114-
<Content Include="Approvals\EndToEndTest.PolyAssert.approved.txt" />
115-
<Content Include="Approvals\EndToEndTest.PolyAssertCanFinishEarly.approved.txt" />
116-
<Content Include="Approvals\EndToEndTest.UnaryCastOfBinary.approved.txt" />
117-
<Content Include="Approvals\EndToEndTest.CompareDelegateAndObject.approved.txt" />
118-
<Content Include="Approvals\EndToEndTest.CompareTwoCloseFloats.approved.txt" />
119-
<Content Include="Approvals\EndToEndTest.Enum.approved.txt" />
120-
<Content Include="Approvals\EndToEndTest.EnumerablesThatDiffer.approved.txt" />
121-
<Content Include="Approvals\EndToEndTest.EqualsButNotOperatorEquals.approved.txt" />
122-
<Content Include="Approvals\EndToEndTest.MethodCallOfBinary.approved.txt" />
123-
<Content Include="Approvals\EndToEndTest.MethodCallOfBinaryBackward.approved.txt" />
124-
<Content Include="Approvals\EndToEndTest.NullCoalesce.approved.txt" />
125-
<Content Include="Approvals\EndToEndTest.NullDereference.approved.txt" />
126-
<Content Include="Approvals\EndToEndTest.OneStringIsDecomposedVersionOfOther.approved.txt" />
127-
<Content Include="Approvals\EndToEndTest.OperatorPriority.approved.txt" />
128-
<Content Include="Approvals\EndToEndTest.PrintingComplexLinqExpressionStatements.approved.txt" />
129-
<Content Include="Approvals\EndToEndTest.PrintingDictionary.approved.txt" />
130-
<Content Include="Approvals\EndToEndTest.PrintingEnumerablesWithNulls.approved.txt" />
131-
<Content Include="Approvals\EndToEndTest.PrintingIsTest.approved.txt" />
132-
<Content Include="Approvals\EndToEndTest.PrintingLinqExpressionStatements.approved.txt" />
133-
<Content Include="Approvals\EndToEndTest.PrintingLinqStatements.approved.txt" />
134-
<Content Include="Approvals\EndToEndTest.PrintingMethodCall.approved.txt" />
135-
<Content Include="Approvals\EndToEndTest.PrintingNewExpression.approved.txt" />
136-
<Content Include="Approvals\EndToEndTest.PrintingTestClassFields.approved.txt" />
137-
<Content Include="Approvals\EndToEndTest.PrintingUnaryNegate.approved.txt" />
138-
<Content Include="Approvals\EndToEndTest.PrintingUnaryNot.approved.txt" />
139-
<Content Include="Approvals\EndToEndTest.PropertyAccessOfBinary.approved.txt" />
140-
<Content Include="Approvals\EndToEndTest.RunComplexExpression.approved.txt" />
141-
<Content Include="Approvals\EndToEndTest.RunComplexExpression2.approved.txt" />
142-
<Content Include="Approvals\EndToEndTest.RunComplexExpression3.approved.txt" />
143-
<Content Include="Approvals\EndToEndTest.RunComplexExpressionWithStaticField.approved.txt" />
144-
<Content Include="Approvals\EndToEndTest.RunRoundingEdgeCase.approved.txt" />
145-
<Content Include="Approvals\EndToEndTest.RunStringCompare.approved.txt" />
146-
<Content Include="Approvals\EndToEndTest.SequenceEqualButNotDotEquals.approved.txt" />
147-
<Content Include="Approvals\EndToEndTest.SequenceEqualButNotOperatorEquals.approved.txt" />
148-
<Content Include="Approvals\EndToEndTest.ShouldHaveUsedTotal.approved.txt" />
149-
<Content Include="Approvals\EndToEndTest.StringContainsControlChar.approved.txt" />
150-
<Content Include="Approvals\EndToEndTest.StringContainsFormatChar.approved.txt" />
151-
<Content Include="Approvals\EndToEndTest.StringContainsMismatchedNewlines.approved.txt" />
152-
<Content Include="Approvals\EndToEndTest.StringsThatDiffer.approved.txt" />
153-
<Content Include="Approvals\EndToEndTest.StringsThatDifferAndAreComparedCaseInsensitively.approved.txt" />
154-
<Content Include="Approvals\EndToEndTest.TestDifferingLists.approved.txt" />
155-
<Content Include="Approvals\EndToEndTest.UnaryNotOfBinary.approved.txt" />
25+
<PackageReference Include="ApprovalTests" Version="3.0.7" />
26+
<PackageReference Include="ApprovalUtilities" Version="3.0.7" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
28+
<PackageReference Include="nunit" Version="3.13.1" />
29+
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
15630
</ItemGroup>
157-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
158-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
159-
Other similar extension points exist, see Microsoft.Common.targets.
160-
<Target Name="BeforeBuild">
161-
</Target>
162-
<Target Name="AfterBuild">
163-
</Target>
164-
-->
16531
</Project>

‎PowerAssertTests/Properties/AssemblyInfo.cs

-30
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,5 @@
99
using PowerAssertTests.Approvals;
1010
using PowerAssertTests.Approvals.ApprovalTestExtensions;
1111

12-
[assembly: AssemblyTitle("PowerAssertTests")]
13-
[assembly: AssemblyDescription("")]
14-
[assembly: AssemblyConfiguration("")]
15-
[assembly: AssemblyProduct("PowerAssertTests")]
16-
[assembly: AssemblyCopyright("Copyright © Rob Fonseca-Ensor")]
17-
[assembly: AssemblyTrademark("")]
18-
[assembly: AssemblyCulture("")]
19-
20-
// Setting ComVisible to false makes the types in this assembly not visible
21-
// to COM components. If you need to access a type in this assembly from
22-
// COM, set the ComVisible attribute to true on that type.
23-
24-
[assembly: ComVisible(false)]
25-
26-
// The following GUID is for the ID of the typelib if this project is exposed to COM
27-
28-
[assembly: Guid("b66d2326-b90c-4500-9aca-2158fde6e1e4")]
29-
30-
// Version information for an assembly consists of the following four values:
31-
//
32-
// Major Version
33-
// Minor Version
34-
// Build Number
35-
// Revision
36-
//
37-
// You can specify all the values or you can default the Build and Revision Numbers
38-
// by using the '*' as shown below:
39-
40-
[assembly: AssemblyVersion("1.0.0.0")]
41-
[assembly: AssemblyFileVersion("1.0.0.0")]
4212
[assembly: FrontLoadedReporter(typeof (CiReporter))]
4313
[assembly: UseReporter(typeof (HappyDiffReporter))]

‎PowerAssertTests/packages.config

-6
This file was deleted.

‎packages/ApprovalTests.3.0.7/ApprovalTests.3.0.7.nuspec

-20
This file was deleted.

‎packages/ApprovalTests.3.0.7/lib/net40/ApprovalTests.XML

-30
This file was deleted.

‎packages/ApprovalTests.3.0.7/lib/net40/ApprovalTests.dll

-133 KB
Binary file not shown.

‎packages/ApprovalUtilities.3.0.7/ApprovalUtilities.3.0.7.nuspec

-14
This file was deleted.

‎packages/ApprovalUtilities.3.0.7/lib/net35/ApprovalUtilities.XML

-13
This file was deleted.

‎packages/ApprovalUtilities.3.0.7/lib/net35/ApprovalUtilities.dll

-62.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)