Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update nuget packages #1962

Merged
merged 11 commits into from Jul 24, 2022
Merged

Update nuget packages #1962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
aaab4df
Update Microsoft.NETCore.UniversalWindowsPlatform 6.2.13 -> 6.2.14
jnyrup Jul 23, 2022
00da288
Update MSTest 2.2.9 -> 2.2.10
jnyrup Jul 23, 2022
9916ff3
Update Microsoft.NET.Test.Sdk 17.1.0 -> 17.2.0
jnyrup Jul 23, 2022
fe8d112
Update Nuke 6.0.2 -> 6.1.2
jnyrup Jul 23, 2022
51111e5
Update Verify
jnyrup Jul 23, 2022
c5707aa
Update subset of approval tests
jnyrup Jul 23, 2022
3cd2ae1
Update unit tests to target netcoreapp3.1 instead of netcoreapp3.0
jnyrup Jul 23, 2022
706f234
Update xunit.runner.visualstudio 2.4.3 -> 2.4.5
jnyrup Jul 23, 2022
6959b56
Update xunit 2.4.1 -> 2.4.2-pre.12
jnyrup Jul 23, 2022
1f72d6e
Update ReportGenerator 5.1.4 -> 5.1.9
jnyrup Jul 23, 2022
f492387
Update GitVersion.Tool 5.10.1 -> 5.10.3
jnyrup Jul 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .nuke/build.schema.json
View file
Open in desktop
Expand Up @@ -33,6 +33,7 @@
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
Expand Down
8 changes: 1 addition & 7 deletions AcceptApiChanges.ps1
View file
Open in desktop
Expand Up @@ -4,15 +4,9 @@

$ApprovalFiles = ".\Tests\Approval.Tests\ApprovedApi\FluentAssertions\";

## Remove current "approved" API
Remove-Item "$ApprovalFiles\*.verified.txt"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes fixes a problem, when only a subset of the files changes and hence only some new .verified files are generated.

The changes aligns the behavior with AcceptApiChanges.sh


## Copy new API from .received.txt files to .verified.txt files
## Note that .received.txt files are ignored in git and are not part of the repository
Get-ChildItem -Path $ApprovalFiles -Filter "*received.txt" | ForEach-Object {
$NewName = $_.FullName -replace 'received.txt', 'verified.txt'
Copy-Item $_.FullName $NewName
Move-Item $_.FullName $NewName -Force
}

Remove-Item "$ApprovalFiles\*.received.txt"

1 change: 0 additions & 1 deletion Build/Build.cs
View file
Open in desktop
Expand Up @@ -16,7 +16,6 @@
using static Nuke.Common.Tools.ReportGenerator.ReportGeneratorTasks;
using static Nuke.Common.Tools.Xunit.XunitTasks;

[CheckBuildProjectConfigurations]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Marked as obsolete and apparently integrated into [Solution].

[UnsetVisualStudioEnvironmentVariables]
[DotNetVerbosityMapping]
class Build : NukeBuild
Expand Down
8 changes: 4 additions & 4 deletions Build/_build.csproj
View file
Open in desktop
Expand Up @@ -8,10 +8,10 @@
<NukeScriptDirectory>..\</NukeScriptDirectory>
</PropertyGroup>
<ItemGroup>
<PackageDownload Include="GitVersion.Tool" Version="[5.10.1]" />
<PackageDownload Include="GitVersion.Tool" Version="[5.10.3]" />
<PackageDownload Include="NSpec" Version="[3.1.0]" />
<PackageDownload Include="ReportGenerator" Version="[5.1.4]" />
<PackageDownload Include="xunit.runner.console" Version="[2.4.1]" />
<PackageReference Include="Nuke.Common" Version="6.0.2" />
<PackageDownload Include="ReportGenerator" Version="[5.1.9]" />
<PackageDownload Include="xunit.runner.console" Version="[2.4.2-pre.12]" />
<PackageReference Include="Nuke.Common" Version="6.1.2" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Tests/Approval.Tests/Approval.Tests.csproj
View file
Open in desktop
Expand Up @@ -5,15 +5,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="PublicApiGenerator" Version="10.3.0" />
<PackageReference Include="Verify.DiffPlex" Version="1.2.0" />
<PackageReference Include="Verify.Xunit" Version="16.5.4" />
<PackageReference Include="Verify.DiffPlex" Version="1.3.0" />
<PackageReference Include="Verify.Xunit" Version="17.2.1" />
</ItemGroup>

</Project>
20 changes: 14 additions & 6 deletions Tests/FluentAssertions.Equivalency.Specs/FluentAssertions.Equivalency.Specs.csproj
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

<!-- To reduce build times, we only enable analyzers for the newest TFM -->
<PropertyGroup>
<TargetFrameworks>net47;net6.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net47;net6.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Src\FluentAssertions\FluentAssertions.snk</AssemblyOriginatorKeyFile>
<IsPackable>false</IsPackable>
Expand All @@ -26,7 +26,7 @@
Upgrading to 1.6.0 gives "Could not load file or assembly 'System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0"
-->
<PackageReference Include="System.Collections.Immutable" Version="[1.5.0]" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand All @@ -39,9 +39,17 @@
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.0' or '$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
Copy link
Member Author

@jnyrup jnyrup Jul 23, 2022 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

xunit.runner.visualstudio 2.4.5 raised the minimum TFM to netcoreapp3.1.
So bumped the TFM from netcoreapp3.0 to netcoreapp3.1 and split out the netcoreapp2.1 package references.

<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="[2.4.3]">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand All @@ -50,7 +58,7 @@
<ItemGroup>
<PackageReference Include="Chill" Version="4.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="all">
Expand Down
20 changes: 14 additions & 6 deletions Tests/FluentAssertions.Specs/FluentAssertions.Specs.csproj
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

<!-- To reduce build times, we only enable analyzers for the newest TFM -->
<PropertyGroup>
<TargetFrameworks>net47;net6.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net47;net6.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Src\FluentAssertions\FluentAssertions.snk</AssemblyOriginatorKeyFile>
<IsPackable>false</IsPackable>
Expand Down Expand Up @@ -30,7 +30,7 @@
Upgrading to 1.6.0 gives "Could not load file or assembly 'System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0"
-->
<PackageReference Include="System.Collections.Immutable" Version="[1.5.0]" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand All @@ -43,9 +43,17 @@
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.0' or '$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="[2.4.3]">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand All @@ -54,7 +62,7 @@
<ItemGroup>
<PackageReference Include="Chill" Version="4.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="all">
Expand Down
6 changes: 3 additions & 3 deletions Tests/TestFrameworks/MSTestV2.Specs/MSTestV2.Specs.csproj
View file
Open in desktop
Expand Up @@ -12,8 +12,8 @@
<PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="all">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.9" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.csproj
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="all">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="Machine.Specifications" Version="1.0.0" />
<PackageReference Include="Machine.Specifications.Runner.VisualStudio" Version="2.10.2" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestFrameworks/NUnit3.Specs/NUnit3.Specs.csproj
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="all">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
Expand Down
6 changes: 3 additions & 3 deletions Tests/TestFrameworks/XUnit2.Specs/XUnit2.Specs.csproj
View file
Open in desktop
Expand Up @@ -9,9 +9,9 @@
<ProjectReference Include="..\..\..\Src\FluentAssertions\FluentAssertions.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions Tests/UWP.Specs/UWP.Specs.csproj
View file
Open in desktop
Expand Up @@ -83,13 +83,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.13</Version>
<Version>6.2.14</Version>
</PackageReference>
<PackageReference Include="MSTest.TestAdapter">
<Version>2.2.9</Version>
<Version>2.2.10</Version>
</PackageReference>
<PackageReference Include="MSTest.TestFramework">
<Version>2.2.9</Version>
<Version>2.2.10</Version>
</PackageReference>
<PackageReference Include="System.Xml.XPath.XmlDocument">
<Version>4.3.0</Version>
Expand Down