Skip to content

Commit b791949

Browse files
robdmoorerobdmoore
committed
Upgraded dependencies, switched to netstandard2.0 and fixed deprecation warnings
+semver: major
1 parent 545e815 commit b791949

8 files changed

Lines changed: 36 additions & 35 deletions

File tree

‎NuGet.config‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<configuration>
43
<packageSources>
5-
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
6-
<add key="myget AutoFixture" value="https://www.myget.org/F/autofixture/api/v3/index.json" />
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
75
</packageSources>
86
</configuration>

‎TestStack.Dossier.Tests/Builder_CreateListTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ public void WhenBuildingObjectsImplicitly_ThenTheAnonymousValueFixtureIsSharedAc
170170
studentViewModels.Select(x => x.Grade).ShouldBeUnique();
171171
}
172172

173+
[Fact]
173174
public void WhenBuildingObjectsWithCtorAndPrivateSetters_ThenSetPrivateSettersByDefault()
174175
{
175176
var dto = Builder<MixedAccessibilityDto>.CreateListOfSize(1)

‎TestStack.Dossier.Tests/DataSources/DataSourceConventionTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace TestStack.Dossier.Tests.DataSources
1010
public class DataSourceConventionTests
1111
{
1212
[Theory]
13-
[MemberData("TestCases")]
13+
[MemberData(nameof(TestCases))]
1414
public void DataSourceConventions(DataSource<string> sut, int expectedCount)
1515
{
1616
var collection = sut.Data.ToList();

‎TestStack.Dossier.Tests/DataSources/Dictionaries/Resources/FileDataConventions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void ApplyConventions()
2727
}
2828
}
2929

30-
public void Should_not_contain_duplicates(List<string> collection, string fileName)
30+
private void Should_not_contain_duplicates(List<string> collection, string fileName)
3131
{
3232
var duplicates = collection
3333
.GroupBy(x => x)
@@ -43,7 +43,7 @@ public void Should_not_contain_duplicates(List<string> collection, string fileNa
4343
}
4444
}
4545

46-
public void Should_not_contain_null_or_empty_values(List<string> collection, string fileName)
46+
private void Should_not_contain_null_or_empty_values(List<string> collection, string fileName)
4747
{
4848
var blanks = collection.Where(string.IsNullOrEmpty).ToList();
4949
if (blanks.Any())

‎TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceClassesTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ protected override List<object[]> GetData()
2222
{
2323
return new List<object[]>
2424
{
25-
new object[] {new Words(FromDictionary.GeoContinent), GenerateTestCasesForSut(Any.Continent)},
26-
new object[] {new Words(FromDictionary.GeoCountry), GenerateTestCasesForSut(Any.Country)},
27-
new object[] {new Words(FromDictionary.GeoCountryCode), GenerateTestCasesForSut(Any.CountryCode)},
28-
new object[] {new Words(FromDictionary.GeoLatitude), GenerateTestCasesForSut(Any.Latitude)},
29-
new object[] {new Words(FromDictionary.GeoLongitude), GenerateTestCasesForSut(Any.Longitude)},
25+
new object[] {new Words(FromDictionary.GeoContinent), GenerateTestCasesForSut(Any.Geography.Continent)},
26+
new object[] {new Words(FromDictionary.GeoCountry), GenerateTestCasesForSut(Any.Geography.Country)},
27+
new object[] {new Words(FromDictionary.GeoCountryCode), GenerateTestCasesForSut(Any.Geography.CountryCode)},
28+
new object[] {new Words(FromDictionary.GeoLatitude), GenerateTestCasesForSut(Any.Geography.Latitude)},
29+
new object[] {new Words(FromDictionary.GeoLongitude), GenerateTestCasesForSut(Any.Geography.Longitude)},
3030
};
3131
}
3232
}

‎TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceClassesTests.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ public void WhenGettingUniqueEmail_ThenReturnUniqueEmailsAcrossFixtureInstances(
2525
var any2 = new AnonymousValueFixture();
2626

2727
PersonEquivalenceExtensions.InitializeUniqueEmailAddressSource();
28-
generatedValues.Add(any2.UniqueEmailAddress());
28+
generatedValues.Add(any2.Person.UniqueEmailAddress());
2929
for (var i = 0; i < source.Data.Count - 1; i++)
3030
{
31-
generatedValues.Add(Any.UniqueEmailAddress());
31+
generatedValues.Add(Any.Person.UniqueEmailAddress());
3232
}
3333

3434
generatedValues.Distinct().Count()
@@ -43,17 +43,17 @@ protected override List<object[]> GetData()
4343
return new List<object[]>
4444
{
4545
new object[]
46-
{new Words(FromDictionary.PersonEmailAddress), GenerateTestCasesForSut(Any.EmailAddress)},
47-
new object[] {new Words(FromDictionary.PersonLanguage), GenerateTestCasesForSut(Any.Language)},
46+
{new Words(FromDictionary.PersonEmailAddress), GenerateTestCasesForSut(Any.Person.EmailAddress)},
47+
new object[] {new Words(FromDictionary.PersonLanguage), GenerateTestCasesForSut(Any.Person.Language)},
4848
new object[]
49-
{new Words(FromDictionary.PersonNameFirstFemale), GenerateTestCasesForSut(Any.FemaleFirstName)},
50-
new object[] {new Words(FromDictionary.PersonNameFirst), GenerateTestCasesForSut(Any.FirstName)},
51-
new object[] {new Words(FromDictionary.PersonNameFull), GenerateTestCasesForSut(Any.FullName)},
52-
new object[] {new Words(FromDictionary.PersonNameLast), GenerateTestCasesForSut(Any.LastName)},
49+
{new Words(FromDictionary.PersonNameFirstFemale), GenerateTestCasesForSut(Any.Person.NameFirstFemale)},
50+
new object[] {new Words(FromDictionary.PersonNameFirst), GenerateTestCasesForSut(Any.Person.NameFirst)},
51+
new object[] {new Words(FromDictionary.PersonNameFull), GenerateTestCasesForSut(Any.Person.NameFull)},
52+
new object[] {new Words(FromDictionary.PersonNameLast), GenerateTestCasesForSut(Any.Person.NameLast)},
5353
new object[]
54-
{new Words(FromDictionary.PersonNameFirstMale), GenerateTestCasesForSut(Any.MaleFirstName)},
55-
new object[] {new Words(FromDictionary.PersonNameSuffix), GenerateTestCasesForSut(Any.Suffix)},
56-
new object[] {new Words(FromDictionary.PersonNameTitle), GenerateTestCasesForSut(Any.Title)},
54+
{new Words(FromDictionary.PersonNameFirstMale), GenerateTestCasesForSut(Any.Person.NameFirstMale)},
55+
new object[] {new Words(FromDictionary.PersonNameSuffix), GenerateTestCasesForSut(Any.Person.NameSuffix)},
56+
new object[] {new Words(FromDictionary.PersonNameTitle), GenerateTestCasesForSut(Any.Person.NameTitle)},
5757
};
5858
}
5959
}

‎TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.0;net472</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Castle.Core" Version="4.2.1" />
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20171031-01" />
8+
<PackageReference Include="Castle.Core" Version="4.3.1" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
1010
<PackageReference Include="NSubstitute" Version="3.1.0" />
11-
<PackageReference Include="Shouldly" Version="3.0.0-beta0003" />
12-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
13-
<PackageReference Include="xunit" Version="2.3.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
11+
<PackageReference Include="Shouldly" Version="3.0.2" />
12+
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
13+
<PackageReference Include="xunit" Version="2.4.1" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
17+
</PackageReference>
1518
</ItemGroup>
1619

1720
<ItemGroup>

‎TestStack.Dossier/TestStack.Dossier.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.5;net452</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<AssemblyName>TestStack.Dossier</AssemblyName>
66
<PackageId>TestStack.Dossier</PackageId>
7-
<PackageVersion>4.0.0</PackageVersion>
87
<Authors>Robert Moore, Michael Whelan, TestStack</Authors>
98
<Description>
109
TestStack.Dossier provides you with the code infrastructure to easily and quickly generate test fixture data for your automated tests in a terse, readable and maintainable way using the Test Data Builder, anonymous value and equivalence class patterns. Formerly called NTestDataBuilder.
@@ -149,8 +148,8 @@
149148
</ItemGroup>
150149

151150
<ItemGroup>
152-
<PackageReference Include="AutoFixture" Version="4.0.0-rc1" />
153-
<PackageReference Include="Castle.Core" Version="4.2.1" />
151+
<PackageReference Include="AutoFixture" Version="4.6.0" />
152+
<PackageReference Include="Castle.Core" Version="4.3.1" />
154153
<PackageReference Include="NSubstitute" Version="3.1.0" />
155154
</ItemGroup>
156155

0 commit comments

Comments
 (0)